Git 2.34.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
new file mode 100644
index 0000000..27f72f0
--- /dev/null
+++ b/.github/workflows/l10n.yml
@@ -0,0 +1,105 @@
+name: git-l10n
+
+on: [push, pull_request_target]
+
+jobs:
+ git-po-helper:
+ if: >-
+ endsWith(github.repository, '/git-po') ||
+ contains(github.head_ref, 'l10n') ||
+ contains(github.ref, 'l10n')
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ steps:
+ - name: Setup base and head objects
+ id: setup-tips
+ run: |
+ if test "${{ github.event_name }}" = "pull_request_target"
+ then
+ base=${{ github.event.pull_request.base.sha }}
+ head=${{ github.event.pull_request.head.sha }}
+ else
+ base=${{ github.event.before }}
+ head=${{ github.event.after }}
+ fi
+ echo "::set-output name=base::$base"
+ echo "::set-output name=head::$head"
+ - name: Run partial clone
+ run: |
+ git -c init.defaultBranch=master init --bare .
+ git remote add \
+ --mirror=fetch \
+ origin \
+ https://github.com/${{ github.repository }}
+ # Fetch tips that may be unreachable from github.ref:
+ # - For a forced push, "$base" may be unreachable.
+ # - For a "pull_request_target" event, "$head" may be unreachable.
+ args=
+ for commit in \
+ ${{ steps.setup-tips.outputs.base }} \
+ ${{ steps.setup-tips.outputs.head }}
+ do
+ case $commit in
+ *[^0]*)
+ args="$args $commit"
+ ;;
+ *)
+ # Should not fetch ZERO-OID.
+ ;;
+ esac
+ done
+ git -c protocol.version=2 fetch \
+ --progress \
+ --no-tags \
+ --no-write-fetch-head \
+ --filter=blob:none \
+ origin \
+ ${{ github.ref }} \
+ $args
+ - uses: actions/setup-go@v2
+ with:
+ go-version: '>=1.16'
+ - name: Install git-po-helper
+ run: go install github.com/git-l10n/git-po-helper@main
+ - name: Install other dependencies
+ run: |
+ sudo apt-get update -q &&
+ sudo apt-get install -q -y gettext
+ - name: Run git-po-helper
+ id: check-commits
+ run: |
+ exit_code=0
+ git-po-helper check-commits \
+ --github-action-event="${{ github.event_name }}" -- \
+ ${{ steps.setup-tips.outputs.base }}..${{ steps.setup-tips.outputs.head }} \
+ >git-po-helper.out 2>&1 || exit_code=$?
+ if test $exit_code -ne 0 || grep -q WARNING git-po-helper.out
+ then
+ # Remove ANSI colors which are proper for console logs but not
+ # proper for PR comment.
+ echo "COMMENT_BODY<<EOF" >>$GITHUB_ENV
+ perl -pe 's/\e\[[0-9;]*m//g; s/\bEOF$//g' git-po-helper.out >>$GITHUB_ENV
+ echo "EOF" >>$GITHUB_ENV
+ fi
+ cat git-po-helper.out
+ exit $exit_code
+ - name: Create comment in pull request for report
+ uses: mshick/add-pr-comment@v1
+ if: >-
+ always() &&
+ github.event_name == 'pull_request_target' &&
+ env.COMMENT_BODY != ''
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ repo-token-user-login: 'github-actions[bot]'
+ message: >
+ ${{ steps.check-commits.outcome == 'failure' && 'Errors and warnings' || 'Warnings' }}
+ found by [git-po-helper](https://github.com/git-l10n/git-po-helper#readme) in workflow
+ [#${{ github.run_number }}](${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/actions/runs/${{ github.run_id }}):
+
+ ```
+
+ ${{ env.COMMENT_BODY }}
+
+ ```
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b053b01..6ed6a9e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,7 +88,7 @@
env:
HOME: ${{runner.workspace}}
NO_PERL: 1
- run: ci/make-test-artifacts.sh artifacts
+ run: . /etc/profile && ci/make-test-artifacts.sh artifacts
- name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts
@@ -115,7 +115,7 @@
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: test
shell: bash
- run: ci/run-test-slice.sh ${{matrix.nr}} 10
+ run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
- name: ci/print-test-failures.sh
if: failure()
shell: bash
@@ -198,8 +198,7 @@
shell: bash
env:
NO_SVN_TESTS: 1
- GIT_TEST_SKIP_REBASE_P: 1
- run: ci/run-test-slice.sh ${{matrix.nr}} 10
+ run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
- name: ci/print-test-failures.sh
if: failure()
shell: bash
@@ -232,6 +231,9 @@
- jobname: linux-gcc-default
cc: gcc
pool: ubuntu-latest
+ - jobname: linux-leaks
+ cc: gcc
+ pool: ubuntu-latest
env:
CC: ${{matrix.vector.cc}}
jobname: ${{matrix.vector.jobname}}
diff --git a/.gitignore b/.gitignore
index 311841f..054249b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,7 +125,6 @@
/git-range-diff
/git-read-tree
/git-rebase
-/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
/git-remote
@@ -190,6 +189,7 @@
/gitweb/static/gitweb.min.*
/config-list.h
/command-list.h
+/hook-list.h
*.tar.gz
*.dsc
*.deb
@@ -224,6 +224,7 @@
*.lib
*.res
*.sln
+*.sp
*.suo
*.ncb
*.vcproj
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 9022d48..1c3771e 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -14,4 +14,5 @@
SubmittingPatches.txt
tmp-doc-diff/
GIT-ASCIIDOCFLAGS
+/.build/
/GIT-EXCLUDED-PROGRAMS
diff --git a/Documentation/Makefile b/Documentation/Makefile
index f5605b7..ed656db 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -90,6 +90,7 @@
TECH_DOCS += MyFirstContribution
TECH_DOCS += MyFirstObjectWalk
TECH_DOCS += SubmittingPatches
+TECH_DOCS += technical/bundle-format
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
TECH_DOCS += technical/index-format
@@ -225,6 +226,7 @@
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
+ QUIET = @
QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
QUIET_XMLTO = @echo ' ' XMLTO $@;
QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
@@ -232,11 +234,15 @@
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
QUIET_GEN = @echo ' ' GEN $@;
- QUIET_LINT = @echo ' ' LINT $@;
QUIET_STDERR = 2> /dev/null
QUIET_SUBDIR0 = +@subdir=
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
$(MAKE) $(PRINT_DIR) -C $$subdir
+
+ QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
+ QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
+ QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
+
export V
endif
endif
@@ -284,7 +290,7 @@
../GIT-VERSION-FILE: FORCE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
-ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(filter-out lint-docs clean,$(MAKECMDGOALS)),)
-include ../GIT-VERSION-FILE
endif
@@ -343,6 +349,7 @@
fi
clean:
+ $(RM) -rf .build/
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
$(RM) *.pdf
@@ -456,14 +463,61 @@
print-man1:
@for i in $(MAN1_TXT); do echo $$i; done
-lint-docs::
- $(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl \
+## Lint: Common
+.build:
+ $(QUIET)mkdir $@
+.build/lint-docs: | .build
+ $(QUIET)mkdir $@
+
+## Lint: gitlink
+.build/lint-docs/gitlink: | .build/lint-docs
+ $(QUIET)mkdir $@
+.build/lint-docs/gitlink/howto: | .build/lint-docs/gitlink
+ $(QUIET)mkdir $@
+.build/lint-docs/gitlink/config: | .build/lint-docs/gitlink
+ $(QUIET)mkdir $@
+LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/howto
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/config
+$(LINT_DOCS_GITLINK): lint-gitlink.perl
+$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
+ $(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
+ $< \
$(HOWTO_TXT) $(DOC_DEP_TXT) \
--section=1 $(MAN1_TXT) \
--section=5 $(MAN5_TXT) \
- --section=7 $(MAN7_TXT); \
- $(PERL_PATH) lint-man-end-blurb.perl $(MAN_TXT); \
- $(PERL_PATH) lint-man-section-order.perl $(MAN_TXT);
+ --section=7 $(MAN7_TXT) >$@
+.PHONY: lint-docs-gitlink
+lint-docs-gitlink: $(LINT_DOCS_GITLINK)
+
+## Lint: man-end-blurb
+.build/lint-docs/man-end-blurb: | .build/lint-docs
+ $(QUIET)mkdir $@
+LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_END_BLURB): | .build/lint-docs/man-end-blurb
+$(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
+$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
+ $(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
+.PHONY: lint-docs-man-end-blurb
+lint-docs-man-end-blurb: $(LINT_DOCS_MAN_END_BLURB)
+
+## Lint: man-section-order
+.build/lint-docs/man-section-order: | .build/lint-docs
+ $(QUIET)mkdir $@
+LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_SECTION_ORDER): | .build/lint-docs/man-section-order
+$(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
+$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
+ $(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
+.PHONY: lint-docs-man-section-order
+lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
+
+## Lint: list of targets above
+.PHONY: lint-docs
+lint-docs: lint-docs-gitlink
+lint-docs: lint-docs-man-end-blurb
+lint-docs: lint-docs-man-section-order
ifeq ($(wildcard po/Makefile),po/Makefile)
doc-l10n install-l10n::
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 015cf24..b20bc8e 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -1029,22 +1029,42 @@
[[v2-git-send-email]]
=== Sending v2
-Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
-handle comments from reviewers. Continue this section when your topic branch is
-shaped the way you want it to look for your patchset v2.
+This section will focus on how to send a v2 of your patchset. To learn what
+should go into v2, skip ahead to <<reviewing,Responding to Reviews>> for
+information on how to handle comments from reviewers.
-When you're ready with the next iteration of your patch, the process is fairly
-similar.
-
-First, generate your v2 patches again:
+We'll reuse our `psuh` topic branch for v2. Before we make any changes, we'll
+mark the tip of our v1 branch for easy reference:
----
-$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
+$ git checkout psuh
+$ git branch psuh-v1
----
-This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
-to the `psuh/` directory. You may notice that they are sitting alongside the v1
-patches; that's fine, but be careful when you are ready to send them.
+Refine your patch series by using `git rebase -i` to adjust commits based upon
+reviewer comments. Once the patch series is ready for submission, generate your
+patches again, but with some new flags:
+
+----
+$ git format-patch -v2 --cover-letter -o psuh/ --range-diff master..psuh-v1 master..
+----
+
+The `--range-diff master..psuh-v1` parameter tells `format-patch` to include a
+range-diff between `psuh-v1` and `psuh` in the cover letter (see
+linkgit:git-range-diff[1]). This helps tell reviewers about the differences
+between your v1 and v2 patches.
+
+The `-v2` parameter tells `format-patch` to output your patches
+as version "2". For instance, you may notice that your v2 patches are
+all named like `v2-000n-my-commit-subject.patch`. `-v2` will also format
+your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",
+and your range-diff will be prefaced with "Range-diff against v1".
+
+Afer you run this command, `format-patch` will output the patches to the `psuh/`
+directory, alongside the v1 patches. Using a single directory makes it easy to
+refer to the old v1 patches while proofreading the v2 patches, but you will need
+to be careful to send out only the v2 patches. We will use a pattern like
+"psuh/v2-*.patch" (not "psuh/*.patch", which would match v1 and v2 patches).
Edit your cover letter again. Now is a good time to mention what's different
between your last version and now, if it's something significant. You do not
@@ -1082,7 +1102,7 @@
----
$ git send-email --to=target@example.com
--in-reply-to="<foo.12345.author@example.com>"
- psuh/v2*
+ psuh/v2-*.patch
----
[[single-patch]]
diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.txt
new file mode 100644
index 0000000..75d4fdf
--- /dev/null
+++ b/Documentation/RelNotes/2.34.0.txt
@@ -0,0 +1,438 @@
+Git 2.34 Release Notes
+======================
+
+Updates since Git 2.33
+----------------------
+
+Backward compatibility notes
+
+ * The "--preserve-merges" option of "git rebase" has been removed.
+
+
+UI, Workflows & Features
+
+ * Pathname expansion (like "~username/") learned a way to specify a
+ location relative to Git installation (e.g. its $sharedir which is
+ $(prefix)/share), with "%(prefix)".
+
+ * The `ort` strategy is used instead of `recursive` as the default
+ merge strategy.
+
+ * The userdiff pattern for "java" language has been updated.
+
+ * "git rebase" by default skips changes that are equivalent to
+ commits that are already in the history the branch is rebased onto;
+ give messages when this happens to let the users be aware of
+ skipped commits, and also teach them how to tell "rebase" to keep
+ duplicated changes.
+
+ * The advice message that "git cherry-pick" gives when it asks
+ conflicted replay of a commit to be resolved by the end user has
+ been updated.
+
+ * After "git clone --recurse-submodules", all submodules are cloned
+ but they are not by default recursed into by other commands. With
+ submodule.stickyRecursiveClone configuration set, submodule.recurse
+ configuration is set to true in a repository created by "clone"
+ with "--recurse-submodules" option.
+
+ * The logic for auto-correction of misspelt subcommands learned to go
+ interactive when the help.autocorrect configuration variable is set
+ to 'prompt'.
+
+ * "git maintenance" scheduler learned to use systemd timers as a
+ possible backend.
+
+ * "git diff --submodule=diff" showed failure from run_command() when
+ trying to run diff inside a submodule, when the user manually
+ removes the submodule directory.
+
+ * "git bundle unbundle" learned to show progress display.
+
+ * In cone mode, the sparse-index code path learned to remove ignored
+ files (like build artifacts) outside the sparse cone, allowing the
+ entire directory outside the sparse cone to be removed, which is
+ especially useful when the sparse patterns change.
+
+ * Taking advantage of the CGI interface, http-backend has been
+ updated to enable protocol v2 automatically when the other side
+ asks for it.
+
+ * The credential-cache helper has been adjusted to Windows.
+
+ * The error in "git help no-such-git-command" is handled better.
+
+ * The unicode character width table (used for output alignment) has
+ been updated.
+
+ * The ref iteration code used to optionally allow dangling refs to be
+ shown, which has been tightened up.
+
+ * "git add", "git mv", and "git rm" have been adjusted to avoid
+ updating paths outside of the sparse-checkout definition unless
+ the user specifies a "--sparse" option.
+
+ * "git repack" has been taught to generate multi-pack reachability
+ bitmaps.
+
+ * "git fsck" has been taught to report mismatch between expected and
+ actual types of an object better.
+
+ * In addition to GnuPG, ssh public crypto can be used for object and
+ push-cert signing. Note that this feature cannot be used with
+ ssh-keygen from OpenSSH 8.7, whose support for it is broken. Avoid
+ using it unless you update to OpenSSH 8.8.
+
+ * "git log --grep=string --author=name" learns to highlight hits just
+ like "git grep string" does.
+
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git bisect" spawned "git show-branch" only to pretty-print the
+ title of the commit after checking out the next version to be
+ tested; this has been rewritten in C.
+
+ * "git add" can work better with the sparse index.
+
+ * Support for ancient versions of cURL library (pre 7.19.4) has been
+ dropped.
+
+ * A handful of tests that assumed implementation details of files
+ backend for refs have been cleaned up.
+
+ * trace2 logs learned to show parent process name to see in what
+ context Git was invoked.
+
+ * Loading of ref tips to prepare for common ancestry negotiation in
+ "git fetch-pack" has been optimized by taking advantage of the
+ commit graph when available.
+
+ * Remind developers that the userdiff patterns should be kept simple
+ and permissive, assuming that the contents they apply are always
+ syntactically correct.
+
+ * The current implementation of GIT_TEST_FAIL_PREREQS is broken in
+ that checking for the lack of a prerequisite would not work. Avoid
+ the use of "if ! test_have_prereq X" in a test script.
+
+ * The revision traversal API has been optimized by taking advantage
+ of the commit-graph, when available, to determine if a commit is
+ reachable from any of the existing refs.
+
+ * "git fetch --quiet" optimization to avoid useless computation of
+ info that will never be displayed.
+
+ * Callers from older advice_config[] based API has been updated to
+ use the newer advice_if_enabled() and advice_enabled() API.
+
+ * Teach "test_pause" and "debug" helpers to allow using the HOME and
+ TERM environment variables the user usually uses.
+
+ * "make INSTALL_STRIP=-s install" allows the installation step to use
+ "install -s" to strip the binaries as they get installed.
+
+ * Code that handles large number of refs in the "git fetch" code
+ path has been optimized.
+
+ * The reachability bitmap file used to be generated only for a single
+ pack, but now we've learned to generate bitmaps for history that
+ span across multiple packfiles.
+
+ * The code to make "git grep" recurse into submodules has been
+ updated to migrate away from the "add submodule's object store as
+ an alternate object store" mechanism (which is suboptimal).
+
+ * The tracing of process ancestry information has been enhanced.
+
+ * Reduce number of write(2) system calls while sending the
+ ref advertisement.
+
+ * Update the build procedure to use the "-pedantic" build when
+ DEVELOPER makefile macro is in effect.
+
+ * Large part of "git submodule add" gets rewritten in C.
+
+ * The run-command API has been updated so that the callers can easily
+ ask the file descriptors open for packfiles to be closed immediately
+ before spawning commands that may trigger auto-gc.
+
+ * An oddball OPTION_ARGUMENT feature has been removed from the
+ parse-options API.
+
+ * The mergesort implementation used to sort linked list has been
+ optimized.
+
+ * Remove external declaration of functions that no longer exist.
+
+ * "git multi-pack-index write --bitmap" learns to propagate the
+ hashcache from original bitmap to resulting bitmap.
+
+ * CI learns to run the leak sanitizer builds.
+
+ * "git grep --recurse-submodules" takes trees and blobs from the
+ submodule repository, but the textconv settings when processing a
+ blob from the submodule is not taken from the submodule repository.
+ A test is added to demonstrate the issue, without fixing it.
+
+ * Teach "git help -c" into helping the command line completion of
+ configuration variables.
+
+ * When "git cmd -h" shows more than one line of usage text (e.g.
+ the cmd subcommand may take sub-sub-command), parse-options API
+ learned to align these lines, even across i18n/l10n.
+
+ * Prevent "make sparse" from running for the source files that
+ haven't been modified.
+
+ * The code path to write a new version of .midx multi-pack index files
+ has learned to release the mmaped memory holding the current
+ version of .midx before removing them from the disk, as some
+ platforms do not allow removal of a file that still has mapping.
+
+ * A new feature has been added to abort early in the test framework.
+
+
+Fixes since v2.33
+-----------------
+
+ * Input validation of "git pack-objects --stdin-packs" has been
+ corrected.
+
+ * Bugfix for common ancestor negotiation recently introduced in "git
+ push" code path.
+
+ * "git pull" had various corner cases that were not well thought out
+ around its --rebase backend, e.g. "git pull --ff-only" did not stop
+ but went ahead and rebased when the history on other side is not a
+ descendant of our history. The series tries to fix them up.
+
+ * "git apply" miscounted the bytes and failed to read to the end of
+ binary hunks.
+
+ * "git range-diff" code clean-up.
+
+ * "git commit --fixup" now works with "--edit" again, after it was
+ broken in v2.32.
+
+ * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
+ new version has a blocker bug for that architecture.
+
+ * Checking out all the paths from HEAD during the last conflicted
+ step in "git rebase" and continuing would cause the step to be
+ skipped (which is expected), but leaves MERGE_MSG file behind in
+ $GIT_DIR and confuses the next "git commit", which has been
+ corrected.
+
+ * Various bugs in "git rebase -r" have been fixed.
+
+ * mmap() imitation used to call xmalloc() that dies upon malloc()
+ failure, which has been corrected to just return an error to the
+ caller to be handled.
+
+ * "git diff --relative" segfaulted and/or produced incorrect result
+ when there are unmerged paths.
+
+ * The delayed checkout code path in "git checkout" etc. were chatty
+ even when --quiet and/or --no-progress options were given.
+
+ * "git branch -D <branch>" used to refuse to remove a broken branch
+ ref that points at a missing commit, which has been corrected.
+
+ * Build update for Apple clang.
+
+ * The parser for the "--nl" option of "git column" has been
+ corrected.
+
+ * "git upload-pack" which runs on the other side of "git fetch"
+ forgot to take the ref namespaces into account when handling
+ want-ref requests.
+
+ * The sparse-index support can corrupt the index structure by storing
+ a stale and/or uninitialized data, which has been corrected.
+
+ * Buggy tests could damage repositories outside the throw-away test
+ area we created. We now by default export GIT_CEILING_DIRECTORIES
+ to limit the damage from such a stray test.
+
+ * Even when running "git send-email" without its own threaded
+ discussion support, a threading related header in one message is
+ carried over to the subsequent message to result in an unwanted
+ threading, which has been corrected.
+
+ * The output from "git fast-export", when its anonymization feature
+ is in use, showed an annotated tag incorrectly.
+
+ * Recent "diff -m" changes broke "gitk", which has been corrected.
+
+ * The "git apply -3" code path learned not to bother the lower level
+ merge machinery when the three-way merge can be trivially resolved
+ without the content level merge. This fixes a regression caused by
+ recent "-3way first and fall back to direct application" change.
+
+ * The code that optionally creates the *.rev reverse index file has
+ been optimized to avoid needless computation when it is not writing
+ the file out.
+
+ * "git range-diff -I... <range> <range>" segfaulted, which has been
+ corrected.
+
+ * The order in which various files that make up a single (conceptual)
+ packfile has been reevaluated and straightened up. This matters in
+ correctness, as an incomplete set of files must not be shown to a
+ running Git.
+
+ * The "mode" word is useless in a call to open(2) that does not
+ create a new file. Such a call in the files backend of the ref
+ subsystem has been cleaned up.
+
+ * "git update-ref --stdin" failed to flush its output as needed,
+ which potentially led the conversation to a deadlock.
+
+ * When "git am --abort" fails to abort correctly, it still exited
+ with exit status of 0, which has been corrected.
+
+ * Correct nr and alloc members of strvec struct to be of type size_t.
+
+ * "git stash", where the tentative change involves changing a
+ directory to a file (or vice versa), was confused, which has been
+ corrected.
+
+ * "git clone" from a repository whose HEAD is unborn into a bare
+ repository didn't follow the branch name the other side used, which
+ is corrected.
+
+ * "git cvsserver" had a long-standing bug in its authentication code,
+ which has finally been corrected (it is unclear and is a separate
+ question if anybody is seriously using it, though).
+
+ * "git difftool --dir-diff" mishandled symbolic links.
+
+ * Sensitive data in the HTTP trace were supposed to be redacted, but
+ we failed to do so in HTTP/2 requests.
+
+ * "make clean" has been updated to remove leftover .depend/
+ directories, even when it is not told to use them to compute header
+ dependencies.
+
+ * Protocol v0 clients can get stuck parsing a malformed feature line.
+
+ * A few kinds of changes "git status" can show were not documented.
+ (merge d2a534c515 ja/doc-status-types-and-copies later to maint).
+
+ * The mergesort implementation used to sort linked list has been
+ optimized.
+ (merge c90cfc225b rs/mergesort later to maint).
+
+ * An editor session launched during a Git operation (e.g. during 'git
+ commit') can leave the terminal in a funny state. The code path
+ has updated to save the terminal state before, and restore it
+ after, it spawns an editor.
+ (merge 3d411afabc cm/save-restore-terminal later to maint).
+
+ * "git cat-file --batch" with the "--batch-all-objects" option is
+ supposed to iterate over all the objects found in a repository, but
+ it used to translate these object names using the replace mechanism,
+ which defeats the point of enumerating all objects in the repository.
+ This has been corrected.
+ (merge bf972896d7 jk/cat-file-batch-all-wo-replace later to maint).
+
+ * Recent sparse-index work broke safety against attempts to add paths
+ with trailing slashes to the index, which has been corrected.
+ (merge c8ad9d04c6 rs/make-verify-path-really-verify-again later to maint).
+
+ * The "--color-lines" and "--color-by-age" options of "git blame"
+ have been missing, which are now documented.
+ (merge 8c32856133 bs/doc-blame-color-lines later to maint).
+
+ * The PATH used in CI job may be too wide and let incompatible dlls
+ to be grabbed, which can cause the build&test to fail. Tighten it.
+ (merge 7491ef6198 js/windows-ci-path-fix later to maint).
+
+ * Avoid performance measurements from getting ruined by gc and other
+ housekeeping pauses interfering in the middle.
+ (merge be79131a53 rs/disable-gc-during-perf-tests later to maint).
+
+ * Stop "git add --dry-run" from creating new blob and tree objects.
+ (merge e578d0311d rs/add-dry-run-without-objects later to maint).
+
+ * "git commit" gave duplicated error message when the object store
+ was unwritable, which has been corrected.
+ (merge 4ef91a2d79 ab/fix-commit-error-message-upon-unwritable-object-store later to maint).
+
+ * Recent sparse-index addition, namely any use of index_name_pos(),
+ can expand sparse index entries and breaks any code that walks
+ cache-tree or existing index entries. One such instance of such a
+ breakage has been corrected.
+
+ * The xxdiff difftool backend can exit with status 128, which the
+ difftool-helper that launches the backend takes as a significant
+ failure, when it is not significant at all. Work it around.
+ (merge 571f4348dd da/mergetools-special-case-xxdiff-exit-128 later to maint).
+
+ * Improve test framework around unwritable directories.
+ (merge 5d22e18965 ab/test-cleanly-recreate-trash-directory later to maint).
+
+ * "git push" client talking to an HTTP server did not diagnose the
+ lack of the final status report from the other side correctly,
+ which has been corrected.
+ (merge c5c3486f38 jk/http-push-status-fix later to maint).
+
+ * Update "git archive" documentation and give explicit mention on the
+ compression level for both zip and tar.gz format.
+ (merge c4b208c309 bs/archive-doc-compression-level later to maint).
+
+ * Drop "git sparse-checkout" from the list of common commands.
+ (merge 6a9a50a8af sg/sparse-index-not-that-common-a-command later to maint).
+
+ * "git branch -c/-m new old" was not described to copy config, which
+ has been corrected.
+ (merge 8252ec300e jc/branch-copy-doc later to maint).
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * Fix long-standing shell syntax error in the completion script.
+ (merge 46b0585286 re/completion-fix-test-equality later to maint).
+
+ * Teach "git commit-graph" command not to allow using replace objects
+ at all, as we do not use the commit-graph at runtime when we see
+ object replacement.
+ (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
+
+ * "git pull --no-verify" did not affect the underlying "git merge".
+ (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+ construct recently, which has been corrected.
+
+ * "git pull --ff-only" and "git pull --rebase --ff-only" should make
+ it a no-op to attempt pulling from a remote that is behind us, but
+ instead the command errored out by saying it was impossible to
+ fast-forward, which may technically be true, but not a useful thing
+ to diagnose as an error. This has been corrected.
+ (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
+
+ * The way Cygwin emulates a unix-domain socket, on top of which the
+ simple-ipc mechanism is implemented, can race with the program on
+ the other side that wants to use the socket, and briefly make it
+ appear as a regular file before lstat(2) starts reporting it as a
+ socket. We now have a workaround on the side that connects to a
+ unix domain socket.
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
+ (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
+ (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).
+ (merge dd20e4a6db ab/make-compdb-fix later to maint).
+ (merge 6ffb990dc4 os/status-docfix later to maint).
+ (merge 100c2da2d3 rs/p3400-lose-tac later to maint).
+ (merge 76f3b69896 tb/aggregate-ignore-leading-whitespaces later to maint).
+ (merge 6e4fd8bfcd tz/doc-link-to-bundle-format-fix later to maint).
+ (merge f6c013dfa1 jc/doc-commit-header-continuation-line later to maint).
+ (merge ec9a37d69b ab/pkt-line-cleanup later to maint).
+ (merge 8650c6298c ab/fix-make-lint-docs later to maint).
+ (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
+ (merge 6b615dbece ks/submodule-add-message-fix later to maint).
+ (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
+ (merge 559664c792 ab/test-lib later to maint).
diff --git a/Documentation/RelNotes/2.34.1.txt b/Documentation/RelNotes/2.34.1.txt
new file mode 100644
index 0000000..ad404e9
--- /dev/null
+++ b/Documentation/RelNotes/2.34.1.txt
@@ -0,0 +1,23 @@
+Git v2.34.1 Release Notes
+=========================
+
+This release is primarily to fix a handful of regressions in Git 2.34.
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+ completely broken when linked with certain versions of PCREv2
+ library in the latest release.
+
+ * "git pull" with any strategy when the other side is behind us
+ should succeed as it is a no-op, but doesn't.
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+ GIT_EDITOR mechanism when invoking "git config") to get stuck with
+ a SIGTTOU signal; it has been reverted.
+
+ * An earlier change that broke .gitignore matching has been reverted.
+
+ * SubmittingPatches document gained a syntactically incorrect mark-up,
+ which has been corrected.
diff --git a/Documentation/RelNotes/2.34.2.txt b/Documentation/RelNotes/2.34.2.txt
new file mode 100644
index 0000000..0c32cd8
--- /dev/null
+++ b/Documentation/RelNotes/2.34.2.txt
@@ -0,0 +1,6 @@
+Git v2.34.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2,
+v2.32.1 and v2.33.2 to address the security issue CVE-2022-24765;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.34.3.txt b/Documentation/RelNotes/2.34.3.txt
new file mode 100644
index 0000000..10f6171
--- /dev/null
+++ b/Documentation/RelNotes/2.34.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.34.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.34.3.
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index e409022..11e0305 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -448,7 +448,7 @@
entitled "What's cooking in git.git" and "What's in git.git" giving
the status of various proposed changes.
-== GitHub CI[[GHCI]]]
+== GitHub CI[[GHCI]]
With an account at GitHub, you can use GitHub CI to test your changes
on Linux, Mac and Windows. See
@@ -463,7 +463,7 @@
After the initial setup, CI will run whenever you push new changes
to your fork of Git on GitHub. You can monitor the test state of all your
-branches here: https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml
+branches here: `https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml`
If a branch did not pass all test cases then it is marked with a red
cross. In that case you can click on the failing job and navigate to
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 117f4cf..9a66353 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -136,5 +136,16 @@
option. An empty file name, `""`, will clear the list of revs from
previously processed files.
+--color-lines::
+ Color line annotations in the default format differently if they come from
+ the same commit as the preceding line. This makes it easier to distinguish
+ code blocks introduced by different commits. The color defaults to cyan and
+ can be adjusted using the `color.blame.repeatedLines` config option.
+
+--color-by-age::
+ Color line annotations depending on the age of the line in the default format.
+ The `color.blame.highlightRecent` config option controls what color is used for
+ each range of age.
+
-h::
Show help message.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a1efd74..cdff79b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -298,6 +298,15 @@
tilde expansion happens to such a string: `~/`
is expanded to the value of `$HOME`, and `~user/` to the
specified user's home directory.
++
+If a path starts with `%(prefix)/`, the remainder is interpreted as a
+path relative to Git's "runtime prefix", i.e. relative to the location
+where Git itself was installed. For example, `%(prefix)/bin/` refers to
+the directory in which the Git executable itself lives. If Git was
+compiled without runtime prefix support, the compiled-in prefix will be
+substituted instead. In the unlikely event that a literal path needs to
+be specified that should _not_ be expanded, it needs to be prefixed by
+`./`, like so: `./%(prefix)/bin`.
Variables
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 8b2849f..063eec2 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -44,6 +44,9 @@
Shown when linkgit:git-push[1] rejects a forced update of
a branch when its remote-tracking ref has updates that we
do not have locally.
+ skippedCherryPicks::
+ Shown when linkgit:git-rebase[1] skips a commit that has already
+ been cherry-picked onto the upstream branch.
statusAheadBehind::
Shown when linkgit:git-status[1] computes the ahead/behind
counts for a local ref compared to its remote tracking ref,
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index cc5f324..d323d73 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -85,10 +85,6 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When `preserve` (or just 'p', deprecated in favor of `merges`), 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` (or just 'i'), the rebase is run in interactive
mode.
+
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index e05d520..1795b2d 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -9,26 +9,27 @@
Use customized color for hints.
color.blame.highlightRecent::
- This can be used to color the metadata of a blame line depending
- on age of the line.
+ Specify the line annotation color for `git blame --color-by-age`
+ depending upon the age of the line.
+
-This setting should be set to a comma-separated list of color and date settings,
-starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the line was introduced
-before the given timestamp, overwriting older timestamped colors.
+This setting should be set to a comma-separated list of color and
+date settings, starting and ending with a color, the dates should be
+set from oldest to newest. The metadata will be colored with the
+specified colors if the line was introduced before the given
+timestamp, overwriting older timestamped colors.
+
-Instead of an absolute timestamp relative timestamps work as well, e.g.
-2.weeks.ago is valid to address anything older than 2 weeks.
+Instead of an absolute timestamp relative timestamps work as well,
+e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
+
-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
-everything older than one year blue, recent changes between one month and
-one year old are kept white, and lines introduced within the last month are
-colored red.
+It defaults to `blue,12 month ago,white,1 month ago,red`, which
+colors everything older than one year blue, recent changes between
+one month and one year old are kept white, and lines introduced
+within the last month are colored red.
color.blame.repeatedLines::
- Use the customized color for the part of git-blame output that
- is repeated meta information per line (such as commit id,
- author name, date and timezone). Defaults to cyan.
+ Use the specified color to colorize line annotations for
+ `git blame --color-lines`, if they come from the same commit as the
+ preceding line. Defaults to cyan.
color.branch::
A boolean to enable/disable color in the output of
@@ -104,9 +105,12 @@
`matchContext`;;
matching text in context lines
`matchSelected`;;
- matching text in selected lines
+ matching text in selected lines. Also, used to customize the following
+ linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.
`selected`;;
- non-matching text in selected lines
+ non-matching text in selected lines. Also, used to customize the
+ following linkgit:git-log[1] subcommands: `--grep`, `--author` and
+ `--committer`.
`separator`;;
separators between fields on a line (`:`, `-`, and `=`)
and between hunks (`--`)
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index d94025c..4f30c7d 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -11,13 +11,13 @@
gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
- Default is "openpgp" and another possible value is "x509".
+ Default is "openpgp". Other possible values are "x509", "ssh".
gpg.<format>.program::
Use this to customize the program used for the signing format you
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
be used as a legacy synonym for `gpg.openpgp.program`. The default
- value for `gpg.x509.program` is "gpgsm".
+ value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen".
gpg.minTrustLevel::
Specifies a minimum trust level for signature verification. If
@@ -33,3 +33,42 @@
* `marginal`
* `fully`
* `ultimate`
+
+gpg.ssh.defaultKeyCommand:
+ This command that will be run when user.signingkey is not set and a ssh
+ signature is requested. On successful exit a valid ssh public key is
+ expected in the first line of its output. To automatically use the first
+ available key from your ssh-agent set this to "ssh-add -L".
+
+gpg.ssh.allowedSignersFile::
+ A file containing ssh public keys which you are willing to trust.
+ The file consists of one or more lines of principals followed by an ssh
+ public key.
+ e.g.: user1@example.com,user2@example.com ssh-rsa AAAAX1...
+ See ssh-keygen(1) "ALLOWED SIGNERS" for details.
+ The principal is only used to identify the key and is available when
+ verifying a signature.
++
+SSH has no concept of trust levels like gpg does. To be able to differentiate
+between valid signatures and trusted signatures the trust level of a signature
+verification is set to `fully` when the public key is present in the allowedSignersFile.
+Otherwise the trust level is `undefined` and git verify-commit/tag will fail.
++
+This file can be set to a location outside of the repository and every developer
+maintains their own trust store. A central repository server could generate this
+file automatically from ssh keys with push access to verify the code against.
+In a corporate setting this file is probably generated at a global location
+from automation that already handles developer ssh keys.
++
+A repository that only allows signed commits can store the file
+in the repository itself using a path relative to the top-level of the working tree.
+This way only committers with an already valid key can add or change keys in the keyring.
++
+Using a SSH CA key with the cert-authority option
+(see ssh-keygen(1) "CERTIFICATES") is also valid.
+
+gpg.ssh.revocationFile::
+ Either a SSH KRL or a list of revoked public keys (without the principal prefix).
+ See ssh-keygen(1) for details.
+ If a public key is found in this file then it will always be treated
+ as having trust level "never" and signatures will show as invalid.
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 783a90a..610701f 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -9,13 +9,15 @@
help.autoCorrect::
If git detects typos and can identify exactly one valid command similar
- to the error, git will automatically run the intended command after
- waiting a duration of time defined by this configuration value in
- deciseconds (0.1 sec). If this value is 0, the suggested corrections
- will be shown, but not executed. If it is a negative integer, or
- "immediate", the suggested command
- is run immediately. If "never", suggestions are not shown at all. The
- default value is zero.
+ to the error, git will try to suggest the correct command or even
+ run the suggestion automatically. Possible config values are:
+ - 0 (default): show the suggested command.
+ - positive number: run the suggested command after specified
+deciseconds (0.1 sec).
+ - "immediate": run the suggested command immediately.
+ - "prompt": show the suggestion and prompt for confirmation to run
+the command.
+ - "never": don't run or show any suggested command.
help.htmlPath::
Specify the path where the HTML documentation resides. File system paths
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 763f7af..ad7f73a 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -159,6 +159,10 @@
between an older, bitmapped pack and objects that have been
pushed since the last gc). The downside is that it consumes 4
bytes per object of disk space. Defaults to true.
++
+When writing a multi-pack reachability bitmap, no new namehashes are
+computed; instead, any namehashes stored in an existing bitmap are
+permuted into their appropriate location when writing a new bitmap.
pack.writeReverseIndex::
When true, git will write a corresponding .rev file (see:
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 5404830..9349e09 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -18,10 +18,6 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When `preserve` (or just 'p', deprecated in favor of `merges`), 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` (or just 'i'), the rebase is run in interactive
mode.
+
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index 59aec7c..ad78dce 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -36,3 +36,10 @@
commit, you can override the default selection with this variable.
This option is passed unchanged to gpg's --local-user parameter,
so you may specify a key using any method that gpg supports.
+ If gpg.format is set to "ssh" this can contain the literal ssh public
+ key (e.g.: "ssh-rsa XXXXXX identifier") or a file which contains it and
+ corresponds to the private key used for signing. The private key
+ needs to be available via ssh-agent. Alternatively it can be set to
+ a file containing a private key directly. If not set git will call
+ gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first
+ key available.
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index fbbd410..7a9c3b6 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -59,7 +59,7 @@
- D: deletion of a file
- M: modification of the contents or mode of a file
- R: renaming of a file
-- T: change in the type of the file
+- T: change in the type of the file (regular file, symbolic link or submodule)
- U: file is unmerged (you must complete the merge before it can
be committed)
- X: "unknown" change type (most probably a bug, please report it)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index be5e3ac..11eb70f 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -9,7 +9,7 @@
--------
[verse]
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
- [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
+ [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
[--] [<pathspec>...]
@@ -79,6 +79,13 @@
--force::
Allow adding otherwise ignored files.
+--sparse::
+ Allow updating index entries outside of the sparse-checkout cone.
+ Normally, `git add` refuses to update index entries whose paths do
+ not fit within the sparse-checkout cone, since those files might
+ be removed from the working tree without warning. See
+ linkgit:git-sparse-checkout[1] for more details.
+
-i::
--interactive::
Add modified contents in the working tree interactively to
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 9f81728..bc4e76a 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -93,12 +93,19 @@
zip
~~~
--0::
- Store the files instead of deflating them.
--9::
- Highest and slowest compression level. You can specify any
- number from 1 to 9 to adjust compression speed and ratio.
+-<digit>::
+ Specify compression level. Larger values allow the command
+ to spend more time to compress to smaller size. Supported
+ values are from `-0` (store-only) to `-9` (best ratio).
+ Default is `-6` if not given.
+tar
+~~~
+-<number>::
+ Specify compression level. The value will be passed to the
+ compression command configured in `tar.<format>.command`. See
+ manual page of the configured command for the list of supported
+ levels and the default level if this option isn't specified.
CONFIGURATION
-------------
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 3bf5d5d..d7a46cc 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -11,8 +11,8 @@
'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>]
[--ignore-rev <rev>] [--ignore-revs-file <file>]
- [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
- [--] <file>
+ [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
+ [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file>
DESCRIPTION
-----------
@@ -93,6 +93,19 @@
is used for a caret to mark the boundary commit.
+THE DEFAULT FORMAT
+------------------
+
+When neither `--porcelain` nor `--incremental` option is specified,
+`git blame` will output annotation for each line with:
+
+- abbreviated object name for the commit the line came from;
+- author ident (by default author name and date, unless `-s` or `-e`
+ is specified); and
+- line number
+
+before the line contents.
+
THE PORCELAIN FORMAT
--------------------
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 5449767..8af42ef 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -125,14 +125,14 @@
-m::
--move::
- Move/rename a branch and the corresponding reflog.
+ Move/rename a branch, together with its config and reflog.
-M::
Shortcut for `--move --force`.
-c::
--copy::
- Copy a branch and the corresponding reflog.
+ Copy a branch, together with its config and reflog.
-C::
Shortcut for `--copy --force`.
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index ac0d003..72ab813 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -13,7 +13,7 @@
[--version=<version>] <file> <git-rev-list-args>
'git bundle' verify [-q | --quiet] <file>
'git bundle' list-heads <file> [<refname>...]
-'git bundle' unbundle <file> [<refname>...]
+'git bundle' unbundle [--progress] <file> [<refname>...]
DESCRIPTION
-----------
@@ -51,10 +51,10 @@
unbundled using the `--fix-thin` option to linkgit:git-index-pack[1].
There is no option to create a "thick pack" when using revision
-exclusions, users should not be concerned about the difference. By
-using "thin packs" bundles created using exclusions are smaller in
+exclusions, and users should not be concerned about the difference. By
+using "thin packs", bundles created using exclusions are smaller in
size. That they're "thin" under the hood is merely noted here as a
-curiosity, and as a reference to other documentation
+curiosity, and as a reference to other documentation.
See link:technical/bundle-format.html[the `bundle-format`
documentation] for more details and the discussion of "thin pack" in
@@ -144,7 +144,7 @@
SPECIFYING REFERENCES
---------------------
-Revisions must accompanied by reference names to be packaged in a
+Revisions must be accompanied by reference names to be packaged in a
bundle.
More than one reference may be packaged, and more than one set of prerequisite objects can
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 4eb0421..27b27e2 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -94,8 +94,10 @@
Instead of reading a list of objects on stdin, perform the
requested batch operation on all objects in the repository and
any alternate object stores (not just reachable objects).
- Requires `--batch` or `--batch-check` be specified. Note that
- the objects are visited in order sorted by their hashes.
+ Requires `--batch` or `--batch-check` be specified. By default,
+ the objects are visited in order sorted by their hashes; see
+ also `--unordered` below. Objects are presented as-is, without
+ respecting the "replace" mechanism of linkgit:git-replace[1].
--buffer::
Normally batch output is flushed after each object is output, so
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index b1a6fe4..d473c9b 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -118,8 +118,9 @@
-f::
--force::
When switching branches, proceed even if the index or the
- working tree differs from `HEAD`. This is used to throw away
- local changes.
+ working tree differs from `HEAD`, and even if there are untracked
+ files in the way. This is used to throw away local changes and
+ any untracked files or directories that are in the way.
+
When checking out paths from the index, do not fail upon unmerged
entries; instead, unmerged entries are ignored.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 95fec5f..6c60bf9 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -212,8 +212,9 @@
each trailer would appear, and other details.
-n::
---no-verify::
- This option bypasses the pre-commit and commit-msg hooks.
+--[no-]verify::
+ By default, the pre-commit and commit-msg hooks are run.
+ When any of `--no-verify` or `-n` is given, these are bypassed.
See also linkgit:githooks[5].
--allow-empty::
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 2ae2478..6da899c 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -235,6 +235,15 @@
without angle brackets, and `:localpart` to get the part before the `@` symbol
out of the trimmed email.
+The raw data in an object is `raw`.
+
+raw:size::
+ The raw data size of the object.
+
+Note that `--format=%(raw)` can not be used with `--python`, `--shell`, `--tcl`,
+because such language may not support arbitrary binary data in their string
+variable type.
+
The message in a commit or a tag object is `contents`, from which
`contents:<part>` can be used to extract various parts out of:
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index fe2f69d..113eabc 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -689,10 +689,10 @@
for A, B and C, and the identifiers for P, X, Y, Z are appended at the
end of the first message.
-If set `--base=auto` in cmdline, it will track base commit automatically,
-the base commit will be the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will automatically compute
+the base commit as the merge base of tip commit of the remote-tracking
branch and revision-range specified in cmdline.
-For a local branch, you need to track a remote branch by `git branch
+For a local branch, you need to make it to track a remote branch by `git branch
--set-upstream-to` before using this option.
EXAMPLES
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 44fe886..96d5f59 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,8 +8,10 @@
SYNOPSIS
--------
[verse]
-'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
- [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
+'git help' [-a|--all [--[no-]verbose]]
+ [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]
+'git help' [-g|--guides]
+'git help' [-c|--config]
DESCRIPTION
-----------
@@ -58,8 +60,7 @@
-g::
--guides::
- Prints a list of the Git concept guides on the standard output. This
- option overrides any given command or guide name.
+ Prints a list of the Git concept guides on the standard output.
-i::
--info::
diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index 558966a..0c5c0dd 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -16,7 +16,9 @@
clients accessing the repository over http:// and https:// protocols.
The program supports clients fetching using both the smart HTTP protocol
and the backwards-compatible dumb HTTP protocol, as well as clients
-pushing using the smart HTTP protocol.
+pushing using the smart HTTP protocol. It also supports Git's
+more-efficient "v2" protocol if properly configured; see the
+discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below.
It verifies that the directory has the magic file
"git-daemon-export-ok", and it will refuse to export any Git directory
@@ -77,6 +79,18 @@
SetEnv GIT_PROJECT_ROOT /var/www/git
SetEnv GIT_HTTP_EXPORT_ALL
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
+
+# This is not strictly necessary using Apache and a modern version of
+# git-http-backend, as the webserver will pass along the header in the
+# environment as HTTP_GIT_PROTOCOL, and http-backend will copy that into
+# GIT_PROTOCOL. But you may need this line (or something similar if you
+# are using a different webserver), or if you want to support older Git
+# versions that did not do that copying.
+#
+# Having the webserver set up GIT_PROTOCOL is perfectly fine even with
+# modern versions (and will take precedence over HTTP_GIT_PROTOCOL,
+# which means it can be used to override the client's request).
+SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
----------------------------------------------------------------
+
To enable anonymous read access but authenticated write access,
@@ -264,6 +278,16 @@
specified with a unit (e.g., `100M` for 100 megabytes). The default is
10 megabytes.
+Clients may probe for optional protocol capabilities (like the v2
+protocol) using the `Git-Protocol` HTTP header. In order to support
+these, the contents of that header must appear in the `GIT_PROTOCOL`
+environment variable. Most webservers will pass this header to the CGI
+via the `HTTP_GIT_PROTOCOL` variable, and `git-http-backend` will
+automatically copy that to `GIT_PROTOCOL`. However, some webservers may
+be more selective about which headers they'll pass, in which case they
+need to be configured explicitly (see the mention of `Git-Protocol` in
+the Apache config from the earlier EXAMPLES section).
+
The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and
GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}',
ensuring that any reflogs created by 'git-receive-pack' contain some
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 7fa74b9..1f1e359 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -82,6 +82,12 @@
--strict::
Die, if the pack contains broken objects or links.
+--progress-title::
+ For internal use only.
++
+Set the title of the progress bar. The title is "Receiving objects" by
+default and "Indexing objects" when `--stdin` is specified.
+
--check-self-contained-and-connected::
Die if the pack contains broken links. For internal use only.
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index 1e738ad..e2cfb68 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -179,6 +179,17 @@
`maintenance.<task>.enabled` configured as `true` are considered.
See the 'TASKS' section for the list of accepted `<task>` values.
+--scheduler=auto|crontab|systemd-timer|launchctl|schtasks::
+ When combined with the `start` subcommand, specify the scheduler
+ for running the hourly, daily and weekly executions of
+ `git maintenance run`.
+ Possible values for `<scheduler>` are `auto`, `crontab`
+ (POSIX), `systemd-timer` (Linux), `launchctl` (macOS), and
+ `schtasks` (Windows). When `auto` is specified, the
+ appropriate platform-specific scheduler is used; on Linux,
+ `systemd-timer` is used if available, otherwise
+ `crontab`. Default is `auto`.
+
TROUBLESHOOTING
---------------
@@ -277,6 +288,52 @@
schedule.
+BACKGROUND MAINTENANCE ON LINUX SYSTEMD SYSTEMS
+-----------------------------------------------
+
+While Linux supports `cron`, depending on the distribution, `cron` may
+be an optional package not necessarily installed. On modern Linux
+distributions, systemd timers are superseding it.
+
+If user systemd timers are available, they will be used as a replacement
+of `cron`.
+
+In this case, `git maintenance start` will create user systemd timer units
+and start the timers. The current list of user-scheduled tasks can be found
+by running `systemctl --user list-timers`. The timers written by `git
+maintenance start` are similar to this:
+
+-----------------------------------------------------------------------
+$ systemctl --user list-timers
+NEXT LEFT LAST PASSED UNIT ACTIVATES
+Thu 2021-04-29 19:00:00 CEST 42min left Thu 2021-04-29 18:00:11 CEST 17min ago git-maintenance@hourly.timer git-maintenance@hourly.service
+Fri 2021-04-30 00:00:00 CEST 5h 42min left Thu 2021-04-29 00:00:11 CEST 18h ago git-maintenance@daily.timer git-maintenance@daily.service
+Mon 2021-05-03 00:00:00 CEST 3 days left Mon 2021-04-26 00:00:11 CEST 3 days ago git-maintenance@weekly.timer git-maintenance@weekly.service
+-----------------------------------------------------------------------
+
+One timer is registered for each `--schedule=<frequency>` option.
+
+The definition of the systemd units can be inspected in the following files:
+
+-----------------------------------------------------------------------
+~/.config/systemd/user/git-maintenance@.timer
+~/.config/systemd/user/git-maintenance@.service
+~/.config/systemd/user/timers.target.wants/git-maintenance@hourly.timer
+~/.config/systemd/user/timers.target.wants/git-maintenance@daily.timer
+~/.config/systemd/user/timers.target.wants/git-maintenance@weekly.timer
+-----------------------------------------------------------------------
+
+`git maintenance start` will overwrite these files and start the timer
+again with `systemctl --user`, so any customization should be done by
+creating a drop-in file, i.e. a `.conf` suffixed file in the
+`~/.config/systemd/user/git-maintenance@.service.d` directory.
+
+`git maintenance stop` will stop the user systemd timers and delete
+the above mentioned files.
+
+For more details, see `systemd.timer(5)`.
+
+
BACKGROUND MAINTENANCE ON MACOS SYSTEMS
---------------------------------------
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index ffd601b..c588fb9 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -9,8 +9,7 @@
SYNOPSIS
--------
[verse]
-'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
- [--preferred-pack=<pack>] <subcommand>
+'git multi-pack-index' [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
DESCRIPTION
-----------
@@ -23,10 +22,13 @@
Use given directory for the location of Git objects. We check
`<dir>/packs/multi-pack-index` for the current MIDX file, and
`<dir>/packs` for the pack-files to index.
++
+`<dir>` must be an alternate of the current repository.
--[no-]progress::
Turn progress on/off explicitly. If neither is specified, progress is
- shown if standard error is connected to a terminal.
+ shown if standard error is connected to a terminal. Supported by
+ sub-commands `write`, `verify`, `expire`, and `repack.
The following subcommands are available:
@@ -37,9 +39,31 @@
--
--preferred-pack=<pack>::
Optionally specify the tie-breaking pack used when
- multiple packs contain the same object. If not given,
- ties are broken in favor of the pack with the lowest
- mtime.
+ multiple packs contain the same object. `<pack>` must
+ contain at least one object. If not given, ties are
+ broken in favor of the pack with the lowest mtime.
+
+ --[no-]bitmap::
+ Control whether or not a multi-pack bitmap is written.
+
+ --stdin-packs::
+ Write a multi-pack index containing only the set of
+ line-delimited pack index basenames provided over stdin.
+
+ --refs-snapshot=<path>::
+ With `--bitmap`, optionally specify a file which
+ contains a "refs snapshot" taken prior to repacking.
++
+A reference snapshot is composed of line-delimited OIDs corresponding to
+the reference tips, usually taken by `git repack` prior to generating a
+new pack. A line may optionally start with a `+` character to indicate
+that the reference which corresponds to that OID is "preferred" (see
+linkgit:git-config[1]'s `pack.preferBitmapTips`.)
++
+The file given at `<path>` is expected to be readable, and can contain
+duplicates. (If a given OID is given more than once, it is marked as
+preferred if at least one instance of it begins with the special `+`
+marker).
--
verify::
@@ -75,19 +99,26 @@
EXAMPLES
--------
-* Write a MIDX file for the packfiles in the current .git folder.
+* Write a MIDX file for the packfiles in the current `.git` directory.
+
-----------------------------------------------
$ git multi-pack-index write
-----------------------------------------------
+* Write a MIDX file for the packfiles in the current `.git` directory with a
+corresponding bitmap.
++
+-------------------------------------------------------------
+$ git multi-pack-index write --preferred-pack=<pack> --bitmap
+-------------------------------------------------------------
+
* Write a MIDX file for the packfiles in an alternate object store.
+
-----------------------------------------------
$ git multi-pack-index --object-dir <alt> write
-----------------------------------------------
-* Verify the MIDX file for the packfiles in the current .git folder.
+* Verify the MIDX file for the packfiles in the current `.git` directory.
+
-----------------------------------------------
$ git multi-pack-index verify
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index aef757e..0e14f8b 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -105,7 +105,7 @@
include::merge-options.txt[]
-r::
---rebase[=false|true|merges|preserve|interactive]::
+--rebase[=false|true|merges|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
@@ -116,10 +116,6 @@
the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When set to `preserve` (deprecated in favor of `merges`), rebase with the
-`--preserve-merges` option passed to `git rebase` so that locally created
-merge commits will not be flattened.
-+
When false, merge the upstream branch into the current branch.
+
When `interactive`, enable the interactive mode of rebase.
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5fa8bab..8c3aceb 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -10,8 +10,7 @@
--------
[verse]
'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]
- [-u [--exclude-per-directory=<gitignore>] | -i]]
- [--index-output=<file>] [--no-sparse-checkout]
+ [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])
@@ -39,8 +38,9 @@
--reset::
Same as -m, except that unmerged entries are discarded instead
- of failing. When used with `-u`, updates leading to loss of
- working tree changes will not abort the operation.
+ of failing. When used with `-u`, updates leading to loss of
+ working tree changes or untracked files or directories will not
+ abort the operation.
-u::
After a successful merge, update the files in the work
@@ -88,21 +88,6 @@
The command will refuse to overwrite entries that already
existed in the original index file.
---exclude-per-directory=<gitignore>::
- When running the command with `-u` and `-m` options, the
- merge result may need to overwrite paths that are not
- tracked in the current branch. The command usually
- refuses to proceed with the merge to avoid losing such a
- path. However this safety valve sometimes gets in the
- way. For example, it often happens that the other
- branch added a file that used to be a generated file in
- your branch, and the safety valve triggers when you try
- to switch to that branch after you ran `make` but before
- running `make clean` to remove the generated file. This
- option tells the command to read per-directory exclude
- file (usually '.gitignore') and allows such an untracked
- but explicitly ignored file to be overwritten.
-
--index-output=<file>::
Instead of writing the results out to `$GIT_INDEX_FILE`,
write the resulting index in the named file. While the
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 73d49ec..a1af21f 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -79,9 +79,10 @@
If the upstream branch already contains a change you have made (e.g.,
because you mailed a patch which was applied upstream), then that commit
-will be skipped. For example, running `git rebase master` on the
-following history (in which `A'` and `A` introduce the same set of changes,
-but have different committer information):
+will be skipped and warnings will be issued (if the `merge` backend is
+used). For example, running `git rebase master` on the following
+history (in which `A'` and `A` introduce the same set of changes, but
+have different committer information):
------------
A---B---C topic
@@ -312,7 +313,10 @@
By default (or if `--no-reapply-cherry-picks` is given), these commits
will be automatically dropped. Because this necessitates reading all
upstream commits, this can be expensive in repos with a large number
-of upstream commits that need to be read.
+of upstream commits that need to be read. When using the `merge`
+backend, warnings will be issued for each dropped commit (unless
+`--quiet` is given). Advice will also be issued unless
+`advice.skippedCherryPicks` is set to false (see linkgit:git-config[1]).
+
`--reapply-cherry-picks` allows rebase to forgo reading all upstream
commits, potentially improving performance.
@@ -352,8 +356,8 @@
-s <strategy>::
--strategy=<strategy>::
- Use the given merge strategy, instead of the default
- `recursive`. This implies `--merge`.
+ Use the given merge strategy, instead of the default `ort`.
+ This implies `--merge`.
+
Because 'git rebase' replays each commit from the working branch
on top of the <upstream> branch using the given strategy, using
@@ -366,7 +370,7 @@
--strategy-option=<strategy-option>::
Pass the <strategy-option> through to the merge strategy.
This implies `--merge` and, if no strategy has been
- specified, `-s recursive`. Note the reversal of 'ours' and
+ specified, `-s ort`. Note the reversal of 'ours' and
'theirs' as noted above for the `-m` option.
+
See also INCOMPATIBLE OPTIONS below.
@@ -442,7 +446,8 @@
ends up being empty, the <upstream> will be used as a fallback.
+
If <upstream> is given on the command line, then the default is
-`--no-fork-point`, otherwise the default is `--fork-point`.
+`--no-fork-point`, otherwise the default is `--fork-point`. See also
+`rebase.forkpoint` in linkgit:git-config[1].
+
If your branch was based on <upstream> but <upstream> was rewound and
your branch contains commits which were dropped, this option can be used
@@ -522,29 +527,12 @@
the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified).
+
-The `--rebase-merges` mode is similar in spirit to the deprecated
-`--preserve-merges` but works with interactive rebases,
-where commits can be reordered, inserted and dropped at will.
-+
It is currently only possible to recreate the merge commits using the
-`recursive` merge strategy; different merge strategies can be used only via
+`ort` merge strategy; different merge strategies can be used only via
explicit `exec git merge -s <strategy> [...]` commands.
+
See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
--p::
---preserve-merges::
- [DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
- instead of flattening the history by replaying commits a merge commit
- introduces. Merge conflict resolutions or manual amendments to merge
- commits are not preserved.
-+
-This uses the `--interactive` machinery internally, but combining it
-with the `--interactive` option explicitly is generally not a good
-idea unless you know what you are doing (see BUGS below).
-+
-See also INCOMPATIBLE OPTIONS below.
-
-x <cmd>::
--exec <cmd>::
Append "exec <cmd>" after each line creating a commit in the
@@ -576,9 +564,6 @@
the root commit(s) on a branch. When used with --onto, it
will skip changes already contained in <newbase> (instead of
<upstream>) whereas without --onto it will operate on every change.
- When used together with both --onto and --preserve-merges,
- 'all' root commits will be rewritten to have <newbase> as parent
- instead.
+
See also INCOMPATIBLE OPTIONS below.
@@ -640,7 +625,6 @@
* --allow-empty-message
* --[no-]autosquash
* --rebase-merges
- * --preserve-merges
* --interactive
* --exec
* --no-keep-empty
@@ -651,13 +635,6 @@
In addition, the following pairs of options are incompatible:
- * --preserve-merges and --interactive
- * --preserve-merges and --signoff
- * --preserve-merges and --rebase-merges
- * --preserve-merges and --empty=
- * --preserve-merges and --ignore-whitespace
- * --preserve-merges and --committer-date-is-author-date
- * --preserve-merges and --ignore-date
* --keep-base and --onto
* --keep-base and --root
* --fork-point and --root
@@ -1216,16 +1193,16 @@
If a `merge` command fails for any reason other than merge conflicts (i.e.
when the merge operation did not even start), it is rescheduled immediately.
-By default, the `merge` command will use the `recursive` merge
-strategy for regular merges, and `octopus` for octopus merges. One
-can specify a default strategy for all merges using the `--strategy`
-argument when invoking rebase, or can override specific merges in the
-interactive list of commands by using an `exec` command to call `git
-merge` explicitly with a `--strategy` argument. Note that when
-calling `git merge` explicitly like this, you can make use of the fact
-that the labels are worktree-local refs (the ref `refs/rewritten/onto`
-would correspond to the label `onto`, for example) in order to refer
-to the branches you want to merge.
+By default, the `merge` command will use the `ort` merge strategy for
+regular merges, and `octopus` for octopus merges. One can specify a
+default strategy for all merges using the `--strategy` argument when
+invoking rebase, or can override specific merges in the interactive
+list of commands by using an `exec` command to call `git merge`
+explicitly with a `--strategy` argument. Note that when calling `git
+merge` explicitly like this, you can make use of the fact that the
+labels are worktree-local refs (the ref `refs/rewritten/onto` would
+correspond to the label `onto`, for example) in order to refer to the
+branches you want to merge.
Note: the first command (`label onto`) labels the revision onto which
the commits are rebased; The name `onto` is just a convention, as a nod
@@ -1275,29 +1252,6 @@
include::config/rebase.txt[]
include::config/sequencer.txt[]
-BUGS
-----
-The todo list presented by the deprecated `--preserve-merges --interactive`
-does not represent the topology of the revision graph (use `--rebase-merges`
-instead). Editing commits and rewording their commit messages should work
-fine, but attempts to reorder commits tend to produce counterintuitive results.
-Use `--rebase-merges` in such scenarios instead.
-
-For example, an attempt to rearrange
-------------
-1 --- 2 --- 3 --- 4 --- 5
-------------
-to
-------------
-1 --- 2 --- 4 --- 3 --- 5
-------------
-by moving the "pick 4" line will result in the following history:
-------------
- 3
- /
-1 --- 2 --- 4 --- 5
-------------
-
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 25702ed..014a784 100644
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -41,6 +41,11 @@
<directory>::
The repository to sync into.
+--http-backend-info-refs::
+ Used by linkgit:git-http-backend[1] to serve up
+ `$GIT_URL/info/refs?service=git-receive-pack` requests. See
+ `--http-backend-info-refs` in linkgit:git-upload-pack[1].
+
PRE-RECEIVE HOOK
----------------
Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 24c00c9..7183fb4 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]
+'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]
DESCRIPTION
-----------
@@ -128,10 +128,11 @@
-b::
--write-bitmap-index::
Write a reachability bitmap index as part of the repack. This
- only makes sense when used with `-a` or `-A`, as the bitmaps
+ only makes sense when used with `-a`, `-A` or `-m`, as the bitmaps
must be able to refer to all reachable objects. This option
- overrides the setting of `repack.writeBitmaps`. This option
- has no effect if multiple packfiles are created.
+ overrides the setting of `repack.writeBitmaps`. This option
+ has no effect if multiple packfiles are created, unless writing a
+ MIDX (in which case a multi-pack bitmap is created).
--pack-kept-objects::
Include objects in `.keep` files when repacking. Note that we
@@ -189,6 +190,15 @@
to change in the future. This option (implying a drastically different
repack mode) is not guaranteed to work with all other combinations of
option to `git repack`.
++
+When writing a multi-pack bitmap, `git repack` selects the largest resulting
+pack as the preferred pack for object selection by the MIDX (see
+linkgit:git-multi-pack-index[1]).
+
+-m::
+--write-midx::
+ Write a multi-pack index (see linkgit:git-multi-pack-index[1])
+ containing the non-redundant packs.
CONFIGURATION
-------------
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 252e2d4..6f7685f 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -69,7 +69,8 @@
--hard::
Resets the index and working tree. Any changes to tracked files in the
- working tree since `<commit>` are discarded.
+ working tree since `<commit>` are discarded. Any untracked files or
+ directories in the way of writing any tracked files are simply deleted.
--merge::
Resets the index and updates the files in the working tree that are
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 26e9b28..81bc23f 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -72,6 +72,12 @@
--ignore-unmatch::
Exit with a zero status even if no files matched.
+--sparse::
+ Allow updating index entries outside of the sparse-checkout cone.
+ Normally, `git rm` refuses to update index entries whose paths do
+ not fit within the sparse-checkout cone. See
+ linkgit:git-sparse-checkout[1] for more.
+
-q::
--quiet::
`git rm` normally outputs one line (in the form of an `rm` command)
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 44fd146..be41f11 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -9,10 +9,10 @@
SYNOPSIS
--------
[verse]
-'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
+'git send-pack' [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
[--verbose] [--thin] [--atomic]
[--[no-]signed|--signed=(true|false|if-asked)]
- [<host>:]<directory> [<ref>...]
+ [<host>:]<directory> (--all | <ref>...)
DESCRIPTION
-----------
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index fdcf43f..42056ee 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -210,6 +210,16 @@
'git sparse-checkout set' command to reflect the expected cone in the working
directory.
+When changing the sparse-checkout patterns in cone mode, Git will inspect each
+tracked directory that is not within the sparse-checkout cone to see if it
+contains any untracked files. If all of those files are ignored due to the
+`.gitignore` patterns, then the directory will be deleted. If any of the
+untracked files within that directory is not ignored, then no deletions will
+occur within that directory and a warning message will appear. If these files
+are important, then reset your sparse-checkout definition so they are included,
+use `git add` and `git commit` to store them, then remove any remaining files
+manually to ensure Git can behave optimally.
+
SUBMODULES
----------
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 83f38e3..4a2c3e0 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -207,26 +207,29 @@
* ' ' = unmodified
* 'M' = modified
+* 'T' = file type changed (regular file, symbolic link or submodule)
* 'A' = added
* 'D' = deleted
* 'R' = renamed
-* 'C' = copied
+* 'C' = copied (if config option status.renames is set to "copies")
* 'U' = updated but unmerged
....
X Y Meaning
-------------------------------------------------
[AMD] not updated
-M [ MD] updated in index
-A [ MD] added to index
+M [ MTD] updated in index
+T [ MTD] type changed in index
+A [ MTD] added to index
D deleted from index
-R [ MD] renamed in index
-C [ MD] copied in index
-[MARC] index and work tree matches
-[ MARC] M work tree changed since index
-[ MARC] D deleted in work tree
-[ D] R renamed in work tree
-[ D] C copied in work tree
+R [ MTD] renamed in index
+C [ MTD] copied in index
+[MTARC] index and work tree matches
+[ MTARC] M work tree changed since index
+[ MTARC] T type changed in work tree since index
+[ MTARC] D deleted in work tree
+ R renamed in work tree
+ C copied in work tree
-------------------------------------------------
D D unmerged, both deleted
A U unmerged, added by us
@@ -363,7 +366,7 @@
Unmerged entries have the following format; the first character is
a "u" to distinguish from ordinary changed entries.
- u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
+ u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
....
Field Meaning
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index d5776ff..222b556 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -678,7 +678,6 @@
--strategy=<strategy>::
-p::
--rebase-merges::
---preserve-merges (DEPRECATED)::
These are only used with the 'dcommit' and 'rebase' commands.
+
Passed directly to 'git rebase' when using 'dcommit' if a
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 9822c1e..8f87b23 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -36,14 +36,26 @@
This fits with the HTTP POST request processing model where
a program may read the request, write a response, and must exit.
---advertise-refs::
- Only the initial ref advertisement is output, and the program exits
- immediately. This fits with the HTTP GET request model, where
- no request content is received but a response must be produced.
+--http-backend-info-refs::
+ Used by linkgit:git-http-backend[1] to serve up
+ `$GIT_URL/info/refs?service=git-upload-pack` requests. See
+ "Smart Clients" in link:technical/http-protocol.html[the HTTP
+ transfer protocols] documentation and "HTTP Transport" in
+ link:technical/protocol-v2.html[the Git Wire Protocol, Version
+ 2] documentation. Also understood by
+ linkgit:git-receive-pack[1].
<directory>::
The repository to sync from.
+ENVIRONMENT
+-----------
+
+`GIT_PROTOCOL`::
+ Internal variable used for handshaking the wire protocol. Server
+ admins may need to configure some transports to allow this
+ variable to be passed. See the discussion in linkgit:git[1].
+
SEE ALSO
--------
linkgit:gitnamespaces[7]
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6bb06d0..281c5f8 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -867,15 +867,16 @@
end user, to be recorded in the body of the reflog.
`GIT_REF_PARANOIA`::
- If set to `1`, include broken or badly named refs when iterating
- over lists of refs. In a normal, non-corrupted repository, this
- does nothing. However, enabling it may help git to detect and
- abort some operations in the presence of broken refs. Git sets
- this variable automatically when performing destructive
- operations like linkgit:git-prune[1]. You should not need to set
- it yourself unless you want to be paranoid about making sure
- an operation has touched every ref (e.g., because you are
- cloning a repository to make a backup).
+ If set to `0`, ignore broken or badly named refs when iterating
+ over lists of refs. Normally Git will try to include any such
+ refs, which may cause some operations to fail. This is usually
+ preferable, as potentially destructive operations (e.g.,
+ linkgit:git-prune[1]) are better off aborting rather than
+ ignoring broken refs (and thus considering the history they
+ point to as not worth saving). The default value is `1` (i.e.,
+ be paranoid about detecting and aborting all operations). You
+ should not normally need to set this to `0`, but it may be
+ useful when trying to salvage data from a corrupted repository.
`GIT_ALLOW_PROTOCOL`::
If set to a colon-separated list of protocols, behave as if
@@ -898,6 +899,21 @@
Contains a colon ':' separated list of keys with optional values
'key[=value]'. Presence of unknown keys and values must be
ignored.
++
+Note that servers may need to be configured to allow this variable to
+pass over some transports. It will be propagated automatically when
+accessing local repositories (i.e., `file://` or a filesystem path), as
+well as over the `git://` protocol. For git-over-http, it should work
+automatically in most configurations, but see the discussion in
+linkgit:git-http-backend[1]. For git-over-ssh, the ssh server may need
+to be configured to allow clients to pass this variable (e.g., by using
+`AcceptEnv GIT_PROTOCOL` with OpenSSH).
++
+This configuration is optional. If the variable is not propagated, then
+clients will fall back to the original "v0" protocol (but may miss out
+on some performance improvements or features). This variable currently
+only affects clones and fetches; it is not yet used for pushes (but may
+be in the future).
`GIT_OPTIONAL_LOCKS`::
If set to `0`, Git will complete any requested operation without
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index afdaeab..8c1f2d5 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -275,7 +275,7 @@
[[merge-two-revert-one]]
If I make a change on two branches but revert it on one, why does the merge of those branches include the change?::
- By default, when Git does a merge, it uses a strategy called the recursive
+ By default, when Git does a merge, it uses a strategy called the `ort`
strategy, which does a fancy three-way merge. In such a case, when Git
performs the merge, it considers exactly three points: the two heads and a
third point, called the _merge base_, which is usually the common ancestor of
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f8a1fc2..f2738b1 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -155,7 +155,7 @@
EXAMPLES
--------
- - The pattern `hello.*` matches any file or folder
+ - The pattern `hello.*` matches any file or directory
whose name begins with `hello.`. If one wants to restrict
this only to the directory and not in its subdirectories,
one can prepend the pattern with a slash, i.e. `/hello.*`;
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 3cc9b03..7cee9d3 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -547,7 +547,7 @@
# make the front page an internal rewrite to the gitweb script
RewriteRule ^/$ /cgi-bin/gitweb.cgi [QSA,L,PT]
- # look for a public_git folder in unix users' home
+ # look for a public_git directory in unix users' home
# http://git.example.org/~<user>/
RewriteRule ^/\~([^\/]+)(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \
[QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
index b22a367..1c61dd9 100755
--- a/Documentation/lint-gitlink.perl
+++ b/Documentation/lint-gitlink.perl
@@ -5,11 +5,12 @@
# Parse arguments, a simple state machine for input like:
#
-# howto/*.txt config/*.txt --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
+# <file-to-check.txt> <valid-files-to-link-to> --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
my %TXT;
my %SECTION;
my $section;
my $lint_these = 0;
+my $to_check = shift @ARGV;
for my $arg (@ARGV) {
if (my ($sec) = $arg =~ /^--section=(\d+)$/s) {
$section = $sec;
@@ -30,13 +31,14 @@
my ($pos, $line, $target, $msg) = @_;
substr($line, $pos) = "' <-- HERE";
$line =~ s/^\s+//;
- print "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
- print "$ARGV:$.:\t'$line\n";
+ print STDERR "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
+ print STDERR "$ARGV:$.:\t'$line\n";
$exit_code = 1;
}
@ARGV = sort values %TXT;
-die "BUG: Nothing to process!" unless @ARGV;
+die "BUG: No list of valid linkgit:* files given" unless @ARGV;
+@ARGV = $to_check;
while (<>) {
my $line = $_;
while ($line =~ m/linkgit:((.*?)\[(\d)\])/g) {
diff --git a/Documentation/lint-man-end-blurb.perl b/Documentation/lint-man-end-blurb.perl
index d69312e..6bdb13a 100755
--- a/Documentation/lint-man-end-blurb.perl
+++ b/Documentation/lint-man-end-blurb.perl
@@ -6,7 +6,7 @@
my $exit_code = 0;
sub report {
my ($target, $msg) = @_;
- print "error: $target: $msg\n";
+ print STDERR "error: $target: $msg\n";
$exit_code = 1;
}
diff --git a/Documentation/lint-man-section-order.perl b/Documentation/lint-man-section-order.perl
index b05f915..425377d 100755
--- a/Documentation/lint-man-section-order.perl
+++ b/Documentation/lint-man-section-order.perl
@@ -46,7 +46,7 @@
my $exit_code = 0;
sub report {
my ($msg) = @_;
- print "$ARGV:$.: $msg\n";
+ print STDERR "$ARGV:$.: $msg\n";
$exit_code = 1;
}
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 86f277a..d8f7cd7 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -132,8 +132,9 @@
Only useful when merging.
endif::git-pull[]
---no-verify::
- This option bypasses the pre-merge and commit-msg hooks.
+--[no-]verify::
+ By default, the pre-merge and commit-msg hooks are run.
+ When `--no-verify` is given, these are bypassed.
See also linkgit:githooks[5].
ifdef::git-pull[]
Only useful when merging.
@@ -144,7 +145,7 @@
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies
- is used instead (`recursive` when merging a single head,
+ is used instead (`ort` when merging a single head,
`octopus` otherwise).
-X <option>::
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 210f0f8..5fc54ec 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -6,21 +6,23 @@
can also take their own options, which can be passed by giving `-X<option>`
arguments to `git merge` and/or `git pull`.
-recursive::
- This can only resolve two heads using a 3-way merge
- algorithm. When there is more than one common
- ancestor that can be used for 3-way merge, it creates a
- merged tree of the common ancestors and uses that as
- the reference tree for the 3-way merge. This has been
- reported to result in fewer merge conflicts without
- causing mismerges by tests done on actual merge commits
- taken from Linux 2.6 kernel development history.
- Additionally this can detect and handle merges involving
- renames. It does not make use of detected copies. This
- is the default merge strategy when pulling or merging one
- branch.
+ort::
+ This is the default merge strategy when pulling or merging one
+ branch. This strategy can only resolve two heads using a
+ 3-way merge algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a merged
+ tree of the common ancestors and uses that as the reference
+ tree for the 3-way merge. This has been reported to result in
+ fewer merge conflicts without causing mismerges by tests done
+ on actual merge commits taken from Linux 2.6 kernel
+ development history. Additionally this strategy can detect
+ and handle merges involving renames. It does not make use of
+ detected copies. The name for this algorithm is an acronym
+ ("Ostensibly Recursive's Twin") and came from the fact that it
+ was written as a replacement for the previous default
+ algorithm, `recursive`.
+
-The 'recursive' strategy can take the following options:
+The 'ort' strategy can take the following options:
ours;;
This option forces conflicting hunks to be auto-resolved cleanly by
@@ -36,16 +38,6 @@
This is the opposite of 'ours'; note that, unlike 'ours', there is
no 'theirs' merge strategy to confuse this merge option with.
-patience;;
- Deprecated synonym for `diff-algorithm=patience`.
-
-diff-algorithm=[patience|minimal|histogram|myers];;
- Use a different diff algorithm while merging, which can help
- avoid mismerges that occur due to unimportant matching lines
- (such as braces from distinct functions). See also
- linkgit:git-diff[1] `--diff-algorithm`. Defaults to the
- `diff.algorithm` config setting.
-
ignore-space-change;;
ignore-all-space;;
ignore-space-at-eol;;
@@ -74,11 +66,6 @@
Disables the `renormalize` option. This overrides the
`merge.renormalize` configuration variable.
-no-renames;;
- Turn off rename detection. This overrides the `merge.renames`
- configuration variable.
- See also linkgit:git-diff[1] `--no-renames`.
-
find-renames[=<n>];;
Turn on rename detection, optionally setting the similarity
threshold. This is the default. This overrides the
@@ -95,19 +82,39 @@
is prefixed (or stripped from the beginning) to make the shape of
two trees to match.
-ort::
- This is meant as a drop-in replacement for the `recursive`
- algorithm (as reflected in its acronym -- "Ostensibly
- Recursive's Twin"), and will likely replace it in the future.
- It fixes corner cases that the `recursive` strategy handles
- suboptimally, and is significantly faster in large
- repositories -- especially when many renames are involved.
+recursive::
+ This can only resolve two heads using a 3-way merge
+ algorithm. When there is more than one common
+ ancestor that can be used for 3-way merge, it creates a
+ merged tree of the common ancestors and uses that as
+ the reference tree for the 3-way merge. This has been
+ reported to result in fewer merge conflicts without
+ causing mismerges by tests done on actual merge commits
+ taken from Linux 2.6 kernel development history.
+ Additionally this can detect and handle merges involving
+ renames. It does not make use of detected copies. This was
+ the default strategy for resolving two heads from Git v0.99.9k
+ until v2.33.0.
+
-The `ort` strategy takes all the same options as `recursive`.
-However, it ignores three of those options: `no-renames`,
-`patience` and `diff-algorithm`. It always runs with rename
-detection (it handles it much faster than `recursive` does), and
-it specifically uses `diff-algorithm=histogram`.
+The 'recursive' strategy takes the same options as 'ort'. However,
+there are three additional options that 'ort' ignores (not documented
+above) that are potentially useful with the 'recursive' strategy:
+
+patience;;
+ Deprecated synonym for `diff-algorithm=patience`.
+
+diff-algorithm=[patience|minimal|histogram|myers];;
+ Use a different diff algorithm while merging, which can help
+ avoid mismerges that occur due to unimportant matching lines
+ (such as braces from distinct functions). See also
+ linkgit:git-diff[1] `--diff-algorithm`. Note that `ort`
+ specifically uses `diff-algorithm=histogram`, while `recursive`
+ defaults to the `diff.algorithm` config setting.
+
+no-renames;;
+ Turn off rename detection. This overrides the `merge.renames`
+ configuration variable.
+ See also linkgit:git-diff[1] `--no-renames`.
resolve::
This can only resolve two heads (i.e. the current branch
@@ -131,13 +138,13 @@
the 'recursive' merge strategy.
subtree::
- This is a modified recursive strategy. When merging trees A and
+ This is a modified `ort` strategy. When merging trees A and
B, if B corresponds to a subtree of A, B is first adjusted to
match the tree structure of A, instead of reading the trees at
the same level. This adjustment is also done to the common
ancestor tree.
-With the strategies that use 3-way merge (including the default, 'recursive'),
+With the strategies that use 3-way merge (including the default, 'ort'),
if a change is made on both branches, but later reverted on one of the
branches, that change will be present in the merged result; some people find
this behavior confusing. It occurs because only the heads and the merge base
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 5a60bbf..acfd5dc 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -198,11 +198,6 @@
The filename will be prefixed by passing the filename along with
the prefix argument of `parse_options()` to `prefix_filename()`.
-`OPT_ARGUMENT(long, &int_var, description)`::
- Introduce a long-option argument that will be kept in `argv[]`.
- If this option was seen, `int_var` will be set to one (except
- if a `NULL` pointer was passed).
-
`OPT_NUMBER_CALLBACK(&var, description, func_ptr)`::
Recognize numerical options like -123 and feed the integer as
if it was an argument to the function given by `func_ptr`.
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index 037a91c..bb13ca3 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -128,7 +128,7 @@
------------
$ cat ~/log.event
-{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"}
{"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
{"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
{"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -391,7 +391,7 @@
{
"event":"version",
...
- "evt":"2", # EVENT format version
+ "evt":"3", # EVENT format version
"exe":"2.20.1.155.g426c96fcdb" # git version
}
------------
@@ -493,6 +493,20 @@
}
------------
+`"cmd_ancestry"`::
+ This event contains the text command name for the parent (and earlier
+ generations of parents) of the current process, in an array ordered from
+ nearest parent to furthest great-grandparent. It may not be implemented
+ on all platforms.
++
+------------
+{
+ "event":"cmd_ancestry",
+ ...
+ "ancestry":["bash","tmux: server","systemd"]
+}
+------------
+
`"cmd_name"`::
This event contains the command name for this git process
and the hierarchy of commands from parent git processes.
@@ -599,6 +613,46 @@
So this time will be slightly larger than the atexit time reported by
the child process itself.
+`"child_ready"`::
+ This event is generated after the current process has started
+ a background process and released all handles to it.
++
+------------
+{
+ "event":"child_ready",
+ ...
+ "child_id":2,
+ "pid":14708, # child PID
+ "ready":"ready", # child ready state
+ "t_rel":0.110605 # observed run-time of child process
+}
+------------
++
+Note that the session-id of the child process is not available to
+the current/spawning process, so the child's PID is reported here as
+a hint for post-processing. (But it is only a hint because the child
+process may be a shell script which doesn't have a session-id.)
++
+This event is generated after the child is started in the background
+and given a little time to boot up and start working. If the child
+startups normally and while the parent is still waiting, the "ready"
+field will have the value "ready".
+If the child is too slow to start and the parent times out, the field
+will have the value "timeout".
+If the child starts but the parent is unable to probe it, the field
+will have the value "error".
++
+After the parent process emits this event, it will release all of its
+handles to the child process and treat the child as a background
+daemon. So even if the child does eventually finish booting up,
+the parent will not emit an updated event.
++
+Note that the `t_rel` field contains the observed run time in seconds
+when the parent released the child process into the background.
+The child is assumed to be a long-running daemon process and may
+outlive the parent process. So the parent's child event times should
+not be compared to the child's atexit times.
+
`"exec"`::
This event is generated before git attempts to `exec()`
another command rather than starting a child process.
diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt
index f8c18a0..04b3ec2 100644
--- a/Documentation/technical/bitmap-format.txt
+++ b/Documentation/technical/bitmap-format.txt
@@ -1,6 +1,44 @@
GIT bitmap v1 format
====================
+== Pack and multi-pack bitmaps
+
+Bitmaps store reachability information about the set of objects in a packfile,
+or a multi-pack index (MIDX). The former is defined obviously, and the latter is
+defined as the union of objects in packs contained in the MIDX.
+
+A bitmap may belong to either one pack, or the repository's multi-pack index (if
+it exists). A repository may have at most one bitmap.
+
+An object is uniquely described by its bit position within a bitmap:
+
+ - If the bitmap belongs to a packfile, the __n__th bit corresponds to
+ the __n__th object in pack order. For a function `offset` which maps
+ objects to their byte offset within a pack, pack order is defined as
+ follows:
+
+ o1 <= o2 <==> offset(o1) <= offset(o2)
+
+ - If the bitmap belongs to a MIDX, the __n__th bit corresponds to the
+ __n__th object in MIDX order. With an additional function `pack` which
+ maps objects to the pack they were selected from by the MIDX, MIDX order
+ is defined as follows:
+
+ o1 <= o2 <==> pack(o1) <= pack(o2) /\ offset(o1) <= offset(o2)
+
+ The ordering between packs is done according to the MIDX's .rev file.
+ Notably, the preferred pack sorts ahead of all other packs.
+
+The on-disk representation (described below) of a bitmap is the same regardless
+of whether or not that bitmap belongs to a packfile or a MIDX. The only
+difference is the interpretation of the bits, which is described above.
+
+Certain bitmap extensions are supported (see: Appendix B). No extensions are
+required for bitmaps corresponding to packfiles. For bitmaps that correspond to
+MIDXs, both the bit-cache and rev-cache extensions are required.
+
+== On-disk format
+
- A header appears at the beginning:
4-byte signature: {'B', 'I', 'T', 'M'}
@@ -14,17 +52,19 @@
The following flags are supported:
- BITMAP_OPT_FULL_DAG (0x1) REQUIRED
- This flag must always be present. It implies that the bitmap
- index has been generated for a packfile with full closure
- (i.e. where every single object in the packfile can find
- its parent links inside the same packfile). This is a
- requirement for the bitmap index format, also present in JGit,
- that greatly reduces the complexity of the implementation.
+ This flag must always be present. It implies that the
+ bitmap index has been generated for a packfile or
+ multi-pack index (MIDX) with full closure (i.e. where
+ every single object in the packfile/MIDX can find its
+ parent links inside the same packfile/MIDX). This is a
+ requirement for the bitmap index format, also present in
+ JGit, that greatly reduces the complexity of the
+ implementation.
- BITMAP_OPT_HASH_CACHE (0x4)
If present, the end of the bitmap file contains
`N` 32-bit name-hash values, one per object in the
- pack. The format and meaning of the name-hash is
+ pack/MIDX. The format and meaning of the name-hash is
described below.
4-byte entry count (network byte order)
@@ -33,7 +73,8 @@
20-byte checksum
- The SHA1 checksum of the pack this bitmap index belongs to.
+ The SHA1 checksum of the pack/MIDX this bitmap index
+ belongs to.
- 4 EWAH bitmaps that act as type indexes
@@ -50,7 +91,7 @@
- Tags
In each bitmap, the `n`th bit is set to true if the `n`th object
- in the packfile is of that type.
+ in the packfile or multi-pack index is of that type.
The obvious consequence is that the OR of all 4 bitmaps will result
in a full set (all bits set), and the AND of all 4 bitmaps will
@@ -62,8 +103,9 @@
Each entry contains the following:
- 4-byte object position (network byte order)
- The position **in the index for the packfile** where the
- bitmap for this commit is found.
+ The position **in the index for the packfile or
+ multi-pack index** where the bitmap for this commit is
+ found.
- 1-byte XOR-offset
The xor offset used to compress this bitmap. For an entry
@@ -146,10 +188,11 @@
---------------
If the BITMAP_OPT_HASH_CACHE flag is set, the end of the bitmap contains
-a cache of 32-bit values, one per object in the pack. The value at
+a cache of 32-bit values, one per object in the pack/MIDX. The value at
position `i` is the hash of the pathname at which the `i`th object
-(counting in index order) in the pack can be found. This can be fed
-into the delta heuristics to compare objects with similar pathnames.
+(counting in index or multi-pack index order) in the pack/MIDX can be found.
+This can be fed into the delta heuristics to compare objects with similar
+pathnames.
The hash algorithm used is:
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 96d89ea..cc5126c 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -225,6 +225,9 @@
Documentation/technical/pack-protocol.txt) as a colon-separated string
in the Git-Protocol HTTP header.
+Uses the `--http-backend-info-refs` option to
+linkgit:git-upload-pack[1].
+
Dumb Server Response
^^^^^^^^^^^^^^^^^^^^
Dumb servers MUST respond with the dumb server reply format.
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index fb68897..86f40f2 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -36,7 +36,9 @@
directory of an alternate. It refers only to packfiles in that
same directory.
-- The core.multiPackIndex config setting must be on to consume MIDX files.
+- The core.multiPackIndex config setting must be on (which is the
+ default) to consume MIDX files. Setting it to `false` prevents
+ Git from reading a MIDX file, even if one exists.
- The file format includes parameters for the object ID hash
function, so a future change of hash algorithm does not require
@@ -71,14 +73,10 @@
still reducing the number of binary searches required for object
lookups.
-- The reachability bitmap is currently paired directly with a single
- packfile, using the pack-order as the object order to hopefully
- compress the bitmaps well using run-length encoding. This could be
- extended to pair a reachability bitmap with a multi-pack-index. If
- the multi-pack-index is extended to store a "stable object order"
+- If the multi-pack-index is extended to store a "stable object order"
(a function Order(hash) = integer that is constant for a given hash,
- even as the multi-pack-index is updated) then a reachability bitmap
- could point to a multi-pack-index and be updated independently.
+ even as the multi-pack-index is updated) then MIDX bitmaps could be
+ updated independently of the MIDX.
- Packfiles can be marked as "special" using empty files that share
the initial name but replace ".pack" with ".keep" or ".promisor".
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 1040d85..21e8258 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -42,7 +42,8 @@
In general a client can request to speak protocol v2 by sending
`version=2` through the respective side-channel for the transport being
used which inevitably sets `GIT_PROTOCOL`. More information can be
-found in `pack-protocol.txt` and `http-protocol.txt`. In all cases the
+found in `pack-protocol.txt` and `http-protocol.txt`, as well as the
+`GIT_PROTOCOL` definition in `git.txt`. In all cases the
response from the server is the capability advertisement.
Git Transport
@@ -58,6 +59,8 @@
When using either the ssh:// or file:// transport, the GIT_PROTOCOL
environment variable must be set explicitly to include "version=2".
+The server may need to be configured to allow this environment variable
+to pass.
HTTP Transport
~~~~~~~~~~~~~~
@@ -81,6 +84,12 @@
Subsequent requests are then made directly to the service
`$GIT_URL/git-upload-pack`. (This works the same for git-receive-pack).
+Uses the `--http-backend-info-refs` option to
+linkgit:git-upload-pack[1].
+
+The server may need to be configured to pass this header's contents via
+the `GIT_PROTOCOL` variable. See the discussion in `git-http-backend.txt`.
+
Capability Advertisement
------------------------
@@ -190,7 +199,11 @@
Show peeled tags.
ref-prefix <prefix>
When specified, only references having a prefix matching one of
- the provided prefixes are displayed.
+ the provided prefixes are displayed. Multiple instances may be
+ given, in which case references matching any prefix will be
+ shown. Note that this is purely for optimization; a server MAY
+ show refs not matching the prefix if it chooses, and clients
+ should filter the result themselves.
If the 'unborn' feature is advertised the following argument can be
included in the client's request.
diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt
index 2c9406a..166721b 100644
--- a/Documentation/technical/signature-format.txt
+++ b/Documentation/technical/signature-format.txt
@@ -13,6 +13,22 @@
and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
+Signatures sometimes appear as a part of the normal payload
+(e.g. a signed tag has the signature block appended after the payload
+that the signature applies to), and sometimes appear in the value of
+an object header (e.g. a merge commit that merged a signed tag would
+have the entire tag contents on its "mergetag" header). In the case
+of the latter, the usual multi-line formatting rule for object
+headers applies. I.e. the second and subsequent lines are prefixed
+with a SP to signal that the line is continued from the previous
+line.
+
+This is even true for an originally empty line. In the following
+examples, the end of line that ends with a whitespace letter is
+highlighted with a `$` sign; if you are trying to recreate these
+example by hand, do not cut and paste them---they are there
+primarily to highlight extra whitespace at the end of some lines.
+
The signed payload and the way the signature is embedded depends
on the type of the object resp. transaction.
@@ -78,7 +94,7 @@
committer C O Mitter <committer@example.com> 1465981137 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-
+ $
iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/
HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7
DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA
@@ -128,13 +144,13 @@
type commit
tag signedtag
tagger C O Mitter <committer@example.com> 1465981006 +0000
-
+ $
signed tag
-
+ $
signed tag message body
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-
+ $
iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 9624059..865074b 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3190,7 +3190,7 @@
not being pointed to by any commit or tree, so it's now a dangling blob
object.
-Similarly, when the "recursive" merge strategy runs, and finds that
+Similarly, when the "ort" merge strategy runs, and finds that
there are criss-cross merges and thus more than one merge base (which is
fairly unusual, but it does happen), it will generate one temporary
midway tree (or possibly even more, if you had lots of criss-crossing
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 86a3a28..3ae7610 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.33.3
+DEF_VER=v2.34.3
LF='
'
diff --git a/INSTALL b/INSTALL
index 66389ce..4140a3f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -138,12 +138,15 @@
BLK_SHA1. Also included is a version optimized for PowerPC
(PPC_SHA1).
- - "libcurl" library is used by git-http-fetch, git-fetch, and, if
- the curl version >= 7.34.0, for git-imap-send. You might also
- want the "curl" executable for debugging purposes. If you do not
- use http:// or https:// repositories, and do not want to put
- patches into an IMAP mailbox, you do not have to have them
- (use NO_CURL).
+ - "libcurl" library is used for fetching and pushing
+ repositories over http:// or https://, as well as by
+ git-imap-send if the curl version is >= 7.34.0. If you do
+ not need that functionality, use NO_CURL to build without
+ it.
+
+ Git requires version "7.19.4" or later of "libcurl" to build
+ without NO_CURL. This version requirement may be bumped in
+ the future.
- "expat" library; git-http-push uses it for remote lock
management over DAV. Similar to "curl" above, this is optional
diff --git a/Makefile b/Makefile
index 3df0ab5..12be39a 100644
--- a/Makefile
+++ b/Makefile
@@ -409,15 +409,6 @@
# Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
# before 2.17) for clock_gettime and CLOCK_MONOTONIC.
#
-# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
-# compiles the following initialization:
-#
-# static const char s[] = ("FOO");
-#
-# and define it to "no" if you need to remove the parentheses () around the
-# constant. The default is "auto", which means to use parentheses if your
-# compiler is detected to support it.
-#
# Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
#
# Define HAVE_GETDELIM if your system has the getdelim() function.
@@ -465,6 +456,9 @@
# the global variable _wpgmptr containing the absolute path of the current
# executable (this is the case on Windows).
#
+# INSTALL_STRIP can be set to "-s" to strip binaries during installation,
+# if your $(INSTALL) command supports the option.
+#
# Define GENERATE_COMPILATION_DATABASE to "yes" to generate JSON compilation
# database entries during compilation if your compiler supports it, using the
# `-MJ` flag. The JSON entries will be placed in the `compile_commands/`
@@ -495,10 +489,9 @@
# setting this flag the exceptions are removed, and all of
# -Wextra is used.
#
-# pedantic:
+# no-pedantic:
#
-# Enable -pedantic compilation. This also disables
-# USE_PARENS_AROUND_GETTEXT_N to produce only relevant warnings.
+# Disable -pedantic compilation.
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -616,7 +609,6 @@
SCRIPT_SH += git-web--browse.sh
SCRIPT_LIB += git-mergetool--lib
-SCRIPT_LIB += git-rebase--preserve-merges
SCRIPT_LIB += git-sh-i18n
SCRIPT_LIB += git-sh-setup
@@ -824,6 +816,10 @@
GENERATED_H += command-list.h
GENERATED_H += config-list.h
+GENERATED_H += hook-list.h
+
+.PHONY: generated-hdrs
+generated-hdrs: $(GENERATED_H)
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
$(FIND) . \
@@ -909,6 +905,7 @@
LIB_OBJS += hashmap.o
LIB_OBJS += help.o
LIB_OBJS += hex.o
+LIB_OBJS += hook.o
LIB_OBJS += ident.o
LIB_OBJS += json-writer.o
LIB_OBJS += kwset.o
@@ -1221,6 +1218,9 @@
SPARSE_FLAGS ?=
SP_EXTRA_FLAGS = -Wno-universal-initializer
+# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak target
+SANITIZE_LEAK =
+
# For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will
# usually result in less CPU usage at the cost of higher peak memory.
# Setting it to 0 will feed all files in a single spatch invocation.
@@ -1265,6 +1265,7 @@
endif
ifneq ($(filter leak,$(SANITIZERS)),)
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
+SANITIZE_LEAK = YesCompiledWithIt
endif
ifneq ($(filter address,$(SANITIZERS)),)
NO_REGEX = NeededForASAN
@@ -1285,6 +1286,7 @@
ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
dep_check = $(shell $(CC) $(ALL_CFLAGS) \
+ -Wno-pedantic \
-c -MF /dev/null -MQ /dev/null -MMD -MP \
-x c /dev/null -o /dev/null 2>&1; \
echo $$?)
@@ -1310,6 +1312,7 @@
ifeq ($(GENERATE_COMPILATION_DATABASE),yes)
compdb_check = $(shell $(CC) $(ALL_CFLAGS) \
+ -Wno-pedantic \
-c -MJ /dev/null \
-x c /dev/null -o /dev/null 2>&1; \
echo $$?)
@@ -1347,14 +1350,6 @@
BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
endif
-ifeq (yes,$(USE_PARENS_AROUND_GETTEXT_N))
- BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=1
-else
-ifeq (no,$(USE_PARENS_AROUND_GETTEXT_N))
- BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
-endif
-endif
-
ifeq ($(uname_S),Darwin)
ifndef NO_FINK
ifeq ($(shell test -d /sw/lib && echo y),y)
@@ -1436,15 +1431,8 @@
REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
PROGRAM_OBJS += http-fetch.o
PROGRAMS += $(REMOTE_CURL_NAMES)
- curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
- ifeq "$(curl_check)" "070908"
- ifndef NO_EXPAT
- PROGRAM_OBJS += http-push.o
- else
- EXCLUDED_PROGRAMS += git-http-push
- endif
- else
- EXCLUDED_PROGRAMS += git-http-push
+ ifndef NO_EXPAT
+ PROGRAM_OBJS += http-push.o
endif
curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
ifeq "$(curl_check)" "072200"
@@ -1917,6 +1905,10 @@
BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"'
endif
+ifndef HAVE_PLATFORM_PROCINFO
+ COMPAT_OBJS += compat/stub/procinfo.o
+endif
+
ifdef HAVE_NS_GET_EXECUTABLE_PATH
BASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH
endif
@@ -2223,8 +2215,9 @@
$(filter %.o,$^) $(LIBS)
help.sp help.s help.o: command-list.h
+hook.sp hook.s hook.o: hook-list.h
-builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX
+builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
@@ -2247,15 +2240,17 @@
config-list.h: generate-configlist.sh
config-list.h: Documentation/*config.txt Documentation/config/*.txt
- $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
- >$@+ && mv $@+ $@
+ $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh >$@
command-list.h: generate-cmdlist.sh command-list.txt
command-list.h: $(wildcard Documentation/git*.txt)
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
- command-list.txt >$@+ && mv $@+ $@
+ command-list.txt >$@
+
+hook-list.h: generate-hooklist.sh Documentation/githooks.txt
+ $(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
@@ -2517,13 +2512,6 @@
include $(dep_files_present)
endif
else
-# Dependencies on header files, for platforms that do not support
-# the gcc -MMD option.
-#
-# Dependencies on automatically generated headers such as command-list.h
-# should _not_ be included here, since they are necessary even when
-# building an object for the first time.
-
$(OBJECTS): $(LIB_H) $(GENERATED_H)
endif
@@ -2648,7 +2636,6 @@
--keyword=__ --keyword=N__ --keyword="__n:1,2"
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH = $(SCRIPT_SH)
-LOCALIZED_SH += git-rebase--preserve-merges.sh
LOCALIZED_SH += git-sh-setup.sh
LOCALIZED_PERL = $(SCRIPT_PERL)
@@ -2745,19 +2732,25 @@
| sed -e 's|^\./||' \
)
-$(ETAGS_TARGET): FORCE
- $(QUIET_GEN)$(RM) "$(ETAGS_TARGET)+" && \
- $(FIND_SOURCE_FILES) | xargs etags -a -o "$(ETAGS_TARGET)+" && \
- mv "$(ETAGS_TARGET)+" "$(ETAGS_TARGET)"
+FOUND_SOURCE_FILES = $(shell $(FIND_SOURCE_FILES))
-tags: FORCE
- $(QUIET_GEN)$(RM) tags+ && \
- $(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \
- mv tags+ tags
+$(ETAGS_TARGET): $(FOUND_SOURCE_FILES)
+ $(QUIET_GEN)$(RM) $@+ && \
+ echo $(FOUND_SOURCE_FILES) | xargs etags -a -o $@+ && \
+ mv $@+ $@
-cscope:
- $(RM) cscope*
- $(FIND_SOURCE_FILES) | xargs cscope -b
+tags: $(FOUND_SOURCE_FILES)
+ $(QUIET_GEN)$(RM) $@+ && \
+ echo $(FOUND_SOURCE_FILES) | xargs ctags -a -o $@+ && \
+ mv $@+ $@
+
+cscope.out: $(FOUND_SOURCE_FILES)
+ $(QUIET_GEN)$(RM) $@+ && \
+ echo $(FOUND_SOURCE_FILES) | xargs cscope -f$@+ -b && \
+ mv $@+ $@
+
+.PHONY: cscope
+cscope: cscope.out
### Detect prefix changes
TRACK_PREFIX = $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
@@ -2807,6 +2800,7 @@
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
+ @echo SANITIZE_LEAK=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_LEAK)))'\' >>$@+
@echo X=\'$(X)\' >>$@+
ifdef TEST_OUTPUT_DIRECTORY
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
@@ -2848,6 +2842,11 @@
ifdef GIT_TEST_PERL_FATAL_WARNINGS
@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
endif
+ifdef RUNTIME_PREFIX
+ @echo RUNTIME_PREFIX=\'true\' >>$@+
+else
+ @echo RUNTIME_PREFIX=\'false\' >>$@+
+endif
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
### Detect Python interpreter path changes
@@ -2902,14 +2901,16 @@
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
-$(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
+$(SP_OBJ): %.sp: %.c %.o
$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \
- $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $<
+ -Wsparse-error \
+ $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $< && \
+ >$@
-.PHONY: sparse $(SP_OBJ)
+.PHONY: sparse
sparse: $(SP_OBJ)
-EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
+EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
ifndef GCRYPT_SHA256
EXCEPT_HDRS += sha256/gcrypt.h
endif
@@ -2931,7 +2932,8 @@
style:
git clang-format --style file --diff --extensions c,h
-check: config-list.h command-list.h
+.PHONY: check
+check: $(GENERATED_H)
@if sparse; \
then \
echo >&2 "Use 'make sparse' instead"; \
@@ -2941,7 +2943,7 @@
exit 1; \
fi
-FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
+FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES))
COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
%.cocci.patch: %.cocci $(COCCI_SOURCES)
@@ -2994,7 +2996,8 @@
endif
mergetools_instdir_SQ = $(subst ','\'',$(mergetools_instdir))
-install_bindir_programs := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)) $(BINDIR_PROGRAMS_NO_X)
+install_bindir_xprograms := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X))
+install_bindir_programs := $(install_bindir_xprograms) $(BINDIR_PROGRAMS_NO_X)
.PHONY: profile-install profile-fast-install
profile-install: profile
@@ -3003,12 +3006,17 @@
profile-fast-install: profile-fast
$(MAKE) install
+INSTALL_STRIP =
+
install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) $(INSTALL_STRIP) $(PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
+
ifdef MSVC
# We DO NOT install the individual foo.o.pdb files because they
# have already been rolled up into the exe's pdb file.
@@ -3227,6 +3235,7 @@
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS)
+ $(RM) $(SP_OBJ)
$(RM) $(HCC)
$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
$(RM) -r po/build/
@@ -3265,7 +3274,7 @@
.PHONY: all install profile-clean cocciclean clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
-.PHONY: FORCE cscope
+.PHONY: FORCE
### Check documentation
#
diff --git a/RelNotes b/RelNotes
index 899139d..1065723 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.33.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.34.3.txt
\ No newline at end of file
diff --git a/add-interactive.c b/add-interactive.c
index 36ebdbd..6498ae1 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -102,8 +102,12 @@
int *selected; /* for multi-selections */
size_t min_length, max_length;
};
-#define PREFIX_ITEM_LIST_INIT \
- { STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 }
+#define PREFIX_ITEM_LIST_INIT { \
+ .items = STRING_LIST_INIT_DUP, \
+ .sorted = STRING_LIST_INIT_NODUP, \
+ .min_length = 1, \
+ .max_length = 4, \
+}
static void prefix_item_list_clear(struct prefix_item_list *list)
{
diff --git a/advice.c b/advice.c
index 337e8f3..1dfc91d 100644
--- a/advice.c
+++ b/advice.c
@@ -4,37 +4,6 @@
#include "help.h"
#include "string-list.h"
-int advice_fetch_show_forced_updates = 1;
-int advice_push_update_rejected = 1;
-int advice_push_non_ff_current = 1;
-int advice_push_non_ff_matching = 1;
-int advice_push_already_exists = 1;
-int advice_push_fetch_first = 1;
-int advice_push_needs_force = 1;
-int advice_push_unqualified_ref_name = 1;
-int advice_push_ref_needs_update = 1;
-int advice_status_hints = 1;
-int advice_status_u_option = 1;
-int advice_status_ahead_behind_warning = 1;
-int advice_commit_before_merge = 1;
-int advice_reset_quiet_warning = 1;
-int advice_resolve_conflict = 1;
-int advice_sequencer_in_use = 1;
-int advice_implicit_identity = 1;
-int advice_detached_head = 1;
-int advice_set_upstream_failure = 1;
-int advice_object_name_warning = 1;
-int advice_amworkdir = 1;
-int advice_rm_hints = 1;
-int advice_add_embedded_repo = 1;
-int advice_ignored_hook = 1;
-int advice_waiting_for_editor = 1;
-int advice_graft_file_deprecated = 1;
-int advice_checkout_ambiguous_remote_branch_name = 1;
-int advice_submodule_alternate_error_strategy_die = 1;
-int advice_add_ignored_file = 1;
-int advice_add_empty_pathspec = 1;
-
static int advice_use_color = -1;
static char advice_colors[][COLOR_MAXLEN] = {
GIT_COLOR_RESET,
@@ -63,49 +32,12 @@
}
static struct {
- const char *name;
- int *preference;
-} advice_config[] = {
- { "fetchShowForcedUpdates", &advice_fetch_show_forced_updates },
- { "pushUpdateRejected", &advice_push_update_rejected },
- { "pushNonFFCurrent", &advice_push_non_ff_current },
- { "pushNonFFMatching", &advice_push_non_ff_matching },
- { "pushAlreadyExists", &advice_push_already_exists },
- { "pushFetchFirst", &advice_push_fetch_first },
- { "pushNeedsForce", &advice_push_needs_force },
- { "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
- { "pushRefNeedsUpdate", &advice_push_ref_needs_update },
- { "statusHints", &advice_status_hints },
- { "statusUoption", &advice_status_u_option },
- { "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
- { "commitBeforeMerge", &advice_commit_before_merge },
- { "resetQuiet", &advice_reset_quiet_warning },
- { "resolveConflict", &advice_resolve_conflict },
- { "sequencerInUse", &advice_sequencer_in_use },
- { "implicitIdentity", &advice_implicit_identity },
- { "detachedHead", &advice_detached_head },
- { "setUpstreamFailure", &advice_set_upstream_failure },
- { "objectNameWarning", &advice_object_name_warning },
- { "amWorkDir", &advice_amworkdir },
- { "rmHints", &advice_rm_hints },
- { "addEmbeddedRepo", &advice_add_embedded_repo },
- { "ignoredHook", &advice_ignored_hook },
- { "waitingForEditor", &advice_waiting_for_editor },
- { "graftFileDeprecated", &advice_graft_file_deprecated },
- { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
- { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
- { "addIgnoredFile", &advice_add_ignored_file },
- { "addEmptyPathspec", &advice_add_empty_pathspec },
-
- /* make this an alias for backward compatibility */
- { "pushNonFastForward", &advice_push_update_rejected }
-};
-
-static struct {
const char *key;
int enabled;
} advice_setting[] = {
[ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 },
+ [ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 },
+ [ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 },
[ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 },
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 },
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },
@@ -133,6 +65,7 @@
[ADVICE_RM_HINTS] = { "rmHints", 1 },
[ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 },
[ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure", 1 },
+ [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks", 1 },
[ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning", 1 },
[ADVICE_STATUS_HINTS] = { "statusHints", 1 },
[ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 },
@@ -221,13 +154,6 @@
if (!skip_prefix(var, "advice.", &k))
return 0;
- for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
- if (strcasecmp(k, advice_config[i].name))
- continue;
- *advice_config[i].preference = git_config_bool(var, value);
- break;
- }
-
for (i = 0; i < ARRAY_SIZE(advice_setting); i++) {
if (strcasecmp(k, advice_setting[i].key))
continue;
@@ -262,7 +188,7 @@
error(_("It is not possible to %s because you have unmerged files."),
me);
- if (advice_resolve_conflict)
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
/*
* Message used both when 'git commit' fails and when
* other commands doing a merge do.
@@ -281,7 +207,7 @@
void NORETURN die_conclude_merge(void)
{
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
- if (advice_resolve_conflict)
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
advise(_("Please, commit your changes before merging."));
die(_("Exiting because of unfinished merge."));
}
@@ -298,15 +224,16 @@
if (!pathspec_list->nr)
return;
- fprintf(stderr, _("The following pathspecs didn't match any"
- " eligible path, but they do match index\n"
- "entries outside the current sparse checkout:\n"));
+ fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n"
+ "outside of your sparse-checkout definition, so will not be\n"
+ "updated in the index:\n"));
for_each_string_list_item(item, pathspec_list)
fprintf(stderr, "%s\n", item->string);
advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH,
- _("Disable or modify the sparsity rules if you intend"
- " to update such entries."));
+ _("If you intend to update such entries, try one of the following:\n"
+ "* Use the --sparse option.\n"
+ "* Disable or modify the sparsity rules."));
}
void detach_advice(const char *new_name)
diff --git a/advice.h b/advice.h
index a7227ca..601265f 100644
--- a/advice.h
+++ b/advice.h
@@ -5,37 +5,6 @@
struct string_list;
-extern int advice_fetch_show_forced_updates;
-extern int advice_push_update_rejected;
-extern int advice_push_non_ff_current;
-extern int advice_push_non_ff_matching;
-extern int advice_push_already_exists;
-extern int advice_push_fetch_first;
-extern int advice_push_needs_force;
-extern int advice_push_unqualified_ref_name;
-extern int advice_push_ref_needs_update;
-extern int advice_status_hints;
-extern int advice_status_u_option;
-extern int advice_status_ahead_behind_warning;
-extern int advice_commit_before_merge;
-extern int advice_reset_quiet_warning;
-extern int advice_resolve_conflict;
-extern int advice_sequencer_in_use;
-extern int advice_implicit_identity;
-extern int advice_detached_head;
-extern int advice_set_upstream_failure;
-extern int advice_object_name_warning;
-extern int advice_amworkdir;
-extern int advice_rm_hints;
-extern int advice_add_embedded_repo;
-extern int advice_ignored_hook;
-extern int advice_waiting_for_editor;
-extern int advice_graft_file_deprecated;
-extern int advice_checkout_ambiguous_remote_branch_name;
-extern int advice_submodule_alternate_error_strategy_die;
-extern int advice_add_ignored_file;
-extern int advice_add_empty_pathspec;
-
/*
* To add a new advice, you need to:
* Define a new advice_type.
@@ -45,6 +14,8 @@
*/
enum advice_type {
ADVICE_ADD_EMBEDDED_REPO,
+ ADVICE_ADD_EMPTY_PATHSPEC,
+ ADVICE_ADD_IGNORED_FILE,
ADVICE_AM_WORK_DIR,
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
ADVICE_COMMIT_BEFORE_MERGE,
@@ -75,6 +46,7 @@
ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
ADVICE_UPDATE_SPARSE_PATH,
ADVICE_WAITING_FOR_EDITOR,
+ ADVICE_SKIPPED_CHERRY_PICKS,
};
int git_default_advice_config(const char *var, const char *value);
diff --git a/attr.c b/attr.c
index d029e68..79adaa5 100644
--- a/attr.c
+++ b/attr.c
@@ -14,6 +14,7 @@
#include "utf8.h"
#include "quote.h"
#include "thread-utils.h"
+#include "dir.h"
const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false";
@@ -744,6 +745,20 @@
if (!istate)
return NULL;
+ /*
+ * The .gitattributes file only applies to files within its
+ * parent directory. In the case of cone-mode sparse-checkout,
+ * the .gitattributes file is sparse if and only if all paths
+ * within that directory are also sparse. Thus, don't load the
+ * .gitattributes file since it will not matter.
+ *
+ * In the case of a sparse index, it is critical that we don't go
+ * looking for a .gitattributes file, as doing so would cause the
+ * index to expand.
+ */
+ if (!path_in_cone_mode_sparse_checkout(path, istate))
+ return NULL;
+
buf = read_blob_data_from_index(istate, path, NULL);
if (!buf)
return NULL;
diff --git a/bisect.c b/bisect.c
index af2863d..888949f 100644
--- a/bisect.c
+++ b/bisect.c
@@ -23,7 +23,6 @@
static struct object_id *current_bad_oid;
static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
-static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
static const char *term_bad;
static const char *term_good;
@@ -728,7 +727,9 @@
static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
{
char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
- enum bisect_error res = BISECT_OK;
+ struct commit *commit;
+ struct pretty_print_context pp = {0};
+ struct strbuf commit_msg = STRBUF_INIT;
oid_to_hex_r(bisect_rev_hex, bisect_rev);
update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
@@ -738,24 +739,21 @@
update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
} else {
- res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
- if (res)
+ if (run_command_v_opt(argv_checkout, RUN_GIT_CMD))
/*
* Errors in `run_command()` itself, signaled by res < 0,
* and errors in the child process, signaled by res > 0
- * can both be treated as regular BISECT_FAILURE (-1).
+ * can both be treated as regular BISECT_FAILED (-1).
*/
- return -abs(res);
+ return BISECT_FAILED;
}
- argv_show_branch[1] = bisect_rev_hex;
- res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
- /*
- * Errors in `run_command()` itself, signaled by res < 0,
- * and errors in the child process, signaled by res > 0
- * can both be treated as regular BISECT_FAILURE (-1).
- */
- return -abs(res);
+ commit = lookup_commit_reference(the_repository, bisect_rev);
+ format_commit_message(commit, "[%H] %s%n", &commit_msg, &pp);
+ fputs(commit_msg.buf, stdout);
+ strbuf_release(&commit_msg);
+
+ return BISECT_OK;
}
static struct commit *get_commit_reference(struct repository *r,
diff --git a/branch.c b/branch.c
index 7a88a48..07a4643 100644
--- a/branch.c
+++ b/branch.c
@@ -271,7 +271,7 @@
real_ref = NULL;
if (get_oid_mb(start_name, &oid)) {
if (explicit_tracking) {
- if (advice_set_upstream_failure) {
+ if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
error(_(upstream_missing), start_name);
advise(_(upstream_advice));
exit(1);
diff --git a/builtin.h b/builtin.h
index 16ecd55..8a58743 100644
--- a/builtin.h
+++ b/builtin.h
@@ -225,7 +225,6 @@
int cmd_switch(int argc, const char **argv, const char *prefix);
int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
int cmd_tag(int argc, const char **argv, const char *prefix);
-int cmd_tar_tree(int argc, const char **argv, const char *prefix);
int cmd_unpack_file(int argc, const char **argv, const char *prefix);
int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
int cmd_update_index(int argc, const char **argv, const char *prefix);
diff --git a/builtin/add.c b/builtin/add.c
index c37c95b..ef6b619 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -30,6 +30,7 @@
static int take_worktree_changes;
static int add_renormalize;
static int pathspec_file_nul;
+static int include_sparse;
static const char *pathspec_from_file;
static int legacy_stash_p; /* support for the scripted `git stash` */
@@ -46,7 +47,9 @@
struct cache_entry *ce = active_cache[i];
int err;
- if (ce_skip_worktree(ce))
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
@@ -94,6 +97,10 @@
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
const char *path = p->one->path;
+
+ if (!include_sparse && !path_in_sparse_checkout(path, &the_index))
+ continue;
+
switch (fix_unmerged_status(p, data)) {
default:
die(_("unexpected diff status %c"), p->status);
@@ -144,12 +151,12 @@
{
int i, retval = 0;
- /* TODO: audit for interaction with sparse-index. */
- ensure_full_index(&the_index);
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
- if (ce_skip_worktree(ce))
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (ce_stage(ce))
continue; /* do not touch unmerged paths */
@@ -198,7 +205,10 @@
_("Unstaged changes after refreshing the index:"));
for (i = 0; i < pathspec->nr; i++) {
if (!seen[i]) {
- if (matches_skip_worktree(pathspec, i, &skip_worktree_seen)) {
+ const char *path = pathspec->items[i].original;
+
+ if (matches_skip_worktree(pathspec, i, &skip_worktree_seen) ||
+ !path_in_sparse_checkout(path, &the_index)) {
string_list_append(&only_match_skip_worktree,
pathspec->items[i].original);
} else {
@@ -376,6 +386,7 @@
OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
+ OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_STRING(0, "chmod", &chmod_arg, "(+|-)x",
N_("override the executable bit of the listed files")),
OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
@@ -417,6 +428,7 @@
static void check_embedded_repo(const char *path)
{
struct strbuf name = STRBUF_INIT;
+ static int adviced_on_embedded_repo = 0;
if (!warn_on_embedded_repo)
return;
@@ -428,10 +440,10 @@
strbuf_strip_suffix(&name, "/");
warning(_("adding embedded git repository: %s"), name.buf);
- if (advice_add_embedded_repo) {
+ if (!adviced_on_embedded_repo &&
+ advice_enabled(ADVICE_ADD_EMBEDDED_REPO)) {
advise(embedded_advice, name.buf, name.buf);
- /* there may be multiple entries; advise only once */
- advice_add_embedded_repo = 0;
+ adviced_on_embedded_repo = 1;
}
strbuf_release(&name);
@@ -440,12 +452,13 @@
static int add_files(struct dir_struct *dir, int flags)
{
int i, exit_status = 0;
+ struct string_list matched_sparse_paths = STRING_LIST_INIT_NODUP;
if (dir->ignored_nr) {
fprintf(stderr, _(ignore_error));
for (i = 0; i < dir->ignored_nr; i++)
fprintf(stderr, "%s\n", dir->ignored[i]->name);
- if (advice_add_ignored_file)
+ if (advice_enabled(ADVICE_ADD_IGNORED_FILE))
advise(_("Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""));
@@ -453,6 +466,12 @@
}
for (i = 0; i < dir->nr; i++) {
+ if (!include_sparse &&
+ !path_in_sparse_checkout(dir->entries[i]->name, &the_index)) {
+ string_list_append(&matched_sparse_paths,
+ dir->entries[i]->name);
+ continue;
+ }
if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) {
if (!ignore_add_errors)
die(_("adding files failed"));
@@ -461,6 +480,14 @@
check_embedded_repo(dir->entries[i]->name);
}
}
+
+ if (matched_sparse_paths.nr) {
+ advise_on_updating_sparse_paths(&matched_sparse_paths);
+ exit_status = 1;
+ }
+
+ string_list_clear(&matched_sparse_paths, 0);
+
return exit_status;
}
@@ -526,6 +553,9 @@
add_new_files = !take_worktree_changes && !refresh_only && !add_renormalize;
require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
/*
@@ -551,7 +581,7 @@
if (require_pathspec && pathspec.nr == 0) {
fprintf(stderr, _("Nothing specified, nothing added.\n"));
- if (advice_add_empty_pathspec)
+ if (advice_enabled(ADVICE_ADD_EMPTY_PATHSPEC))
advise( _("Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""));
@@ -622,7 +652,8 @@
if (seen[i])
continue;
- if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
+ if (!include_sparse &&
+ matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
string_list_append(&only_match_skip_worktree,
pathspec.items[i].original);
continue;
diff --git a/builtin/am.c b/builtin/am.c
index c79e016..8677ea2 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -11,6 +11,7 @@
#include "parse-options.h"
#include "dir.h"
#include "run-command.h"
+#include "hook.h"
#include "quote.h"
#include "tempfile.h"
#include "lockfile.h"
@@ -1820,7 +1821,7 @@
printf_ln(_("Patch failed at %s %.*s"), msgnum(state),
linelen(state->msg), state->msg);
- if (advice_amworkdir)
+ if (advice_enabled(ADVICE_AM_WORK_DIR))
advise(_("Use 'git am --show-current-patch=diff' to see the failed patch"));
die_user_resolve(state);
@@ -1848,7 +1849,6 @@
*/
if (!state->rebasing) {
am_destroy(state);
- close_object_store(the_repository->objects);
run_auto_maintenance(state->quiet);
}
}
@@ -1918,7 +1918,8 @@
opts.dst_index = &the_index;
opts.update = 1;
opts.merge = 1;
- opts.reset = reset;
+ opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
opts.fn = twoway_merge;
init_tree_desc(&t[0], head->buffer, head->size);
init_tree_desc(&t[1], remote->buffer, remote->size);
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index f184eae..28a2e6a 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -18,10 +18,10 @@
static GIT_PATH_FUNC(git_path_head_name, "head-name")
static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
+static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
static const char * const git_bisect_helper_usage[] = {
N_("git bisect--helper --bisect-reset [<commit>]"),
- N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),
N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),
N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
@@ -30,6 +30,8 @@
N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
N_("git bisect--helper --bisect-replay <filename>"),
N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
+ N_("git bisect--helper --bisect-visualize"),
+ N_("git bisect--helper --bisect-run <cmd>..."),
NULL
};
@@ -143,6 +145,19 @@
return res;
}
+static int print_file_to_stdout(const char *path)
+{
+ int fd = open(path, O_RDONLY);
+ int ret = 0;
+
+ if (fd < 0)
+ return error_errno(_("cannot open file '%s' for reading"), path);
+ if (copy_fd(fd, 1) < 0)
+ ret = error_errno(_("failed to read '%s'"), path);
+ close(fd);
+ return ret;
+}
+
static int check_term_format(const char *term, const char *orig_term)
{
int res;
@@ -1036,6 +1051,125 @@
return res;
}
+static int bisect_visualize(struct bisect_terms *terms, const char **argv, int argc)
+{
+ struct strvec args = STRVEC_INIT;
+ int flags = RUN_COMMAND_NO_STDIN, res = 0;
+ struct strbuf sb = STRBUF_INIT;
+
+ if (bisect_next_check(terms, NULL) != 0)
+ return BISECT_FAILED;
+
+ if (!argc) {
+ if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") ||
+ getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) {
+ strvec_push(&args, "gitk");
+ } else {
+ strvec_push(&args, "log");
+ flags |= RUN_GIT_CMD;
+ }
+ } else {
+ if (argv[0][0] == '-') {
+ strvec_push(&args, "log");
+ flags |= RUN_GIT_CMD;
+ } else if (strcmp(argv[0], "tig") && !starts_with(argv[0], "git"))
+ flags |= RUN_GIT_CMD;
+
+ strvec_pushv(&args, argv);
+ }
+
+ strvec_pushl(&args, "--bisect", "--", NULL);
+
+ strbuf_read_file(&sb, git_path_bisect_names(), 0);
+ sq_dequote_to_strvec(sb.buf, &args);
+ strbuf_release(&sb);
+
+ res = run_command_v_opt(args.v, flags);
+ strvec_clear(&args);
+ return res;
+}
+
+static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
+{
+ int res = BISECT_OK;
+ struct strbuf command = STRBUF_INIT;
+ struct strvec args = STRVEC_INIT;
+ struct strvec run_args = STRVEC_INIT;
+ const char *new_state;
+ int temporary_stdout_fd, saved_stdout;
+
+ if (bisect_next_check(terms, NULL))
+ return BISECT_FAILED;
+
+ if (argc)
+ sq_quote_argv(&command, argv);
+ else {
+ error(_("bisect run failed: no command provided."));
+ return BISECT_FAILED;
+ }
+
+ strvec_push(&run_args, command.buf);
+
+ while (1) {
+ strvec_clear(&args);
+
+ printf(_("running %s\n"), command.buf);
+ res = run_command_v_opt(run_args.v, RUN_USING_SHELL);
+
+ if (res < 0 || 128 <= res) {
+ error(_("bisect run failed: exit code %d from"
+ " '%s' is < 0 or >= 128"), res, command.buf);
+ strbuf_release(&command);
+ return res;
+ }
+
+ if (res == 125)
+ new_state = "skip";
+ else if (!res)
+ new_state = terms->term_good;
+ else
+ new_state = terms->term_bad;
+
+ temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
+
+ if (temporary_stdout_fd < 0)
+ return error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
+
+ fflush(stdout);
+ saved_stdout = dup(1);
+ dup2(temporary_stdout_fd, 1);
+
+ res = bisect_state(terms, &new_state, 1);
+
+ fflush(stdout);
+ dup2(saved_stdout, 1);
+ close(saved_stdout);
+ close(temporary_stdout_fd);
+
+ print_file_to_stdout(git_path_bisect_run());
+
+ if (res == BISECT_ONLY_SKIPPED_LEFT)
+ error(_("bisect run cannot continue any more"));
+ else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) {
+ printf(_("bisect run success"));
+ res = BISECT_OK;
+ } else if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
+ printf(_("bisect found first bad commit"));
+ res = BISECT_OK;
+ } else if (res) {
+ error(_("bisect run failed: 'git bisect--helper --bisect-state"
+ " %s' exited with error code %d"), args.v[0], res);
+ } else {
+ continue;
+ }
+
+ strbuf_release(&command);
+ strvec_clear(&args);
+ strvec_clear(&run_args);
+ return res;
+ }
+}
+
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{
enum {
@@ -1048,7 +1182,9 @@
BISECT_STATE,
BISECT_LOG,
BISECT_REPLAY,
- BISECT_SKIP
+ BISECT_SKIP,
+ BISECT_VISUALIZE,
+ BISECT_RUN,
} cmdmode = 0;
int res = 0, nolog = 0;
struct option options[] = {
@@ -1070,6 +1206,10 @@
N_("replay the bisection process from the given file"), BISECT_REPLAY),
OPT_CMDMODE(0, "bisect-skip", &cmdmode,
N_("skip some commits for checkout"), BISECT_SKIP),
+ OPT_CMDMODE(0, "bisect-visualize", &cmdmode,
+ N_("visualize the bisection"), BISECT_VISUALIZE),
+ OPT_CMDMODE(0, "bisect-run", &cmdmode,
+ N_("use <cmd>... to automatically bisect."), BISECT_RUN),
OPT_BOOL(0, "no-log", &nolog,
N_("no log for BISECT_WRITE")),
OPT_END()
@@ -1089,12 +1229,6 @@
return error(_("--bisect-reset requires either no argument or a commit"));
res = bisect_reset(argc ? argv[0] : NULL);
break;
- case BISECT_NEXT_CHECK:
- if (argc != 2 && argc != 3)
- return error(_("--bisect-next-check requires 2 or 3 arguments"));
- set_terms(&terms, argv[1], argv[0]);
- res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL);
- break;
case BISECT_TERMS:
if (argc > 1)
return error(_("--bisect-terms requires 0 or 1 argument"));
@@ -1131,6 +1265,16 @@
get_terms(&terms);
res = bisect_skip(&terms, argv, argc);
break;
+ case BISECT_VISUALIZE:
+ get_terms(&terms);
+ res = bisect_visualize(&terms, argv, argc);
+ break;
+ case BISECT_RUN:
+ if (!argc)
+ return error(_("bisect run failed: no command provided."));
+ get_terms(&terms);
+ res = bisect_run(&terms, argv, argc);
+ break;
default:
BUG("unknown subcommand %d", cmdmode);
}
diff --git a/builtin/blame.c b/builtin/blame.c
index 641523f..f9ee3f8 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -101,6 +101,16 @@
struct strbuf summary;
};
+#define COMMIT_INFO_INIT { \
+ .author = STRBUF_INIT, \
+ .author_mail = STRBUF_INIT, \
+ .author_tz = STRBUF_INIT, \
+ .committer = STRBUF_INIT, \
+ .committer_mail = STRBUF_INIT, \
+ .committer_tz = STRBUF_INIT, \
+ .summary = STRBUF_INIT, \
+}
+
/*
* Parse author/committer line in the commit object buffer
*/
@@ -160,18 +170,6 @@
strbuf_add(name, namebuf, namelen);
}
-static void commit_info_init(struct commit_info *ci)
-{
-
- strbuf_init(&ci->author, 0);
- strbuf_init(&ci->author_mail, 0);
- strbuf_init(&ci->author_tz, 0);
- strbuf_init(&ci->committer, 0);
- strbuf_init(&ci->committer_mail, 0);
- strbuf_init(&ci->committer_tz, 0);
- strbuf_init(&ci->summary, 0);
-}
-
static void commit_info_destroy(struct commit_info *ci)
{
@@ -192,8 +190,6 @@
const char *subject, *encoding;
const char *message;
- commit_info_init(ret);
-
encoding = get_log_output_encoding();
message = logmsg_reencode(commit, NULL, encoding);
get_ac_line(message, "\nauthor ",
@@ -246,7 +242,7 @@
*/
static int emit_one_suspect_detail(struct blame_origin *suspect, int repeat)
{
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
if (!repeat && (suspect->commit->object.flags & METAINFO_SHOWN))
return 0;
@@ -440,7 +436,7 @@
int cnt;
const char *cp;
struct blame_origin *suspect = ent->suspect;
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
char hex[GIT_MAX_HEXSZ + 1];
int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
const char *default_color = NULL, *color = NULL, *reset = NULL;
@@ -630,7 +626,7 @@
if (longest_file < num)
longest_file = num;
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
- struct commit_info ci;
+ struct commit_info ci = COMMIT_INFO_INIT;
suspect->commit->object.flags |= METAINFO_SHOWN;
get_commit_info(suspect->commit, &ci, 1);
if (*option & OUTPUT_SHOW_EMAIL)
@@ -917,6 +913,9 @@
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
for (;;) {
switch (parse_options_step(&ctx, options, blame_opt_usage)) {
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_UNKNOWN:
+ break;
case PARSE_OPT_HELP:
case PARSE_OPT_ERROR:
exit(129);
diff --git a/builtin/branch.c b/builtin/branch.c
index 03c7b72..7a1d1ee 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -407,7 +407,8 @@
return strbuf_detach(&fmt, NULL);
}
-static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format)
+static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting,
+ struct ref_format *format, struct string_list *output)
{
int i;
struct ref_array array;
@@ -427,7 +428,7 @@
memset(&array, 0, sizeof(array));
- filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN);
+ filter_refs(&array, filter, filter->kind);
if (filter->verbose)
maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
@@ -449,7 +450,7 @@
if (column_active(colopts)) {
assert(!filter->verbose && "--column and --verbose are incompatible");
/* format to a string_list to let print_columns() do its job */
- string_list_append(&output, out.buf);
+ string_list_append(output, out.buf);
} else {
fwrite(out.buf, 1, out.len, stdout);
putchar('\n');
@@ -753,9 +754,10 @@
ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
ref_sorting_set_sort_flags_all(
sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
- print_ref_list(&filter, sorting, &format);
+ print_ref_list(&filter, sorting, &format, &output);
print_columns(&output, colopts, NULL);
string_list_clear(&output, 0);
+ ref_sorting_release(sorting);
return 0;
} else if (edit_description) {
const char *branch_name;
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index 06ed10d..9de32bc 100644
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -3,7 +3,8 @@
#include "strbuf.h"
#include "help.h"
#include "compat/compiler.h"
-#include "run-command.h"
+#include "hook.h"
+#include "hook-list.h"
static void get_system_info(struct strbuf *sys_info)
@@ -41,39 +42,7 @@
static void get_populated_hooks(struct strbuf *hook_info, int nongit)
{
- /*
- * NEEDSWORK: Doesn't look like there is a list of all possible hooks;
- * so below is a transcription of `git help hooks`. Later, this should
- * be replaced with some programmatically generated list (generated from
- * doc or else taken from some library which tells us about all the
- * hooks)
- */
- static const char *hook[] = {
- "applypatch-msg",
- "pre-applypatch",
- "post-applypatch",
- "pre-commit",
- "pre-merge-commit",
- "prepare-commit-msg",
- "commit-msg",
- "post-commit",
- "pre-rebase",
- "post-checkout",
- "post-merge",
- "pre-push",
- "pre-receive",
- "update",
- "post-receive",
- "post-update",
- "push-to-checkout",
- "pre-auto-gc",
- "post-rewrite",
- "sendemail-validate",
- "fsmonitor-watchman",
- "p4-pre-submit",
- "post-index-change",
- };
- int i;
+ const char **p;
if (nongit) {
strbuf_addstr(hook_info,
@@ -81,9 +50,12 @@
return;
}
- for (i = 0; i < ARRAY_SIZE(hook); i++)
- if (find_hook(hook[i]))
- strbuf_addf(hook_info, "%s\n", hook[i]);
+ for (p = hook_name_list; *p; p++) {
+ const char *hook = *p;
+
+ if (hook_exists(hook))
+ strbuf_addf(hook_info, "%s\n", hook);
+ }
}
static const char * const bugreport_usage[] = {
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 053a51b..5a85d7c 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -39,8 +39,6 @@
NULL
};
-static int verbose;
-
static int parse_options_cmd_bundle(int argc,
const char **argv,
const char* prefix,
@@ -162,10 +160,15 @@
struct bundle_header header = BUNDLE_HEADER_INIT;
int bundle_fd = -1;
int ret;
+ int progress = isatty(2);
+
struct option options[] = {
+ OPT_BOOL(0, "progress", &progress,
+ N_("show progress meter")),
OPT_END()
};
char *bundle_file;
+ struct strvec extra_index_pack_args = STRVEC_INIT;
argc = parse_options_cmd_bundle(argc, argv, prefix,
builtin_bundle_unbundle_usage, options, &bundle_file);
@@ -177,7 +180,11 @@
}
if (!startup_info->have_repository)
die(_("Need a repository to unbundle."));
- ret = !!unbundle(the_repository, &header, bundle_fd, 0) ||
+ if (progress)
+ strvec_pushl(&extra_index_pack_args, "-v", "--progress-title",
+ _("Unbundling objects"), NULL);
+ ret = !!unbundle(the_repository, &header, bundle_fd,
+ &extra_index_pack_args) ||
list_bundle_refs(&header, argc, argv);
bundle_header_release(&header);
cleanup:
@@ -188,7 +195,6 @@
int cmd_bundle(int argc, const char **argv, const char *prefix)
{
struct option options[] = {
- OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
OPT_END()
};
int result;
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 243fe68..86fc032 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -355,18 +355,34 @@
}
}
+/*
+ * If "pack" is non-NULL, then "offset" is the byte offset within the pack from
+ * which the object may be accessed (though note that we may also rely on
+ * data->oid, too). If "pack" is NULL, then offset is ignored.
+ */
static void batch_object_write(const char *obj_name,
struct strbuf *scratch,
struct batch_options *opt,
- struct expand_data *data)
+ struct expand_data *data,
+ struct packed_git *pack,
+ off_t offset)
{
- if (!data->skip_object_info &&
- oid_object_info_extended(the_repository, &data->oid, &data->info,
- OBJECT_INFO_LOOKUP_REPLACE) < 0) {
- printf("%s missing\n",
- obj_name ? obj_name : oid_to_hex(&data->oid));
- fflush(stdout);
- return;
+ if (!data->skip_object_info) {
+ int ret;
+
+ if (pack)
+ ret = packed_object_info(the_repository, pack, offset,
+ &data->info);
+ else
+ ret = oid_object_info_extended(the_repository,
+ &data->oid, &data->info,
+ OBJECT_INFO_LOOKUP_REPLACE);
+ if (ret < 0) {
+ printf("%s missing\n",
+ obj_name ? obj_name : oid_to_hex(&data->oid));
+ fflush(stdout);
+ return;
+ }
}
strbuf_reset(scratch);
@@ -428,7 +444,7 @@
return;
}
- batch_object_write(obj_name, scratch, opt, data);
+ batch_object_write(obj_name, scratch, opt, data, NULL, 0);
}
struct object_cb_data {
@@ -442,7 +458,8 @@
{
struct object_cb_data *data = vdata;
oidcpy(&data->expand->oid, oid);
- batch_object_write(NULL, data->scratch, data->opt, data->expand);
+ batch_object_write(NULL, data->scratch, data->opt, data->expand,
+ NULL, 0);
return 0;
}
@@ -463,21 +480,26 @@
return 0;
}
-static int batch_unordered_object(const struct object_id *oid, void *vdata)
+static int batch_unordered_object(const struct object_id *oid,
+ struct packed_git *pack, off_t offset,
+ void *vdata)
{
struct object_cb_data *data = vdata;
if (oidset_insert(data->seen, oid))
return 0;
- return batch_object_cb(oid, data);
+ oidcpy(&data->expand->oid, oid);
+ batch_object_write(NULL, data->scratch, data->opt, data->expand,
+ pack, offset);
+ return 0;
}
static int batch_unordered_loose(const struct object_id *oid,
const char *path,
void *data)
{
- return batch_unordered_object(oid, data);
+ return batch_unordered_object(oid, NULL, 0, data);
}
static int batch_unordered_packed(const struct object_id *oid,
@@ -485,7 +507,9 @@
uint32_t pos,
void *data)
{
- return batch_unordered_object(oid, data);
+ return batch_unordered_object(oid, pack,
+ nth_packed_object_offset(pack, pos),
+ data);
}
static int batch_objects(struct batch_options *opt)
@@ -529,6 +553,8 @@
if (has_promisor_remote())
warning("This repository uses promisor remotes. Some objects may not be loaded.");
+ read_replace_refs = 0;
+
cb.opt = opt;
cb.expand = &data;
cb.scratch = &output;
diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c
index fb9fd13..ede7dc3 100644
--- a/builtin/checkout--worker.c
+++ b/builtin/checkout--worker.c
@@ -82,8 +82,8 @@
size_t i, nr = 0, alloc = 0;
while (1) {
- int len = packet_read(0, NULL, NULL, packet_buffer,
- sizeof(packet_buffer), 0);
+ int len = packet_read(0, packet_buffer, sizeof(packet_buffer),
+ 0);
if (len < 0)
BUG("packet_read() returned negative value");
diff --git a/builtin/checkout.c b/builtin/checkout.c
index b23bc14..cbf73b8 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -646,7 +646,9 @@
opts.head_idx = -1;
opts.update = worktree;
opts.skip_unmerged = !worktree;
- opts.reset = 1;
+ opts.reset = o->force ? UNPACK_RESET_OVERWRITE_UNTRACKED :
+ UNPACK_RESET_PROTECT_UNTRACKED;
+ opts.preserve_ignored = (!o->force && !o->overwrite_ignore);
opts.merge = 1;
opts.fn = oneway_merge;
opts.verbose_update = o->show_progress;
@@ -746,11 +748,7 @@
new_branch_info->commit ?
&new_branch_info->commit->object.oid :
&new_branch_info->oid, NULL);
- if (opts->overwrite_ignore) {
- topts.dir = xcalloc(1, sizeof(*topts.dir));
- topts.dir->flags |= DIR_SHOW_IGNORED;
- setup_standard_excludes(topts.dir);
- }
+ topts.preserve_ignored = !opts->overwrite_ignore;
tree = parse_tree_indirect(old_branch_info->commit ?
&old_branch_info->commit->object.oid :
the_hash_algo->empty_tree);
@@ -918,7 +916,7 @@
REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
if (!opts->quiet) {
if (old_branch_info->path &&
- advice_detached_head && !opts->force_detach)
+ advice_enabled(ADVICE_DETACHED_HEAD) && !opts->force_detach)
detach_advice(new_branch_info->name);
describe_detached_head(_("HEAD is now at"), new_branch_info->commit);
}
@@ -1011,7 +1009,7 @@
sb.buf);
strbuf_release(&sb);
- if (advice_detached_head)
+ if (advice_enabled(ADVICE_DETACHED_HEAD))
fprintf(stderr,
Q_(
/* The singular version */
@@ -1182,7 +1180,7 @@
}
if (!remote && num_matches > 1) {
- if (advice_checkout_ambiguous_remote_branch_name) {
+ if (advice_enabled(ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME)) {
advise(_("If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
diff --git a/builtin/clone.c b/builtin/clone.c
index 7743dc0..fb377b2 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -217,120 +217,6 @@
return canon;
}
-static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
-{
- const char *end = repo + strlen(repo), *start, *ptr;
- size_t len;
- char *dir;
-
- /*
- * Skip scheme.
- */
- start = strstr(repo, "://");
- if (start == NULL)
- start = repo;
- else
- start += 3;
-
- /*
- * Skip authentication data. The stripping does happen
- * greedily, such that we strip up to the last '@' inside
- * the host part.
- */
- for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
- if (*ptr == '@')
- start = ptr + 1;
- }
-
- /*
- * Strip trailing spaces, slashes and /.git
- */
- while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
- end--;
- if (end - start > 5 && is_dir_sep(end[-5]) &&
- !strncmp(end - 4, ".git", 4)) {
- end -= 5;
- while (start < end && is_dir_sep(end[-1]))
- end--;
- }
-
- /*
- * Strip trailing port number if we've got only a
- * hostname (that is, there is no dir separator but a
- * colon). This check is required such that we do not
- * strip URI's like '/foo/bar:2222.git', which should
- * result in a dir '2222' being guessed due to backwards
- * compatibility.
- */
- if (memchr(start, '/', end - start) == NULL
- && memchr(start, ':', end - start) != NULL) {
- ptr = end;
- while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':')
- ptr--;
- if (start < ptr && ptr[-1] == ':')
- end = ptr - 1;
- }
-
- /*
- * Find last component. To remain backwards compatible we
- * also regard colons as path separators, such that
- * cloning a repository 'foo:bar.git' would result in a
- * directory 'bar' being guessed.
- */
- ptr = end;
- while (start < ptr && !is_dir_sep(ptr[-1]) && ptr[-1] != ':')
- ptr--;
- start = ptr;
-
- /*
- * Strip .{bundle,git}.
- */
- len = end - start;
- strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
-
- if (!len || (len == 1 && *start == '/'))
- die(_("No directory name could be guessed.\n"
- "Please specify a directory on the command line"));
-
- if (is_bare)
- dir = xstrfmt("%.*s.git", (int)len, start);
- else
- dir = xstrndup(start, len);
- /*
- * Replace sequences of 'control' characters and whitespace
- * with one ascii space, remove leading and trailing spaces.
- */
- if (*dir) {
- char *out = dir;
- int prev_space = 1 /* strip leading whitespace */;
- for (end = dir; *end; ++end) {
- char ch = *end;
- if ((unsigned char)ch < '\x20')
- ch = '\x20';
- if (isspace(ch)) {
- if (prev_space)
- continue;
- prev_space = 1;
- } else
- prev_space = 0;
- *out++ = ch;
- }
- *out = '\0';
- if (out > dir && prev_space)
- out[-1] = '\0';
- }
- return dir;
-}
-
-static void strip_trailing_slashes(char *dir)
-{
- char *end = dir + strlen(dir);
-
- while (dir < end - 1 && is_dir_sep(end[-1]))
- end--;
- *end = '\0';
-}
-
static int add_one_reference(struct string_list_item *item, void *cb_data)
{
struct strbuf err = STRBUF_INIT;
@@ -657,7 +543,7 @@
}
}
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
{
struct ref **rm = cb_data;
struct ref *ref = *rm;
@@ -668,13 +554,11 @@
*/
while (ref && !ref->peer_ref)
ref = ref->next;
- /* Returning -1 notes "end of list" to the caller. */
if (!ref)
- return -1;
+ return NULL;
- oidcpy(oid, &ref->old_oid);
*rm = ref->next;
- return 0;
+ return &ref->old_oid;
}
static void update_remote_refs(const struct ref *refs,
@@ -786,7 +670,7 @@
return 0;
}
if (!strcmp(head, "HEAD")) {
- if (advice_detached_head)
+ if (advice_enabled(ADVICE_DETACHED_HEAD))
detach_advice(oid_to_hex(&oid));
FREE_AND_NULL(head);
} else {
@@ -803,6 +687,7 @@
opts.update = 1;
opts.merge = 1;
opts.clone = 1;
+ opts.preserve_ignored = 0;
opts.fn = oneway_merge;
opts.verbose_update = (option_verbosity >= 0);
opts.src_index = &the_index;
@@ -1041,8 +926,8 @@
if (argc == 2)
dir = xstrdup(argv[1]);
else
- dir = guess_dir_name(repo_name, is_bundle, option_bare);
- strip_trailing_slashes(dir);
+ dir = git_url_basename(repo_name, is_bundle, option_bare);
+ strip_dir_trailing_slashes(dir);
dest_exists = path_exists(dir);
if (dest_exists && !is_empty_dir(dir))
@@ -1114,6 +999,7 @@
if (option_recurse_submodules.nr > 0) {
struct string_list_item *item;
struct strbuf sb = STRBUF_INIT;
+ int val;
/* remove duplicates */
string_list_sort(&option_recurse_submodules);
@@ -1130,6 +1016,10 @@
strbuf_detach(&sb, NULL));
}
+ if (!git_config_get_bool("submodule.stickyRecursiveClone", &val) &&
+ val)
+ string_list_append(&option_config, "submodule.recurse=true");
+
if (option_required_reference.nr &&
option_optional_reference.nr)
die(_("clone --recursive is not compatible with "
@@ -1150,8 +1040,10 @@
init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
INIT_DB_QUIET);
- if (real_git_dir)
+ if (real_git_dir) {
+ free((char *)git_dir);
git_dir = real_git_dir;
+ }
/*
* additional config can be injected with -c, make sure it's included
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index cd86315..4247fbd 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -9,26 +9,29 @@
#include "progress.h"
#include "tag.h"
+#define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \
+ N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]")
+
+#define BUILTIN_COMMIT_GRAPH_WRITE_USAGE \
+ N_("git commit-graph write [--object-dir <objdir>] [--append] " \
+ "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] " \
+ "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] " \
+ "<split options>")
+
+static const char * builtin_commit_graph_verify_usage[] = {
+ BUILTIN_COMMIT_GRAPH_VERIFY_USAGE,
+ NULL
+};
+
+static const char * builtin_commit_graph_write_usage[] = {
+ BUILTIN_COMMIT_GRAPH_WRITE_USAGE,
+ NULL
+};
+
static char const * const builtin_commit_graph_usage[] = {
- N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
- N_("git commit-graph write [--object-dir <objdir>] [--append] "
- "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
- "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
- "<split options>"),
- NULL
-};
-
-static const char * const builtin_commit_graph_verify_usage[] = {
- N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
- NULL
-};
-
-static const char * const builtin_commit_graph_write_usage[] = {
- N_("git commit-graph write [--object-dir <objdir>] [--append] "
- "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
- "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
- "<split options>"),
- NULL
+ BUILTIN_COMMIT_GRAPH_VERIFY_USAGE,
+ BUILTIN_COMMIT_GRAPH_WRITE_USAGE,
+ NULL,
};
static struct opts_commit_graph {
@@ -43,26 +46,16 @@
int enable_changed_paths;
} opts;
-static struct object_directory *find_odb(struct repository *r,
- const char *obj_dir)
+static struct option common_opts[] = {
+ OPT_STRING(0, "object-dir", &opts.obj_dir,
+ N_("dir"),
+ N_("the object directory to store the graph")),
+ OPT_END()
+};
+
+static struct option *add_common_options(struct option *to)
{
- struct object_directory *odb;
- char *obj_dir_real = real_pathdup(obj_dir, 1);
- struct strbuf odb_path_real = STRBUF_INIT;
-
- prepare_alt_odb(r);
- for (odb = r->objects->odb; odb; odb = odb->next) {
- strbuf_realpath(&odb_path_real, odb->path, 1);
- if (!strcmp(obj_dir_real, odb_path_real.buf))
- break;
- }
-
- free(obj_dir_real);
- strbuf_release(&odb_path_real);
-
- if (!odb)
- die(_("could not find object directory matching %s"), obj_dir);
- return odb;
+ return parse_options_concat(common_opts, to);
}
static int graph_verify(int argc, const char **argv)
@@ -76,21 +69,22 @@
int flags = 0;
static struct option builtin_commit_graph_verify_options[] = {
- OPT_STRING(0, "object-dir", &opts.obj_dir,
- N_("dir"),
- N_("the object directory to store the graph")),
OPT_BOOL(0, "shallow", &opts.shallow,
N_("if the commit-graph is split, only verify the tip file")),
- OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
+ OPT_BOOL(0, "progress", &opts.progress,
+ N_("force progress reporting")),
OPT_END(),
};
+ struct option *options = add_common_options(builtin_commit_graph_verify_options);
trace2_cmd_mode("verify");
opts.progress = isatty(2);
argc = parse_options(argc, argv, NULL,
- builtin_commit_graph_verify_options,
+ options,
builtin_commit_graph_verify_usage, 0);
+ if (argc)
+ usage_with_options(builtin_commit_graph_verify_usage, options);
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
@@ -106,6 +100,7 @@
die_errno(_("Could not open commit-graph '%s'"), graph_name);
FREE_AND_NULL(graph_name);
+ FREE_AND_NULL(options);
if (open_ok)
graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb);
@@ -177,8 +172,8 @@
const char *s;
*to = strtol(arg, (char **)&s, 10);
if (*s)
- return error(_("%s expects a numerical value"),
- optname(opt, opt->flags));
+ return error(_("option `%s' expects a numerical value"),
+ "max-new-filters");
}
return 0;
}
@@ -206,9 +201,6 @@
struct progress *progress = NULL;
static struct option builtin_commit_graph_write_options[] = {
- OPT_STRING(0, "object-dir", &opts.obj_dir,
- N_("dir"),
- N_("the object directory to store the graph")),
OPT_BOOL(0, "reachable", &opts.reachable,
N_("start walk at all refs")),
OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -219,7 +211,6 @@
N_("include all commits already in the commit-graph file")),
OPT_BOOL(0, "changed-paths", &opts.enable_changed_paths,
N_("enable computation for changed paths")),
- OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
OPT_CALLBACK_F(0, "split", &write_opts.split_flags, NULL,
N_("allow writing an incremental commit-graph file"),
PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
@@ -233,8 +224,11 @@
OPT_CALLBACK_F(0, "max-new-filters", &write_opts.max_new_filters,
NULL, N_("maximum number of changed-path Bloom filters to compute"),
0, write_option_max_new_filters),
+ OPT_BOOL(0, "progress", &opts.progress,
+ N_("force progress reporting")),
OPT_END(),
};
+ struct option *options = add_common_options(builtin_commit_graph_write_options);
opts.progress = isatty(2);
opts.enable_changed_paths = -1;
@@ -248,8 +242,10 @@
git_config(git_commit_graph_write_config, &opts);
argc = parse_options(argc, argv, NULL,
- builtin_commit_graph_write_options,
+ options,
builtin_commit_graph_write_usage, 0);
+ if (argc)
+ usage_with_options(builtin_commit_graph_write_usage, options);
if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
@@ -267,7 +263,6 @@
git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
- read_replace_refs = 0;
odb = find_odb(the_repository, opts.obj_dir);
if (opts.reachable) {
@@ -304,6 +299,7 @@
result = 1;
cleanup:
+ FREE_AND_NULL(options);
string_list_clear(&pack_indexes, 0);
strbuf_release(&buf);
return result;
@@ -311,32 +307,26 @@
int cmd_commit_graph(int argc, const char **argv, const char *prefix)
{
- static struct option builtin_commit_graph_options[] = {
- OPT_STRING(0, "object-dir", &opts.obj_dir,
- N_("dir"),
- N_("the object directory to store the graph")),
- OPT_END(),
- };
-
- if (argc == 2 && !strcmp(argv[1], "-h"))
- usage_with_options(builtin_commit_graph_usage,
- builtin_commit_graph_options);
+ struct option *builtin_commit_graph_options = common_opts;
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix,
builtin_commit_graph_options,
builtin_commit_graph_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
+ if (!argc)
+ goto usage;
+ read_replace_refs = 0;
save_commit_buffer = 0;
- if (argc > 0) {
- if (!strcmp(argv[0], "verify"))
- return graph_verify(argc, argv);
- if (!strcmp(argv[0], "write"))
- return graph_write(argc, argv);
- }
+ if (!strcmp(argv[0], "verify"))
+ return graph_verify(argc, argv);
+ else if (argc && !strcmp(argv[0], "write"))
+ return graph_write(argc, argv);
+ error(_("unrecognized subcommand: %s"), argv[0]);
+usage:
usage_with_options(builtin_commit_graph_usage,
builtin_commit_graph_options);
}
diff --git a/builtin/commit.c b/builtin/commit.c
index 7c9b1e7..883c162 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -19,6 +19,7 @@
#include "revision.h"
#include "wt-status.h"
#include "run-command.h"
+#include "hook.h"
#include "refs.h"
#include "log-tree.h"
#include "strbuf.h"
@@ -203,7 +204,7 @@
init_diff_ui_defaults();
git_config(fn, s);
determine_whence(s);
- s->hints = advice_status_hints; /* must come after git_config() */
+ s->hints = advice_enabled(ADVICE_STATUS_HINTS); /* must come after git_config() */
}
static void rollback_index_files(void)
@@ -1033,7 +1034,7 @@
*/
if (!committable && whence != FROM_MERGE && !allow_empty &&
!(amend && is_a_merge(current_head))) {
- s->hints = advice_status_hints;
+ s->hints = advice_enabled(ADVICE_STATUS_HINTS);
s->display_comment_prefix = old_display_comment_prefix;
run_status(stdout, index_file, prefix, 0, s);
if (amend)
@@ -1051,7 +1052,7 @@
return 0;
}
- if (!no_verify && find_hook("pre-commit")) {
+ if (!no_verify && hook_exists("pre-commit")) {
/*
* Re-read the index as pre-commit hook could have updated it,
* and write it out as a tree. We must do this before we invoke
diff --git a/builtin/config.c b/builtin/config.c
index 865fddd..542d8d0 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -575,7 +575,7 @@
int ret;
char *section_tail;
struct string_list_item *item;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
struct string_list values = STRING_LIST_INIT_DUP;
config.collect_fn = urlmatch_collect_fn;
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 76a6ba3..78c02ad 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -11,6 +11,32 @@
#define FLAG_SPAWN 0x1
#define FLAG_RELAY 0x2
+#ifdef GIT_WINDOWS_NATIVE
+
+static int connection_closed(int error)
+{
+ return (error == EINVAL);
+}
+
+static int connection_fatally_broken(int error)
+{
+ return (error != ENOENT) && (error != ENETDOWN);
+}
+
+#else
+
+static int connection_closed(int error)
+{
+ return (error == ECONNRESET);
+}
+
+static int connection_fatally_broken(int error)
+{
+ return (error != ENOENT) && (error != ECONNREFUSED);
+}
+
+#endif
+
static int send_request(const char *socket, const struct strbuf *out)
{
int got_data = 0;
@@ -28,7 +54,7 @@
int r;
r = read_in_full(fd, in, sizeof(in));
- if (r == 0 || (r < 0 && errno == ECONNRESET))
+ if (r == 0 || (r < 0 && connection_closed(errno)))
break;
if (r < 0)
die_errno("read error from cache daemon");
@@ -75,7 +101,7 @@
}
if (send_request(socket, &buf) < 0) {
- if (errno != ENOENT && errno != ECONNREFUSED)
+ if (connection_fatally_broken(errno))
die_errno("unable to connect to cache daemon");
if (flags & FLAG_SPAWN) {
spawn_daemon(socket);
@@ -90,7 +116,7 @@
{
struct stat sb;
char *old_dir, *socket;
- old_dir = expand_user_path("~/.git-credential-cache", 0);
+ old_dir = interpolate_path("~/.git-credential-cache", 0);
if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode))
socket = xstrfmt("%s/socket", old_dir);
else
diff --git a/builtin/credential-store.c b/builtin/credential-store.c
index ae3c1ba..62a4f3c 100644
--- a/builtin/credential-store.c
+++ b/builtin/credential-store.c
@@ -173,7 +173,7 @@
if (file) {
string_list_append(&fns, file);
} else {
- if ((file = expand_user_path("~/.git-credentials", 0)))
+ if ((file = interpolate_path("~/.git-credentials", 0)))
string_list_append_nodup(&fns, file);
file = xdg_config_home("credentials");
if (file)
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 90c0bfc..4931c10 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -252,16 +252,6 @@
strbuf_release(&buf);
}
-static NORETURN void exit_cleanup(const char *tmpdir, int exit_code)
-{
- struct strbuf buf = STRBUF_INIT;
- strbuf_addstr(&buf, tmpdir);
- remove_dir_recursively(&buf, 0);
- if (exit_code)
- warning(_("failed: %d"), exit_code);
- exit(exit_code);
-}
-
static int ensure_leading_directories(char *path)
{
switch (safe_create_leading_directories(path)) {
@@ -330,19 +320,44 @@
return ret;
}
-static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
- int argc, const char **argv)
+static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
+ const char *path, const char *content)
{
- char tmpdir[PATH_MAX];
+ add_path(dir, dir_len, path);
+ ensure_leading_directories(dir->buf);
+ unlink(dir->buf);
+ write_file(dir->buf, "%s", content);
+}
+
+/* Write the file contents for the left and right sides of the difftool
+ * dir-diff representation for submodules and symlinks. Symlinks and submodules
+ * are written as regular text files so that external diff tools can diff them
+ * as text files, resulting in behavior that is analogous to to what "git diff"
+ * displays for symlink and submodule diffs.
+ */
+static void write_standin_files(struct pair_entry *entry,
+ struct strbuf *ldir, size_t ldir_len,
+ struct strbuf *rdir, size_t rdir_len)
+{
+ if (*entry->left)
+ write_file_in_directory(ldir, ldir_len, entry->path, entry->left);
+ if (*entry->right)
+ write_file_in_directory(rdir, rdir_len, entry->path, entry->right);
+}
+
+static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
+ struct child_process *child)
+{
struct strbuf info = STRBUF_INIT, lpath = STRBUF_INIT;
struct strbuf rpath = STRBUF_INIT, buf = STRBUF_INIT;
struct strbuf ldir = STRBUF_INIT, rdir = STRBUF_INIT;
struct strbuf wtdir = STRBUF_INIT;
- char *lbase_dir, *rbase_dir;
+ struct strbuf tmpdir = STRBUF_INIT;
+ char *lbase_dir = NULL, *rbase_dir = NULL;
size_t ldir_len, rdir_len, wtdir_len;
const char *workdir, *tmp;
int ret = 0, i;
- FILE *fp;
+ FILE *fp = NULL;
struct hashmap working_tree_dups = HASHMAP_INIT(working_tree_entry_cmp,
NULL);
struct hashmap submodules = HASHMAP_INIT(pair_cmp, NULL);
@@ -351,8 +366,7 @@
struct pair_entry *entry;
struct index_state wtindex;
struct checkout lstate, rstate;
- int rc, flags = RUN_GIT_CMD, err = 0;
- struct child_process child = CHILD_PROCESS_INIT;
+ int flags = RUN_GIT_CMD, err = 0;
const char *helper_argv[] = { "difftool--helper", NULL, NULL, NULL };
struct hashmap wt_modified, tmp_modified;
int indices_loaded = 0;
@@ -361,11 +375,15 @@
/* Setup temp directories */
tmp = getenv("TMPDIR");
- xsnprintf(tmpdir, sizeof(tmpdir), "%s/git-difftool.XXXXXX", tmp ? tmp : "/tmp");
- if (!mkdtemp(tmpdir))
- return error("could not create '%s'", tmpdir);
- strbuf_addf(&ldir, "%s/left/", tmpdir);
- strbuf_addf(&rdir, "%s/right/", tmpdir);
+ strbuf_add_absolute_path(&tmpdir, tmp ? tmp : "/tmp");
+ strbuf_trim_trailing_dir_sep(&tmpdir);
+ strbuf_addstr(&tmpdir, "/git-difftool.XXXXXX");
+ if (!mkdtemp(tmpdir.buf)) {
+ ret = error("could not create '%s'", tmpdir.buf);
+ goto finish;
+ }
+ strbuf_addf(&ldir, "%s/left/", tmpdir.buf);
+ strbuf_addf(&rdir, "%s/right/", tmpdir.buf);
strbuf_addstr(&wtdir, workdir);
if (!wtdir.len || !is_dir_sep(wtdir.buf[wtdir.len - 1]))
strbuf_addch(&wtdir, '/');
@@ -387,19 +405,15 @@
rdir_len = rdir.len;
wtdir_len = wtdir.len;
- child.no_stdin = 1;
- child.git_cmd = 1;
- child.use_shell = 0;
- child.clean_on_exit = 1;
- child.dir = prefix;
- child.out = -1;
- strvec_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z",
- NULL);
- for (i = 0; i < argc; i++)
- strvec_push(&child.args, argv[i]);
- if (start_command(&child))
+ child->no_stdin = 1;
+ child->git_cmd = 1;
+ child->use_shell = 0;
+ child->clean_on_exit = 1;
+ child->dir = prefix;
+ child->out = -1;
+ if (start_command(child))
die("could not obtain raw diff");
- fp = xfdopen(child.out, "r");
+ fp = xfdopen(child->out, "r");
/* Build index info for left and right sides of the diff */
i = 0;
@@ -410,9 +424,9 @@
const char *src_path, *dst_path;
if (starts_with(info.buf, "::"))
- die(N_("combined diff formats('-c' and '--cc') are "
+ die(N_("combined diff formats ('-c' and '--cc') are "
"not supported in\n"
- "directory diff mode('-d' and '--dir-diff')."));
+ "directory diff mode ('-d' and '--dir-diff')."));
if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
&status))
@@ -525,7 +539,7 @@
fclose(fp);
fp = NULL;
- if (finish_command(&child)) {
+ if (finish_command(child)) {
ret = error("error occurred running diff --raw");
goto finish;
}
@@ -540,40 +554,19 @@
*/
hashmap_for_each_entry(&submodules, &iter, entry,
entry /* member name */) {
- if (*entry->left) {
- add_path(&ldir, ldir_len, entry->path);
- ensure_leading_directories(ldir.buf);
- write_file(ldir.buf, "%s", entry->left);
- }
- if (*entry->right) {
- add_path(&rdir, rdir_len, entry->path);
- ensure_leading_directories(rdir.buf);
- write_file(rdir.buf, "%s", entry->right);
- }
+ write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
}
/*
- * Symbolic links require special treatment.The standard "git diff"
+ * Symbolic links require special treatment. The standard "git diff"
* shows only the link itself, not the contents of the link target.
* This loop replicates that behavior.
*/
hashmap_for_each_entry(&symlinks2, &iter, entry,
entry /* member name */) {
- if (*entry->left) {
- add_path(&ldir, ldir_len, entry->path);
- ensure_leading_directories(ldir.buf);
- unlink(ldir.buf);
- write_file(ldir.buf, "%s", entry->left);
- }
- if (*entry->right) {
- add_path(&rdir, rdir_len, entry->path);
- ensure_leading_directories(rdir.buf);
- unlink(rdir.buf);
- write_file(rdir.buf, "%s", entry->right);
- }
- }
- strbuf_release(&buf);
+ write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
+ }
strbuf_setlen(&ldir, ldir_len);
helper_argv[1] = ldir.buf;
@@ -585,7 +578,7 @@
flags = 0;
} else
setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
- rc = run_command_v_opt(helper_argv, flags);
+ ret = run_command_v_opt(helper_argv, flags);
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(&wtindex);
@@ -619,7 +612,7 @@
if (!indices_loaded) {
struct lock_file lock = LOCK_INIT;
strbuf_reset(&buf);
- strbuf_addf(&buf, "%s/wtindex", tmpdir);
+ strbuf_addf(&buf, "%s/wtindex", tmpdir.buf);
if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||
write_locked_index(&wtindex, &lock, COMMIT_LOCK)) {
ret = error("could not write %s", buf.buf);
@@ -649,11 +642,14 @@
}
if (err) {
- warning(_("temporary files exist in '%s'."), tmpdir);
+ warning(_("temporary files exist in '%s'."), tmpdir.buf);
warning(_("you may want to cleanup or recover these."));
- exit(1);
- } else
- exit_cleanup(tmpdir, rc);
+ ret = 1;
+ } else {
+ remove_dir_recursively(&tmpdir, 0);
+ if (ret)
+ warning(_("failed: %d"), ret);
+ }
finish:
if (fp)
@@ -665,30 +661,29 @@
strbuf_release(&rdir);
strbuf_release(&wtdir);
strbuf_release(&buf);
+ strbuf_release(&tmpdir);
- return ret;
+ return (ret < 0) ? 1 : ret;
}
static int run_file_diff(int prompt, const char *prefix,
- int argc, const char **argv)
+ struct child_process *child)
{
- struct strvec args = STRVEC_INIT;
const char *env[] = {
"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
NULL
};
- int i;
if (prompt > 0)
env[2] = "GIT_DIFFTOOL_PROMPT=true";
else if (!prompt)
env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
+ child->git_cmd = 1;
+ child->dir = prefix;
+ strvec_pushv(&child->env_array, env);
- strvec_push(&args, "diff");
- for (i = 0; i < argc; i++)
- strvec_push(&args, argv[i]);
- return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
+ return run_command(child);
}
int cmd_difftool(int argc, const char **argv, const char *prefix)
@@ -715,12 +710,13 @@
"`--tool`")),
OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
N_("make 'git-difftool' exit when an invoked diff "
- "tool returns a non - zero exit code")),
+ "tool returns a non-zero exit code")),
OPT_STRING('x', "extcmd", &extcmd, N_("command"),
N_("specify a custom command for viewing diffs")),
- OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
+ OPT_BOOL(0, "no-index", &no_index, N_("passed to `diff`")),
OPT_END()
};
+ struct child_process child = CHILD_PROCESS_INIT;
git_config(difftool_config, NULL);
symlinks = has_symlinks;
@@ -770,7 +766,14 @@
* will invoke a separate instance of 'git-difftool--helper' for
* each file that changed.
*/
+ strvec_push(&child.args, "diff");
+ if (no_index)
+ strvec_push(&child.args, "--no-index");
if (dir_diff)
- return run_dir_diff(extcmd, symlinks, prefix, argc, argv);
- return run_file_diff(prompt, prefix, argc, argv);
+ strvec_pushl(&child.args, "--raw", "--no-abbrev", "-z", NULL);
+ strvec_pushv(&child.args, argv);
+
+ if (dir_diff)
+ return run_dir_diff(extcmd, symlinks, prefix, &child);
+ return run_file_diff(prompt, prefix, &child);
}
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 95e8e89..8e2caf7 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -312,7 +312,7 @@
if (!buf)
die("could not read blob %s", oid_to_hex(oid));
if (check_object_signature(the_repository, oid, buf, size,
- type_name(type)) < 0)
+ type_name(type), NULL) < 0)
die("oid mismatch in blob %s", oid_to_hex(oid));
object = parse_object_buffer(the_repository, oid, type,
size, buf, &eaten);
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e064687..f7abbc3 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -712,7 +712,7 @@
int max, rlen, llen, len;
/* uptodate lines are only shown on high verbosity level */
- if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
+ if (verbosity <= 0 && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
return;
max = term_columns();
@@ -748,6 +748,9 @@
struct ref *rm;
const char *format = "full";
+ if (verbosity < 0)
+ return;
+
git_config_get_string_tmp("fetch.output", &format);
if (!strcasecmp(format, "full"))
compact_format = 0;
@@ -827,7 +830,12 @@
const char *remote, const char *local,
int summary_width)
{
- int width = (summary_width + strlen(summary) - gettext_width(summary));
+ int width;
+
+ if (verbosity < 0)
+ return;
+
+ width = (summary_width + strlen(summary) - gettext_width(summary));
strbuf_addf(display, "%c %-*s ", code, width, summary);
if (!compact_format)
@@ -846,13 +854,11 @@
int summary_width)
{
struct commit *current = NULL, *updated;
- enum object_type type;
struct branch *current_branch = branch_get(NULL);
const char *pretty_ref = prettify_refname(ref->name);
int fast_forward = 0;
- type = oid_object_info(the_repository, &ref->new_oid, NULL);
- if (type < 0)
+ if (!repo_has_object_file(the_repository, &ref->new_oid))
die(_("object %s not found"), oid_to_hex(&ref->new_oid));
if (oideq(&ref->old_oid, &ref->new_oid)) {
@@ -964,7 +970,7 @@
}
}
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
{
struct ref **rm = cb_data;
struct ref *ref = *rm;
@@ -972,10 +978,9 @@
while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
ref = ref->next;
if (!ref)
- return -1; /* end of the list */
+ return NULL;
*rm = ref->next;
- oidcpy(oid, &ref->old_oid);
- return 0;
+ return &ref->old_oid;
}
struct fetch_head {
@@ -1074,7 +1079,6 @@
int connectivity_checked, struct ref *ref_map)
{
struct fetch_head fetch_head;
- struct commit *commit;
int url_len, i, rc = 0;
struct strbuf note = STRBUF_INIT, err = STRBUF_INIT;
struct ref_transaction *transaction = NULL;
@@ -1122,6 +1126,7 @@
want_status <= FETCH_HEAD_IGNORE;
want_status++) {
for (rm = ref_map; rm; rm = rm->next) {
+ struct commit *commit = NULL;
struct ref *ref = NULL;
if (rm->status == REF_STATUS_REJECT_SHALLOW) {
@@ -1131,11 +1136,23 @@
continue;
}
- commit = lookup_commit_reference_gently(the_repository,
- &rm->old_oid,
- 1);
- if (!commit)
- rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+ /*
+ * References in "refs/tags/" are often going to point
+ * to annotated tags, which are not part of the
+ * commit-graph. We thus only try to look up refs in
+ * the graph which are not in that namespace to not
+ * regress performance in repositories with many
+ * annotated tags.
+ */
+ if (!starts_with(rm->name, "refs/tags/"))
+ commit = lookup_commit_in_graph(the_repository, &rm->old_oid);
+ if (!commit) {
+ commit = lookup_commit_reference_gently(the_repository,
+ &rm->old_oid,
+ 1);
+ if (!commit)
+ rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+ }
if (rm->fetch_head_status != want_status)
continue;
@@ -1202,13 +1219,12 @@
"FETCH_HEAD", summary_width);
}
if (note.len) {
- if (verbosity >= 0 && !shown_url) {
+ if (!shown_url) {
fprintf(stderr, _("From %.*s\n"),
url_len, url);
shown_url = 1;
}
- if (verbosity >= 0)
- fprintf(stderr, " %s\n", note.buf);
+ fprintf(stderr, " %s\n", note.buf);
}
}
}
@@ -1229,7 +1245,7 @@
" 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name);
- if (advice_fetch_show_forced_updates) {
+ if (advice_enabled(ADVICE_FETCH_SHOW_FORCED_UPDATES)) {
if (!fetch_show_forced_updates) {
warning(_(warn_show_forced_updates));
} else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
@@ -1282,37 +1298,35 @@
return check_connected(iterate_ref_map, &rm, &opt);
}
-static int fetch_refs(struct transport *transport, struct ref *ref_map)
+static int fetch_and_consume_refs(struct transport *transport, struct ref *ref_map)
{
- int ret = check_exist_and_connected(ref_map);
+ int connectivity_checked = 1;
+ int ret;
+
+ /*
+ * We don't need to perform a fetch in case we can already satisfy all
+ * refs.
+ */
+ ret = check_exist_and_connected(ref_map);
if (ret) {
trace2_region_enter("fetch", "fetch_refs", the_repository);
ret = transport_fetch_refs(transport, ref_map);
trace2_region_leave("fetch", "fetch_refs", the_repository);
+ if (ret)
+ goto out;
+ connectivity_checked = transport->smart_options ?
+ transport->smart_options->connectivity_checked : 0;
}
- if (!ret)
- /*
- * Keep the new pack's ".keep" file around to allow the caller
- * time to update refs to reference the new objects.
- */
- return 0;
- transport_unlock_pack(transport);
- return ret;
-}
-/* Update local refs based on the ref values fetched from a remote */
-static int consume_refs(struct transport *transport, struct ref *ref_map)
-{
- int connectivity_checked = transport->smart_options
- ? transport->smart_options->connectivity_checked : 0;
- int ret;
trace2_region_enter("fetch", "consume_refs", the_repository);
ret = store_updated_refs(transport->url,
transport->remote->name,
connectivity_checked,
ref_map);
- transport_unlock_pack(transport);
trace2_region_leave("fetch", "consume_refs", the_repository);
+
+out:
+ transport_unlock_pack(transport);
return ret;
}
@@ -1501,8 +1515,7 @@
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
transport_set_option(transport, TRANS_OPT_DEPTH, "0");
transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
- if (!fetch_refs(transport, ref_map))
- consume_refs(transport, ref_map);
+ fetch_and_consume_refs(transport, ref_map);
if (gsecondary) {
transport_disconnect(gsecondary);
@@ -1593,7 +1606,7 @@
transport->url);
}
}
- if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
+ if (fetch_and_consume_refs(transport, ref_map)) {
free_refs(ref_map);
retcode = 1;
goto cleanup;
@@ -2135,8 +2148,6 @@
NULL);
}
- close_object_store(the_repository->objects);
-
if (enable_auto_gc)
run_auto_maintenance(verbosity < 0);
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 89cb630..16a2c7d 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -77,7 +77,7 @@
filter.name_patterns = argv;
filter.match_as_path = 1;
- filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
+ filter_refs(&array, &filter, FILTER_REFS_ALL);
ref_array_sort(sorting, &array);
if (!maxcount || array.nr < maxcount)
@@ -96,6 +96,6 @@
ref_array_clear(&array);
free_commit_list(filter.with_commit);
free_commit_list(filter.no_commit);
- UNLEAK(sorting);
+ ref_sorting_release(sorting);
return 0;
}
diff --git a/builtin/fsck.c b/builtin/fsck.c
index b42b6fe..27b9e78 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -593,18 +593,44 @@
}
}
+struct for_each_loose_cb
+{
+ struct progress *progress;
+ struct strbuf obj_type;
+};
+
static int fsck_loose(const struct object_id *oid, const char *path, void *data)
{
+ struct for_each_loose_cb *cb_data = data;
struct object *obj;
- enum object_type type;
+ enum object_type type = OBJ_NONE;
unsigned long size;
- void *contents;
+ void *contents = NULL;
int eaten;
+ struct object_info oi = OBJECT_INFO_INIT;
+ struct object_id real_oid = *null_oid();
+ int err = 0;
- if (read_loose_object(path, oid, &type, &size, &contents) < 0) {
+ strbuf_reset(&cb_data->obj_type);
+ oi.type_name = &cb_data->obj_type;
+ oi.sizep = &size;
+ oi.typep = &type;
+
+ if (read_loose_object(path, oid, &real_oid, &contents, &oi) < 0) {
+ if (contents && !oideq(&real_oid, oid))
+ err = error(_("%s: hash-path mismatch, found at: %s"),
+ oid_to_hex(&real_oid), path);
+ else
+ err = error(_("%s: object corrupt or missing: %s"),
+ oid_to_hex(oid), path);
+ }
+ if (type != OBJ_NONE && type < 0)
+ err = error(_("%s: object is of unknown type '%s': %s"),
+ oid_to_hex(&real_oid), cb_data->obj_type.buf,
+ path);
+ if (err < 0) {
errors_found |= ERROR_OBJECT;
- error(_("%s: object corrupt or missing: %s"),
- oid_to_hex(oid), path);
+ free(contents);
return 0; /* keep checking other objects */
}
@@ -640,8 +666,10 @@
return 0;
}
-static int fsck_subdir(unsigned int nr, const char *path, void *progress)
+static int fsck_subdir(unsigned int nr, const char *path, void *data)
{
+ struct for_each_loose_cb *cb_data = data;
+ struct progress *progress = cb_data->progress;
display_progress(progress, nr + 1);
return 0;
}
@@ -649,6 +677,10 @@
static void fsck_object_dir(const char *path)
{
struct progress *progress = NULL;
+ struct for_each_loose_cb cb_data = {
+ .obj_type = STRBUF_INIT,
+ .progress = progress,
+ };
if (verbose)
fprintf_ln(stderr, _("Checking object directory"));
@@ -657,9 +689,10 @@
progress = start_progress(_("Checking object directories"), 256);
for_each_loose_file_in_objdir(path, fsck_loose, fsck_cruft, fsck_subdir,
- progress);
+ &cb_data);
display_progress(progress, 256);
stop_progress(&progress);
+ strbuf_release(&cb_data.obj_type);
}
static int fsck_head_link(const char *head_ref_name,
@@ -803,6 +836,7 @@
fsck_enable_object_names(&fsck_walk_options);
git_config(git_fsck_config, &fsck_obj_options);
+ prepare_repo_settings(the_repository);
if (connectivity_only) {
for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
@@ -908,7 +942,7 @@
check_connectivity();
- if (!git_config_get_bool("core.commitgraph", &i) && i) {
+ if (the_repository->settings.core_commit_graph) {
struct child_process commit_graph_verify = CHILD_PROCESS_INIT;
const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL };
@@ -924,7 +958,7 @@
}
}
- if (!git_config_get_bool("core.multipackindex", &i) && i) {
+ if (the_repository->settings.core_multi_pack_index) {
struct child_process midx_verify = CHILD_PROCESS_INIT;
const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL };
diff --git a/builtin/gc.c b/builtin/gc.c
index ac60662..bcef6a4 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -663,8 +663,8 @@
gc_before_repack();
if (!repository_format_precious_objects) {
- close_object_store(the_repository->objects);
- if (run_command_v_opt(repack.v, RUN_GIT_CMD))
+ if (run_command_v_opt(repack.v,
+ RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE))
die(FAILED_RUN, repack.v[0]);
if (prune_expire) {
@@ -848,7 +848,7 @@
{
struct child_process child = CHILD_PROCESS_INIT;
- child.git_cmd = 1;
+ child.git_cmd = child.close_object_store = 1;
strvec_pushl(&child.args, "commit-graph", "write",
"--split", "--reachable", NULL);
@@ -864,7 +864,6 @@
if (!the_repository->settings.core_commit_graph)
return 0;
- close_object_store(the_repository->objects);
if (run_write_commit_graph(opts)) {
error(_("failed to write commit-graph"));
return 1;
@@ -913,7 +912,7 @@
{
struct child_process child = CHILD_PROCESS_INIT;
- child.git_cmd = 1;
+ child.git_cmd = child.close_object_store = 1;
strvec_push(&child.args, "gc");
if (opts->auto_flag)
@@ -923,7 +922,6 @@
else
strvec_push(&child.args, "--no-quiet");
- close_object_store(the_repository->objects);
return run_command(&child);
}
@@ -1051,12 +1049,11 @@
static int incremental_repack_auto_condition(void)
{
struct packed_git *p;
- int enabled;
int incremental_repack_auto_limit = 10;
int count = 0;
- if (git_config_get_bool("core.multiPackIndex", &enabled) ||
- !enabled)
+ prepare_repo_settings(the_repository);
+ if (!the_repository->settings.core_multi_pack_index)
return 0;
git_config_get_int("maintenance.incremental-repack.auto",
@@ -1097,14 +1094,12 @@
{
struct child_process child = CHILD_PROCESS_INIT;
- child.git_cmd = 1;
+ child.git_cmd = child.close_object_store = 1;
strvec_pushl(&child.args, "multi-pack-index", "expire", NULL);
if (opts->quiet)
strvec_push(&child.args, "--no-progress");
- close_object_store(the_repository->objects);
-
if (run_command(&child))
return error(_("'git multi-pack-index expire' failed"));
@@ -1155,7 +1150,7 @@
{
struct child_process child = CHILD_PROCESS_INIT;
- child.git_cmd = 1;
+ child.git_cmd = child.close_object_store = 1;
strvec_pushl(&child.args, "multi-pack-index", "repack", NULL);
if (opts->quiet)
@@ -1164,8 +1159,6 @@
strvec_pushf(&child.args, "--batch-size=%"PRIuMAX,
(uintmax_t)get_auto_pack_size());
- close_object_store(the_repository->objects);
-
if (run_command(&child))
return error(_("'git multi-pack-index repack' failed"));
@@ -1529,6 +1522,93 @@
}
}
+/*
+ * get_schedule_cmd` reads the GIT_TEST_MAINT_SCHEDULER environment variable
+ * to mock the schedulers that `git maintenance start` rely on.
+ *
+ * For test purpose, GIT_TEST_MAINT_SCHEDULER can be set to a comma-separated
+ * list of colon-separated key/value pairs where each pair contains a scheduler
+ * and its corresponding mock.
+ *
+ * * If $GIT_TEST_MAINT_SCHEDULER is not set, return false and leave the
+ * arguments unmodified.
+ *
+ * * If $GIT_TEST_MAINT_SCHEDULER is set, return true.
+ * In this case, the *cmd value is read as input.
+ *
+ * * if the input value *cmd is the key of one of the comma-separated list
+ * item, then *is_available is set to true and *cmd is modified and becomes
+ * the mock command.
+ *
+ * * if the input value *cmd isn’t the key of any of the comma-separated list
+ * item, then *is_available is set to false.
+ *
+ * Ex.:
+ * GIT_TEST_MAINT_SCHEDULER not set
+ * +-------+-------------------------------------------------+
+ * | Input | Output |
+ * | *cmd | return code | *cmd | *is_available |
+ * +-------+-------------+-------------------+---------------+
+ * | "foo" | false | "foo" (unchanged) | (unchanged) |
+ * +-------+-------------+-------------------+---------------+
+ *
+ * GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh”
+ * +-------+-------------------------------------------------+
+ * | Input | Output |
+ * | *cmd | return code | *cmd | *is_available |
+ * +-------+-------------+-------------------+---------------+
+ * | "foo" | true | "./mock.foo.sh" | true |
+ * | "qux" | true | "qux" (unchanged) | false |
+ * +-------+-------------+-------------------+---------------+
+ */
+static int get_schedule_cmd(const char **cmd, int *is_available)
+{
+ char *testing = xstrdup_or_null(getenv("GIT_TEST_MAINT_SCHEDULER"));
+ struct string_list_item *item;
+ struct string_list list = STRING_LIST_INIT_NODUP;
+
+ if (!testing)
+ return 0;
+
+ if (is_available)
+ *is_available = 0;
+
+ string_list_split_in_place(&list, testing, ',', -1);
+ for_each_string_list_item(item, &list) {
+ struct string_list pair = STRING_LIST_INIT_NODUP;
+
+ if (string_list_split_in_place(&pair, item->string, ':', 2) != 2)
+ continue;
+
+ if (!strcmp(*cmd, pair.items[0].string)) {
+ *cmd = pair.items[1].string;
+ if (is_available)
+ *is_available = 1;
+ string_list_clear(&list, 0);
+ UNLEAK(testing);
+ return 1;
+ }
+ }
+
+ string_list_clear(&list, 0);
+ free(testing);
+ return 1;
+}
+
+static int is_launchctl_available(void)
+{
+ const char *cmd = "launchctl";
+ int is_available;
+ if (get_schedule_cmd(&cmd, &is_available))
+ return is_available;
+
+#ifdef __APPLE__
+ return 1;
+#else
+ return 0;
+#endif
+}
+
static char *launchctl_service_name(const char *frequency)
{
struct strbuf label = STRBUF_INIT;
@@ -1542,7 +1622,7 @@
struct strbuf filename = STRBUF_INIT;
strbuf_addf(&filename, "~/Library/LaunchAgents/%s.plist", name);
- expanded = expand_user_path(filename.buf, 1);
+ expanded = interpolate_path(filename.buf, 1);
if (!expanded)
die(_("failed to expand path '%s'"), filename.buf);
@@ -1555,19 +1635,17 @@
return xstrfmt("gui/%d", getuid());
}
-static int launchctl_boot_plist(int enable, const char *filename, const char *cmd)
+static int launchctl_boot_plist(int enable, const char *filename)
{
+ const char *cmd = "launchctl";
int result;
struct child_process child = CHILD_PROCESS_INIT;
char *uid = launchctl_get_uid();
+ get_schedule_cmd(&cmd, NULL);
strvec_split(&child.args, cmd);
- if (enable)
- strvec_push(&child.args, "bootstrap");
- else
- strvec_push(&child.args, "bootout");
- strvec_push(&child.args, uid);
- strvec_push(&child.args, filename);
+ strvec_pushl(&child.args, enable ? "bootstrap" : "bootout", uid,
+ filename, NULL);
child.no_stderr = 1;
child.no_stdout = 1;
@@ -1581,30 +1659,28 @@
return result;
}
-static int launchctl_remove_plist(enum schedule_priority schedule, const char *cmd)
+static int launchctl_remove_plist(enum schedule_priority schedule)
{
const char *frequency = get_frequency(schedule);
char *name = launchctl_service_name(frequency);
char *filename = launchctl_service_filename(name);
- int result = launchctl_boot_plist(0, filename, cmd);
+ int result = launchctl_boot_plist(0, filename);
unlink(filename);
free(filename);
free(name);
return result;
}
-static int launchctl_remove_plists(const char *cmd)
+static int launchctl_remove_plists(void)
{
- return launchctl_remove_plist(SCHEDULE_HOURLY, cmd) ||
- launchctl_remove_plist(SCHEDULE_DAILY, cmd) ||
- launchctl_remove_plist(SCHEDULE_WEEKLY, cmd);
+ return launchctl_remove_plist(SCHEDULE_HOURLY) ||
+ launchctl_remove_plist(SCHEDULE_DAILY) ||
+ launchctl_remove_plist(SCHEDULE_WEEKLY);
}
static int launchctl_list_contains_plist(const char *name, const char *cmd)
{
- int result;
struct child_process child = CHILD_PROCESS_INIT;
- char *uid = launchctl_get_uid();
strvec_split(&child.args, cmd);
strvec_pushl(&child.args, "list", name, NULL);
@@ -1615,15 +1691,11 @@
if (start_command(&child))
die(_("failed to start launchctl"));
- result = finish_command(&child);
-
- free(uid);
-
/* Returns failure if 'name' doesn't exist. */
- return !result;
+ return !finish_command(&child);
}
-static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule)
{
int i, fd;
const char *preamble, *repeat;
@@ -1634,7 +1706,9 @@
static unsigned long lock_file_timeout_ms = ULONG_MAX;
struct strbuf plist = STRBUF_INIT, plist2 = STRBUF_INIT;
struct stat st;
+ const char *cmd = "launchctl";
+ get_schedule_cmd(&cmd, NULL);
preamble = "<?xml version=\"1.0\"?>\n"
"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
"<plist version=\"1.0\">"
@@ -1715,8 +1789,8 @@
die_errno(_("could not write '%s'"), filename);
/* bootout might fail if not already running, so ignore */
- launchctl_boot_plist(0, filename, cmd);
- if (launchctl_boot_plist(1, filename, cmd))
+ launchctl_boot_plist(0, filename);
+ if (launchctl_boot_plist(1, filename))
die(_("failed to bootstrap service %s"), filename);
}
@@ -1727,21 +1801,35 @@
return 0;
}
-static int launchctl_add_plists(const char *cmd)
+static int launchctl_add_plists(void)
{
const char *exec_path = git_exec_path();
- return launchctl_schedule_plist(exec_path, SCHEDULE_HOURLY, cmd) ||
- launchctl_schedule_plist(exec_path, SCHEDULE_DAILY, cmd) ||
- launchctl_schedule_plist(exec_path, SCHEDULE_WEEKLY, cmd);
+ return launchctl_schedule_plist(exec_path, SCHEDULE_HOURLY) ||
+ launchctl_schedule_plist(exec_path, SCHEDULE_DAILY) ||
+ launchctl_schedule_plist(exec_path, SCHEDULE_WEEKLY);
}
-static int launchctl_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int launchctl_update_schedule(int run_maintenance, int fd)
{
if (run_maintenance)
- return launchctl_add_plists(cmd);
+ return launchctl_add_plists();
else
- return launchctl_remove_plists(cmd);
+ return launchctl_remove_plists();
+}
+
+static int is_schtasks_available(void)
+{
+ const char *cmd = "schtasks";
+ int is_available;
+ if (get_schedule_cmd(&cmd, &is_available))
+ return is_available;
+
+#ifdef GIT_WINDOWS_NATIVE
+ return 1;
+#else
+ return 0;
+#endif
}
static char *schtasks_task_name(const char *frequency)
@@ -1751,13 +1839,15 @@
return strbuf_detach(&label, NULL);
}
-static int schtasks_remove_task(enum schedule_priority schedule, const char *cmd)
+static int schtasks_remove_task(enum schedule_priority schedule)
{
+ const char *cmd = "schtasks";
int result;
struct strvec args = STRVEC_INIT;
const char *frequency = get_frequency(schedule);
char *name = schtasks_task_name(frequency);
+ get_schedule_cmd(&cmd, NULL);
strvec_split(&args, cmd);
strvec_pushl(&args, "/delete", "/tn", name, "/f", NULL);
@@ -1768,15 +1858,16 @@
return result;
}
-static int schtasks_remove_tasks(const char *cmd)
+static int schtasks_remove_tasks(void)
{
- return schtasks_remove_task(SCHEDULE_HOURLY, cmd) ||
- schtasks_remove_task(SCHEDULE_DAILY, cmd) ||
- schtasks_remove_task(SCHEDULE_WEEKLY, cmd);
+ return schtasks_remove_task(SCHEDULE_HOURLY) ||
+ schtasks_remove_task(SCHEDULE_DAILY) ||
+ schtasks_remove_task(SCHEDULE_WEEKLY);
}
-static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule)
{
+ const char *cmd = "schtasks";
int result;
struct child_process child = CHILD_PROCESS_INIT;
const char *xml;
@@ -1785,6 +1876,8 @@
char *name = schtasks_task_name(frequency);
struct strbuf tfilename = STRBUF_INIT;
+ get_schedule_cmd(&cmd, NULL);
+
strbuf_addf(&tfilename, "%s/schedule_%s_XXXXXX",
get_git_common_dir(), frequency);
tfile = xmks_tempfile(tfilename.buf);
@@ -1889,28 +1982,67 @@
return result;
}
-static int schtasks_schedule_tasks(const char *cmd)
+static int schtasks_schedule_tasks(void)
{
const char *exec_path = git_exec_path();
- return schtasks_schedule_task(exec_path, SCHEDULE_HOURLY, cmd) ||
- schtasks_schedule_task(exec_path, SCHEDULE_DAILY, cmd) ||
- schtasks_schedule_task(exec_path, SCHEDULE_WEEKLY, cmd);
+ return schtasks_schedule_task(exec_path, SCHEDULE_HOURLY) ||
+ schtasks_schedule_task(exec_path, SCHEDULE_DAILY) ||
+ schtasks_schedule_task(exec_path, SCHEDULE_WEEKLY);
}
-static int schtasks_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int schtasks_update_schedule(int run_maintenance, int fd)
{
if (run_maintenance)
- return schtasks_schedule_tasks(cmd);
+ return schtasks_schedule_tasks();
else
- return schtasks_remove_tasks(cmd);
+ return schtasks_remove_tasks();
+}
+
+MAYBE_UNUSED
+static int check_crontab_process(const char *cmd)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ strvec_split(&child.args, cmd);
+ strvec_push(&child.args, "-l");
+ child.no_stdin = 1;
+ child.no_stdout = 1;
+ child.no_stderr = 1;
+ child.silent_exec_failure = 1;
+
+ if (start_command(&child))
+ return 0;
+ /* Ignore exit code, as an empty crontab will return error. */
+ finish_command(&child);
+ return 1;
+}
+
+static int is_crontab_available(void)
+{
+ const char *cmd = "crontab";
+ int is_available;
+
+ if (get_schedule_cmd(&cmd, &is_available))
+ return is_available;
+
+#ifdef __APPLE__
+ /*
+ * macOS has cron, but it requires special permissions and will
+ * create a UI alert when attempting to run this command.
+ */
+ return 0;
+#else
+ return check_crontab_process(cmd);
+#endif
}
#define BEGIN_LINE "# BEGIN GIT MAINTENANCE SCHEDULE"
#define END_LINE "# END GIT MAINTENANCE SCHEDULE"
-static int crontab_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int crontab_update_schedule(int run_maintenance, int fd)
{
+ const char *cmd = "crontab";
int result = 0;
int in_old_region = 0;
struct child_process crontab_list = CHILD_PROCESS_INIT;
@@ -1918,6 +2050,7 @@
FILE *cron_list, *cron_in;
struct strbuf line = STRBUF_INIT;
+ get_schedule_cmd(&cmd, NULL);
strvec_split(&crontab_list.args, cmd);
strvec_push(&crontab_list.args, "-l");
crontab_list.in = -1;
@@ -1994,66 +2127,376 @@
return result;
}
-#if defined(__APPLE__)
-static const char platform_scheduler[] = "launchctl";
-#elif defined(GIT_WINDOWS_NATIVE)
-static const char platform_scheduler[] = "schtasks";
-#else
-static const char platform_scheduler[] = "crontab";
-#endif
-
-static int update_background_schedule(int enable)
+static int real_is_systemd_timer_available(void)
{
- int result;
- const char *scheduler = platform_scheduler;
- const char *cmd = scheduler;
- char *testing;
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ strvec_pushl(&child.args, "systemctl", "--user", "list-timers", NULL);
+ child.no_stdin = 1;
+ child.no_stdout = 1;
+ child.no_stderr = 1;
+ child.silent_exec_failure = 1;
+
+ if (start_command(&child))
+ return 0;
+ if (finish_command(&child))
+ return 0;
+ return 1;
+}
+
+static int is_systemd_timer_available(void)
+{
+ const char *cmd = "systemctl";
+ int is_available;
+
+ if (get_schedule_cmd(&cmd, &is_available))
+ return is_available;
+
+ return real_is_systemd_timer_available();
+}
+
+static char *xdg_config_home_systemd(const char *filename)
+{
+ return xdg_config_home_for("systemd/user", filename);
+}
+
+static int systemd_timer_enable_unit(int enable,
+ enum schedule_priority schedule)
+{
+ const char *cmd = "systemctl";
+ struct child_process child = CHILD_PROCESS_INIT;
+ const char *frequency = get_frequency(schedule);
+
+ /*
+ * Disabling the systemd unit while it is already disabled makes
+ * systemctl print an error.
+ * Let's ignore it since it means we already are in the expected state:
+ * the unit is disabled.
+ *
+ * On the other hand, enabling a systemd unit which is already enabled
+ * produces no error.
+ */
+ if (!enable)
+ child.no_stderr = 1;
+
+ get_schedule_cmd(&cmd, NULL);
+ strvec_split(&child.args, cmd);
+ strvec_pushl(&child.args, "--user", enable ? "enable" : "disable",
+ "--now", NULL);
+ strvec_pushf(&child.args, "git-maintenance@%s.timer", frequency);
+
+ if (start_command(&child))
+ return error(_("failed to start systemctl"));
+ if (finish_command(&child))
+ /*
+ * Disabling an already disabled systemd unit makes
+ * systemctl fail.
+ * Let's ignore this failure.
+ *
+ * Enabling an enabled systemd unit doesn't fail.
+ */
+ if (enable)
+ return error(_("failed to run systemctl"));
+ return 0;
+}
+
+static int systemd_timer_delete_unit_templates(void)
+{
+ int ret = 0;
+ char *filename = xdg_config_home_systemd("git-maintenance@.timer");
+ if (unlink(filename) && !is_missing_file_error(errno))
+ ret = error_errno(_("failed to delete '%s'"), filename);
+ FREE_AND_NULL(filename);
+
+ filename = xdg_config_home_systemd("git-maintenance@.service");
+ if (unlink(filename) && !is_missing_file_error(errno))
+ ret = error_errno(_("failed to delete '%s'"), filename);
+
+ free(filename);
+ return ret;
+}
+
+static int systemd_timer_delete_units(void)
+{
+ return systemd_timer_enable_unit(0, SCHEDULE_HOURLY) ||
+ systemd_timer_enable_unit(0, SCHEDULE_DAILY) ||
+ systemd_timer_enable_unit(0, SCHEDULE_WEEKLY) ||
+ systemd_timer_delete_unit_templates();
+}
+
+static int systemd_timer_write_unit_templates(const char *exec_path)
+{
+ char *filename;
+ FILE *file;
+ const char *unit;
+
+ filename = xdg_config_home_systemd("git-maintenance@.timer");
+ if (safe_create_leading_directories(filename)) {
+ error(_("failed to create directories for '%s'"), filename);
+ goto error;
+ }
+ file = fopen_or_warn(filename, "w");
+ if (file == NULL)
+ goto error;
+
+ unit = "# This file was created and is maintained by Git.\n"
+ "# Any edits made in this file might be replaced in the future\n"
+ "# by a Git command.\n"
+ "\n"
+ "[Unit]\n"
+ "Description=Optimize Git repositories data\n"
+ "\n"
+ "[Timer]\n"
+ "OnCalendar=%i\n"
+ "Persistent=true\n"
+ "\n"
+ "[Install]\n"
+ "WantedBy=timers.target\n";
+ if (fputs(unit, file) == EOF) {
+ error(_("failed to write to '%s'"), filename);
+ fclose(file);
+ goto error;
+ }
+ if (fclose(file) == EOF) {
+ error_errno(_("failed to flush '%s'"), filename);
+ goto error;
+ }
+ free(filename);
+
+ filename = xdg_config_home_systemd("git-maintenance@.service");
+ file = fopen_or_warn(filename, "w");
+ if (file == NULL)
+ goto error;
+
+ unit = "# This file was created and is maintained by Git.\n"
+ "# Any edits made in this file might be replaced in the future\n"
+ "# by a Git command.\n"
+ "\n"
+ "[Unit]\n"
+ "Description=Optimize Git repositories data\n"
+ "\n"
+ "[Service]\n"
+ "Type=oneshot\n"
+ "ExecStart=\"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%i\n"
+ "LockPersonality=yes\n"
+ "MemoryDenyWriteExecute=yes\n"
+ "NoNewPrivileges=yes\n"
+ "RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6\n"
+ "RestrictNamespaces=yes\n"
+ "RestrictRealtime=yes\n"
+ "RestrictSUIDSGID=yes\n"
+ "SystemCallArchitectures=native\n"
+ "SystemCallFilter=@system-service\n";
+ if (fprintf(file, unit, exec_path, exec_path) < 0) {
+ error(_("failed to write to '%s'"), filename);
+ fclose(file);
+ goto error;
+ }
+ if (fclose(file) == EOF) {
+ error_errno(_("failed to flush '%s'"), filename);
+ goto error;
+ }
+ free(filename);
+ return 0;
+
+error:
+ free(filename);
+ systemd_timer_delete_unit_templates();
+ return -1;
+}
+
+static int systemd_timer_setup_units(void)
+{
+ const char *exec_path = git_exec_path();
+
+ int ret = systemd_timer_write_unit_templates(exec_path) ||
+ systemd_timer_enable_unit(1, SCHEDULE_HOURLY) ||
+ systemd_timer_enable_unit(1, SCHEDULE_DAILY) ||
+ systemd_timer_enable_unit(1, SCHEDULE_WEEKLY);
+ if (ret)
+ systemd_timer_delete_units();
+ return ret;
+}
+
+static int systemd_timer_update_schedule(int run_maintenance, int fd)
+{
+ if (run_maintenance)
+ return systemd_timer_setup_units();
+ else
+ return systemd_timer_delete_units();
+}
+
+enum scheduler {
+ SCHEDULER_INVALID = -1,
+ SCHEDULER_AUTO,
+ SCHEDULER_CRON,
+ SCHEDULER_SYSTEMD,
+ SCHEDULER_LAUNCHCTL,
+ SCHEDULER_SCHTASKS,
+};
+
+static const struct {
+ const char *name;
+ int (*is_available)(void);
+ int (*update_schedule)(int run_maintenance, int fd);
+} scheduler_fn[] = {
+ [SCHEDULER_CRON] = {
+ .name = "crontab",
+ .is_available = is_crontab_available,
+ .update_schedule = crontab_update_schedule,
+ },
+ [SCHEDULER_SYSTEMD] = {
+ .name = "systemctl",
+ .is_available = is_systemd_timer_available,
+ .update_schedule = systemd_timer_update_schedule,
+ },
+ [SCHEDULER_LAUNCHCTL] = {
+ .name = "launchctl",
+ .is_available = is_launchctl_available,
+ .update_schedule = launchctl_update_schedule,
+ },
+ [SCHEDULER_SCHTASKS] = {
+ .name = "schtasks",
+ .is_available = is_schtasks_available,
+ .update_schedule = schtasks_update_schedule,
+ },
+};
+
+static enum scheduler parse_scheduler(const char *value)
+{
+ if (!value)
+ return SCHEDULER_INVALID;
+ else if (!strcasecmp(value, "auto"))
+ return SCHEDULER_AUTO;
+ else if (!strcasecmp(value, "cron") || !strcasecmp(value, "crontab"))
+ return SCHEDULER_CRON;
+ else if (!strcasecmp(value, "systemd") ||
+ !strcasecmp(value, "systemd-timer"))
+ return SCHEDULER_SYSTEMD;
+ else if (!strcasecmp(value, "launchctl"))
+ return SCHEDULER_LAUNCHCTL;
+ else if (!strcasecmp(value, "schtasks"))
+ return SCHEDULER_SCHTASKS;
+ else
+ return SCHEDULER_INVALID;
+}
+
+static int maintenance_opt_scheduler(const struct option *opt, const char *arg,
+ int unset)
+{
+ enum scheduler *scheduler = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+
+ *scheduler = parse_scheduler(arg);
+ if (*scheduler == SCHEDULER_INVALID)
+ return error(_("unrecognized --scheduler argument '%s'"), arg);
+ return 0;
+}
+
+struct maintenance_start_opts {
+ enum scheduler scheduler;
+};
+
+static enum scheduler resolve_scheduler(enum scheduler scheduler)
+{
+ if (scheduler != SCHEDULER_AUTO)
+ return scheduler;
+
+#if defined(__APPLE__)
+ return SCHEDULER_LAUNCHCTL;
+
+#elif defined(GIT_WINDOWS_NATIVE)
+ return SCHEDULER_SCHTASKS;
+
+#elif defined(__linux__)
+ if (is_systemd_timer_available())
+ return SCHEDULER_SYSTEMD;
+ else if (is_crontab_available())
+ return SCHEDULER_CRON;
+ else
+ die(_("neither systemd timers nor crontab are available"));
+
+#else
+ return SCHEDULER_CRON;
+#endif
+}
+
+static void validate_scheduler(enum scheduler scheduler)
+{
+ if (scheduler == SCHEDULER_INVALID)
+ BUG("invalid scheduler");
+ if (scheduler == SCHEDULER_AUTO)
+ BUG("resolve_scheduler should have been called before");
+
+ if (!scheduler_fn[scheduler].is_available())
+ die(_("%s scheduler is not available"),
+ scheduler_fn[scheduler].name);
+}
+
+static int update_background_schedule(const struct maintenance_start_opts *opts,
+ int enable)
+{
+ unsigned int i;
+ int result = 0;
struct lock_file lk;
char *lock_path = xstrfmt("%s/schedule", the_repository->objects->odb->path);
- testing = xstrdup_or_null(getenv("GIT_TEST_MAINT_SCHEDULER"));
- if (testing) {
- char *sep = strchr(testing, ':');
- if (!sep)
- die("GIT_TEST_MAINT_SCHEDULER unparseable: %s", testing);
- *sep = '\0';
- scheduler = testing;
- cmd = sep + 1;
- }
-
if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) {
- result = error(_("another process is scheduling background maintenance"));
- goto cleanup;
+ free(lock_path);
+ return error(_("another process is scheduling background maintenance"));
}
- if (!strcmp(scheduler, "launchctl"))
- result = launchctl_update_schedule(enable, get_lock_file_fd(&lk), cmd);
- else if (!strcmp(scheduler, "schtasks"))
- result = schtasks_update_schedule(enable, get_lock_file_fd(&lk), cmd);
- else if (!strcmp(scheduler, "crontab"))
- result = crontab_update_schedule(enable, get_lock_file_fd(&lk), cmd);
- else
- die("unknown background scheduler: %s", scheduler);
+ for (i = 1; i < ARRAY_SIZE(scheduler_fn); i++) {
+ if (enable && opts->scheduler == i)
+ continue;
+ if (!scheduler_fn[i].is_available())
+ continue;
+ scheduler_fn[i].update_schedule(0, get_lock_file_fd(&lk));
+ }
+
+ if (enable)
+ result = scheduler_fn[opts->scheduler].update_schedule(
+ 1, get_lock_file_fd(&lk));
rollback_lock_file(&lk);
-cleanup:
free(lock_path);
- free(testing);
return result;
}
-static int maintenance_start(void)
+static const char *const builtin_maintenance_start_usage[] = {
+ N_("git maintenance start [--scheduler=<scheduler>]"),
+ NULL
+};
+
+static int maintenance_start(int argc, const char **argv, const char *prefix)
{
+ struct maintenance_start_opts opts = { 0 };
+ struct option options[] = {
+ OPT_CALLBACK_F(
+ 0, "scheduler", &opts.scheduler, N_("scheduler"),
+ N_("scheduler to trigger git maintenance run"),
+ PARSE_OPT_NONEG, maintenance_opt_scheduler),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ builtin_maintenance_start_usage, 0);
+ if (argc)
+ usage_with_options(builtin_maintenance_start_usage, options);
+
+ opts.scheduler = resolve_scheduler(opts.scheduler);
+ validate_scheduler(opts.scheduler);
+
if (maintenance_register())
warning(_("failed to add repo to global config"));
-
- return update_background_schedule(1);
+ return update_background_schedule(&opts, 1);
}
static int maintenance_stop(void)
{
- return update_background_schedule(0);
+ return update_background_schedule(NULL, 0);
}
static const char builtin_maintenance_usage[] = N_("git maintenance <subcommand> [<options>]");
@@ -2067,7 +2510,7 @@
if (!strcmp(argv[1], "run"))
return maintenance_run(argc - 1, argv + 1, prefix);
if (!strcmp(argv[1], "start"))
- return maintenance_start();
+ return maintenance_start(argc - 1, argv + 1, prefix);
if (!strcmp(argv[1], "stop"))
return maintenance_stop();
if (!strcmp(argv[1], "register"))
diff --git a/builtin/grep.c b/builtin/grep.c
index 7d2f8e5..9e34a82 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -65,6 +65,9 @@
/* Has all work items been added? */
static int all_work_added;
+static struct repository **repos_to_free;
+static size_t repos_to_free_nr, repos_to_free_alloc;
+
/* This lock protects all the variables above. */
static pthread_mutex_t grep_mutex;
@@ -168,6 +171,19 @@
grep_unlock();
}
+static void free_repos(void)
+{
+ int i;
+
+ for (i = 0; i < repos_to_free_nr; i++) {
+ repo_clear(repos_to_free[i]);
+ free(repos_to_free[i]);
+ }
+ FREE_AND_NULL(repos_to_free);
+ repos_to_free_nr = 0;
+ repos_to_free_alloc = 0;
+}
+
static void *run(void *arg)
{
int hit = 0;
@@ -183,8 +199,8 @@
grep_source_clear_data(&w->source);
work_done(w);
}
- free_grep_patterns(arg);
- free(arg);
+ free_grep_patterns(opt);
+ free(opt);
return (void*) (intptr_t) hit;
}
@@ -333,7 +349,7 @@
struct grep_source gs;
grep_source_name(opt, filename, tree_name_len, &pathbuf);
- grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
+ grep_source_init_oid(&gs, pathbuf.buf, path, oid, opt->repo);
strbuf_release(&pathbuf);
if (num_threads > 1) {
@@ -359,7 +375,7 @@
struct grep_source gs;
grep_source_name(opt, filename, 0, &buf);
- grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
+ grep_source_init_file(&gs, buf.buf, filename);
strbuf_release(&buf);
if (num_threads > 1) {
@@ -385,7 +401,7 @@
if (len == 1 && *(const char *)data == '\0')
return;
- string_list_append(path_list, xstrndup(data, len));
+ string_list_append_nodup(path_list, xstrndup(data, len));
}
static void run_pager(struct grep_opt *opt, const char *prefix)
@@ -415,19 +431,21 @@
const struct object_id *oid,
const char *filename, const char *path, int cached)
{
- struct repository subrepo;
+ struct repository *subrepo;
struct repository *superproject = opt->repo;
- const struct submodule *sub;
struct grep_opt subopt;
- int hit;
-
- sub = submodule_from_path(superproject, null_oid(), path);
+ int hit = 0;
if (!is_submodule_active(superproject, path))
return 0;
- if (repo_submodule_init(&subrepo, superproject, sub))
+ subrepo = xmalloc(sizeof(*subrepo));
+ if (repo_submodule_init(subrepo, superproject, path, null_oid())) {
+ free(subrepo);
return 0;
+ }
+ ALLOC_GROW(repos_to_free, repos_to_free_nr + 1, repos_to_free_alloc);
+ repos_to_free[repos_to_free_nr++] = subrepo;
/*
* NEEDSWORK: repo_read_gitmodules() might call
@@ -438,53 +456,49 @@
* subrepo's odbs to the in-memory alternates list.
*/
obj_read_lock();
- repo_read_gitmodules(&subrepo, 0);
+ repo_read_gitmodules(subrepo, 0);
/*
- * NEEDSWORK: This adds the submodule's object directory to the list of
- * alternates for the single in-memory object store. This has some bad
- * consequences for memory (processed objects will never be freed) and
- * performance (this increases the number of pack files git has to pay
- * attention to, to the sum of the number of pack files in all the
- * repositories processed so far). This can be removed once the object
- * store is no longer global and instead is a member of the repository
- * object.
+ * All code paths tested by test code no longer need submodule ODBs to
+ * be added as alternates, but add it to the list just in case.
+ * Submodule ODBs added through add_submodule_odb_by_path() will be
+ * lazily registered as alternates when needed (and except in an
+ * unexpected code interaction, it won't be needed).
*/
- add_to_alternates_memory(subrepo.objects->odb->path);
+ add_submodule_odb_by_path(subrepo->objects->odb->path);
obj_read_unlock();
memcpy(&subopt, opt, sizeof(subopt));
- subopt.repo = &subrepo;
+ subopt.repo = subrepo;
if (oid) {
- struct object *object;
+ enum object_type object_type;
struct tree_desc tree;
void *data;
unsigned long size;
struct strbuf base = STRBUF_INIT;
obj_read_lock();
- object = parse_object_or_die(oid, NULL);
+ object_type = oid_object_info(subrepo, oid, NULL);
obj_read_unlock();
- data = read_object_with_reference(&subrepo,
- &object->oid, tree_type,
+ data = read_object_with_reference(subrepo,
+ oid, tree_type,
&size, NULL);
if (!data)
- die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
+ die(_("unable to read tree (%s)"), oid_to_hex(oid));
strbuf_addstr(&base, filename);
strbuf_addch(&base, '/');
init_tree_desc(&tree, data, size);
hit = grep_tree(&subopt, pathspec, &tree, &base, base.len,
- object->type == OBJ_COMMIT);
+ object_type == OBJ_COMMIT);
strbuf_release(&base);
free(data);
} else {
hit = grep_cache(&subopt, pathspec, cached);
}
- repo_clear(&subrepo);
return hit;
}
@@ -825,7 +839,7 @@
struct grep_opt opt;
struct object_array list = OBJECT_ARRAY_INIT;
struct pathspec pathspec;
- struct string_list path_list = STRING_LIST_INIT_NODUP;
+ struct string_list path_list = STRING_LIST_INIT_DUP;
int i;
int dummy;
int use_index = 1;
@@ -1145,8 +1159,8 @@
strbuf_addf(&buf, "+/%s%s",
strcmp("less", pager) ? "" : "*",
opt.pattern_list->pattern);
- string_list_append(&path_list,
- strbuf_detach(&buf, NULL));
+ string_list_append_nodup(&path_list,
+ strbuf_detach(&buf, NULL));
}
}
@@ -1181,6 +1195,9 @@
if (hit && show_in_pager)
run_pager(&opt, prefix);
clear_pathspec(&pathspec);
+ string_list_clear(&path_list, 0);
free_grep_patterns(&opt);
+ object_array_clear(&list);
+ free_repos();
return !hit;
}
diff --git a/builtin/help.c b/builtin/help.c
index b7eec06..75cd2fb 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -7,7 +7,6 @@
#include "exec-cmd.h"
#include "parse-options.h"
#include "run-command.h"
-#include "column.h"
#include "config-list.h"
#include "help.h"
#include "alias.h"
@@ -34,32 +33,52 @@
HELP_FORMAT_WEB
};
-static const char *html_path;
+enum show_config_type {
+ SHOW_CONFIG_HUMAN,
+ SHOW_CONFIG_VARS,
+ SHOW_CONFIG_SECTIONS,
+};
-static int show_all = 0;
-static int show_guides = 0;
-static int show_config;
+static enum help_action {
+ HELP_ACTION_ALL = 1,
+ HELP_ACTION_GUIDES,
+ HELP_ACTION_CONFIG,
+ HELP_ACTION_CONFIG_FOR_COMPLETION,
+ HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION,
+} cmd_mode;
+
+static const char *html_path;
static int verbose = 1;
-static unsigned int colopts;
static enum help_format help_format = HELP_FORMAT_NONE;
static int exclude_guides;
static struct option builtin_help_options[] = {
- OPT_BOOL('a', "all", &show_all, N_("print all available commands")),
+ OPT_CMDMODE('a', "all", &cmd_mode, N_("print all available commands"),
+ HELP_ACTION_ALL),
OPT_HIDDEN_BOOL(0, "exclude-guides", &exclude_guides, N_("exclude guides")),
- OPT_BOOL('g', "guides", &show_guides, N_("print list of useful guides")),
- OPT_BOOL('c', "config", &show_config, N_("print all configuration variable names")),
- OPT_SET_INT_F(0, "config-for-completion", &show_config, "", 2, PARSE_OPT_HIDDEN),
OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN),
OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"),
HELP_FORMAT_WEB),
OPT_SET_INT('i', "info", &help_format, N_("show info page"),
HELP_FORMAT_INFO),
OPT__VERBOSE(&verbose, N_("print command description")),
+
+ OPT_CMDMODE('g', "guides", &cmd_mode, N_("print list of useful guides"),
+ HELP_ACTION_GUIDES),
+ OPT_CMDMODE('c', "config", &cmd_mode, N_("print all configuration variable names"),
+ HELP_ACTION_CONFIG),
+ OPT_CMDMODE_F(0, "config-for-completion", &cmd_mode, "",
+ HELP_ACTION_CONFIG_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+ OPT_CMDMODE_F(0, "config-sections-for-completion", &cmd_mode, "",
+ HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+
OPT_END(),
};
static const char * const builtin_help_usage[] = {
- N_("git help [--all] [--guides] [--man | --web | --info] [<command>]"),
+ N_("git help [-a|--all] [--[no-]verbose]]\n"
+ " [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
+ N_("git help [-g|--guides]"),
+ N_("git help [-c|--config]"),
NULL
};
@@ -70,7 +89,7 @@
int found;
};
-static void list_config_help(int for_human)
+static void list_config_help(enum show_config_type type)
{
struct slot_expansion slot_expansions[] = {
{ "advice", "*", list_config_advices },
@@ -88,6 +107,8 @@
const char **p;
struct slot_expansion *e;
struct string_list keys = STRING_LIST_INIT_DUP;
+ struct string_list keys_uniq = STRING_LIST_INIT_DUP;
+ struct string_list_item *item;
int i;
for (p = config_name_list; *p; p++) {
@@ -118,34 +139,46 @@
for (i = 0; i < keys.nr; i++) {
const char *var = keys.items[i].string;
const char *wildcard, *tag, *cut;
+ const char *dot = NULL;
+ struct strbuf sb = STRBUF_INIT;
- if (for_human) {
+ switch (type) {
+ case SHOW_CONFIG_HUMAN:
puts(var);
continue;
+ case SHOW_CONFIG_SECTIONS:
+ dot = strchr(var, '.');
+ break;
+ case SHOW_CONFIG_VARS:
+ break;
}
-
wildcard = strchr(var, '*');
tag = strchr(var, '<');
- if (!wildcard && !tag) {
- puts(var);
+ if (!dot && !wildcard && !tag) {
+ string_list_append(&keys_uniq, var);
continue;
}
- if (wildcard && !tag)
+ if (dot)
+ cut = dot;
+ else if (wildcard && !tag)
cut = wildcard;
else if (!wildcard && tag)
cut = tag;
else
cut = wildcard < tag ? wildcard : tag;
- /*
- * We may produce duplicates, but that's up to
- * git-completion.bash to handle
- */
- printf("%.*s\n", (int)(cut - var), var);
+ strbuf_add(&sb, var, cut - var);
+ string_list_append(&keys_uniq, sb.buf);
+ strbuf_release(&sb);
+
}
string_list_clear(&keys, 0);
+ string_list_remove_duplicates(&keys_uniq, 0);
+ for_each_string_list_item(item, &keys_uniq)
+ puts(item->string);
+ string_list_clear(&keys_uniq, 0);
}
static enum help_format parse_help_format(const char *format)
@@ -349,8 +382,6 @@
static int git_help_config(const char *var, const char *value, void *cb)
{
- if (starts_with(var, "column."))
- return git_column_config(var, value, "help", &colopts);
if (!strcmp(var, "help.format")) {
if (!value)
return config_error_nonbool(var);
@@ -467,11 +498,14 @@
if (!html_path)
html_path = to_free = system_path(GIT_HTML_PATH);
- /* Check that we have a git documentation directory. */
+ /*
+ * Check that the page we're looking for exists.
+ */
if (!strstr(html_path, "://")) {
- if (stat(mkpath("%s/git.html", html_path), &st)
+ if (stat(mkpath("%s/%s.html", html_path, page), &st)
|| !S_ISREG(st.st_mode))
- die("'%s': not a documentation directory.", html_path);
+ die("'%s/%s.html': documentation file not found.",
+ html_path, page);
}
strbuf_init(page_path, 0);
@@ -541,6 +575,13 @@
return cmd;
}
+static void no_extra_argc(int argc)
+{
+ if (argc)
+ usage_msg_opt(_("this option doesn't take any other arguments"),
+ builtin_help_usage, builtin_help_options);
+}
+
int cmd_help(int argc, const char **argv, const char *prefix)
{
int nongit;
@@ -551,8 +592,8 @@
builtin_help_usage, 0);
parsed_help_format = help_format;
- if (show_all) {
- git_config(git_help_config, NULL);
+ switch (cmd_mode) {
+ case HELP_ACTION_ALL:
if (verbose) {
setup_pager();
list_all_cmds_help();
@@ -560,30 +601,27 @@
}
printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
load_command_list("git-", &main_cmds, &other_cmds);
- list_commands(colopts, &main_cmds, &other_cmds);
- }
-
- if (show_config) {
- int for_human = show_config == 1;
-
- if (!for_human) {
- list_config_help(for_human);
- return 0;
- }
- setup_pager();
- list_config_help(for_human);
- printf("\n%s\n", _("'git help config' for more information"));
- return 0;
- }
-
- if (show_guides)
- list_guides_help();
-
- if (show_all || show_guides) {
+ list_commands(&main_cmds, &other_cmds);
printf("%s\n", _(git_more_info_string));
- /*
- * We're done. Ignore any remaining args
- */
+ break;
+ case HELP_ACTION_GUIDES:
+ no_extra_argc(argc);
+ list_guides_help();
+ printf("%s\n", _(git_more_info_string));
+ return 0;
+ case HELP_ACTION_CONFIG_FOR_COMPLETION:
+ no_extra_argc(argc);
+ list_config_help(SHOW_CONFIG_VARS);
+ return 0;
+ case HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION:
+ no_extra_argc(argc);
+ list_config_help(SHOW_CONFIG_SECTIONS);
+ return 0;
+ case HELP_ACTION_CONFIG:
+ no_extra_argc(argc);
+ setup_pager();
+ list_config_help(SHOW_CONFIG_HUMAN);
+ printf("\n%s\n", _("'git help config' for more information"));
return 0;
}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index f267dce..c23d01d 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -122,6 +122,7 @@
static int do_fsck_object;
static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES;
static int verbose;
+static const char *progress_title;
static int show_resolving_progress;
static int show_stat;
static int check_self_contained_and_connected;
@@ -187,9 +188,7 @@
pthread_key_create(&key, NULL);
CALLOC_ARRAY(thread_data, nr_threads);
for (i = 0; i < nr_threads; i++) {
- thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
- if (thread_data[i].pack_fd == -1)
- die_errno(_("unable to open %s"), curr_pack);
+ thread_data[i].pack_fd = xopen(curr_pack, O_RDONLY);
}
threads_active = 1;
@@ -1153,6 +1152,7 @@
if (verbose)
progress = start_progress(
+ progress_title ? progress_title :
from_stdin ? _("Receiving objects") : _("Indexing objects"),
nr_objects);
for (i = 0; i < nr_objects; i++) {
@@ -1415,7 +1415,7 @@
if (check_object_signature(the_repository, &d->oid,
data, size,
- type_name(type)))
+ type_name(type), NULL))
die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
/*
@@ -1486,7 +1486,7 @@
if (!*final_name)
*final_name = odb_pack_name(name, hash, ext);
if (finalize_object_file(curr_name, *final_name))
- die(_("unable to rename temporary '*.%s' file to '%s"),
+ die(_("unable to rename temporary '*.%s' file to '%s'"),
ext, *final_name);
} else if (make_read_only_if_same) {
chmod(*final_name, 0444);
@@ -1800,6 +1800,10 @@
input_len = sizeof(*hdr);
} else if (!strcmp(arg, "-v")) {
verbose = 1;
+ } else if (!strcmp(arg, "--progress-title")) {
+ if (progress_title || (i+1) >= argc)
+ usage(index_pack_usage);
+ progress_title = argv[++i];
} else if (!strcmp(arg, "--show-resolving-progress")) {
show_resolving_progress = 1;
} else if (!strcmp(arg, "--report-end-of-input")) {
diff --git a/builtin/log.c b/builtin/log.c
index 3d7717b..f75d87e 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -637,7 +637,7 @@
repo_init_revisions(the_repository, &rev, prefix);
rev.diff = 1;
rev.always_show_header = 1;
- rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
+ rev.no_walk = 1;
rev.diffopt.stat_width = -1; /* Scale to real terminal size */
memset(&opt, 0, sizeof(opt));
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 29a26ad..031fef1 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -209,10 +209,8 @@
struct dir_struct *dir, const char *path)
{
struct repository subrepo;
- const struct submodule *sub = submodule_from_path(superproject,
- null_oid(), path);
- if (repo_submodule_init(&subrepo, superproject, sub))
+ if (repo_submodule_init(&subrepo, superproject, path, null_oid()))
return;
if (repo_read_index(&subrepo) < 0)
@@ -614,7 +612,7 @@
struct option builtin_ls_files_options[] = {
/* Think twice before adding "--nul" synonym to this */
OPT_SET_INT('z', NULL, &line_terminator,
- N_("paths are separated with NUL character"), '\0'),
+ N_("separate paths with the NUL character"), '\0'),
OPT_BOOL('t', NULL, &show_tag,
N_("identify the file status with tags")),
OPT_BOOL('v', NULL, &show_valid_bit,
@@ -651,7 +649,7 @@
N_("skip files matching pattern"),
PARSE_OPT_NONEG, option_parse_exclude),
OPT_CALLBACK_F('X', "exclude-from", &dir, N_("file"),
- N_("exclude patterns are read from <file>"),
+ N_("read exclude patterns from <file>"),
PARSE_OPT_NONEG, option_parse_exclude_from),
OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
N_("read additional per-directory exclude patterns in <file>")),
@@ -674,6 +672,7 @@
N_("suppress duplicate entries")),
OPT_END()
};
+ int ret = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(ls_files_usage, builtin_ls_files_options);
@@ -777,16 +776,13 @@
if (show_resolve_undo)
show_ru_info(the_repository->index);
- if (ps_matched) {
- int bad;
- bad = report_path_error(ps_matched, &pathspec);
- if (bad)
- fprintf(stderr, "Did you forget to 'git add'?\n");
-
- return bad ? 1 : 0;
+ if (ps_matched && report_path_error(ps_matched, &pathspec)) {
+ fprintf(stderr, "Did you forget to 'git add'?\n");
+ ret = 1;
}
+ string_list_clear(&exclude_list, 0);
dir_clear(&dir);
free(max_prefix);
- return 0;
+ return ret;
}
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index f4fd823..318949c 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -7,8 +7,8 @@
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>...]]"),
+ " [-q | --quiet] [--exit-code] [--get-url]\n"
+ " [--symref] [<repository> [<refs>...]]"),
NULL
};
diff --git a/builtin/merge.c b/builtin/merge.c
index 8949a9c..ea3112e 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -13,6 +13,7 @@
#include "builtin.h"
#include "lockfile.h"
#include "run-command.h"
+#include "hook.h"
#include "diff.h"
#include "diff-merges.h"
#include "refs.h"
@@ -88,9 +89,9 @@
static int no_verify;
static struct strategy all_strategy[] = {
- { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
+ { "recursive", NO_TRIVIAL },
{ "octopus", DEFAULT_OCTOPUS },
- { "ort", NO_TRIVIAL },
+ { "ort", DEFAULT_TWOHEAD | NO_TRIVIAL },
{ "resolve", 0 },
{ "ours", NO_FAST_FORWARD | NO_TRIVIAL },
{ "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
@@ -469,7 +470,6 @@
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
- close_object_store(the_repository->objects);
run_auto_maintenance(verbosity < 0);
}
}
@@ -681,6 +681,7 @@
opts.verbose_update = 1;
opts.trivial_merges_only = 1;
opts.merge = 1;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
trees[nr_trees] = parse_tree_indirect(common);
if (!trees[nr_trees++])
return -1;
@@ -849,7 +850,7 @@
* and write it out as a tree. We must do this before we invoke
* the editor and after we invoke run_status above.
*/
- if (find_hook("pre-merge-commit"))
+ if (hook_exists("pre-merge-commit"))
discard_cache();
read_cache_from(index_file);
strbuf_addbuf(&msg, &merge_msg);
@@ -1276,6 +1277,9 @@
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(builtin_merge_usage, builtin_merge_options);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
/*
* Check if we are _not_ on a detached HEAD, i.e. if there is a
* current branch.
@@ -1368,14 +1372,14 @@
* There is no unmerged entry, don't advise 'git
* add/rm <file>', just 'git commit'.
*/
- if (advice_resolve_conflict)
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."));
else
die(_("You have not concluded your merge (MERGE_HEAD exists)."));
}
if (ref_exists("CHERRY_PICK_HEAD")) {
- if (advice_resolve_conflict)
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."));
else
@@ -1485,6 +1489,12 @@
fast_forward = FF_NO;
}
+ if (!use_strategies && !pull_twohead &&
+ remoteheads && !remoteheads->next) {
+ char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
+ if (default_strategy)
+ append_strategy(get_strategy(default_strategy));
+ }
if (!use_strategies) {
if (!remoteheads)
; /* already up-to-date */
@@ -1568,6 +1578,7 @@
finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
remove_merge_branch_state(the_repository);
+ strbuf_release(&msg);
goto done;
} else if (!remoteheads->next && common->next)
;
@@ -1738,6 +1749,7 @@
ret = suggest_conflicts();
done:
+ strbuf_release(&buf);
free(branch_to_free);
return ret;
}
diff --git a/builtin/mktag.c b/builtin/mktag.c
index dddcccd..3b2dbbb 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -62,7 +62,8 @@
repl = lookup_replace_object(the_repository, tagged_oid);
ret = check_object_signature(the_repository, repl,
- buffer, size, type_name(*tagged_type));
+ buffer, size, type_name(*tagged_type),
+ NULL);
free(buffer);
return ret;
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 8ff0dee..075d15d 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -7,7 +7,8 @@
#include "object-store.h"
#define BUILTIN_MIDX_WRITE_USAGE \
- N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]")
+ N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \
+ "[--refs-snapshot=<path>]")
#define BUILTIN_MIDX_VERIFY_USAGE \
N_("git multi-pack-index [<options>] verify")
@@ -45,14 +46,15 @@
static struct opts_multi_pack_index {
const char *object_dir;
const char *preferred_pack;
+ const char *refs_snapshot;
unsigned long batch_size;
unsigned flags;
+ int stdin_packs;
} opts;
static struct option common_opts[] = {
OPT_FILENAME(0, "object-dir", &opts.object_dir,
N_("object directory containing set of packfile and pack-index pairs")),
- OPT_BIT(0, "progress", &opts.flags, N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(),
};
@@ -61,6 +63,33 @@
return parse_options_concat(common_opts, prev);
}
+static int git_multi_pack_index_write_config(const char *var, const char *value,
+ void *cb)
+{
+ if (!strcmp(var, "pack.writebitmaphashcache")) {
+ if (git_config_bool(var, value))
+ opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
+ else
+ opts.flags &= ~MIDX_WRITE_BITMAP_HASH_CACHE;
+ }
+
+ /*
+ * We should never make a fall-back call to 'git_default_config', since
+ * this was already called in 'cmd_multi_pack_index()'.
+ */
+ return 0;
+}
+
+static void read_packs_from_stdin(struct string_list *to)
+{
+ struct strbuf buf = STRBUF_INIT;
+ while (strbuf_getline(&buf, stdin) != EOF)
+ string_list_append(to, buf.buf);
+ string_list_sort(to);
+
+ strbuf_release(&buf);
+}
+
static int cmd_multi_pack_index_write(int argc, const char **argv)
{
struct option *options;
@@ -68,13 +97,27 @@
OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
N_("preferred-pack"),
N_("pack for reuse when computing a multi-pack bitmap")),
+ OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
+ MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
+ OPT_BIT(0, "progress", &opts.flags,
+ N_("force progress reporting"), MIDX_PROGRESS),
+ OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
+ N_("write multi-pack index containing only given indexes")),
+ OPT_FILENAME(0, "refs-snapshot", &opts.refs_snapshot,
+ N_("refs snapshot for selecting bitmap commits")),
OPT_END(),
};
+ opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
+
+ git_config(git_multi_pack_index_write_config, NULL);
+
options = add_common_options(builtin_multi_pack_index_write_options);
trace2_cmd_mode(argv[0]);
+ if (isatty(2))
+ opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_write_usage,
PARSE_OPT_KEEP_UNKNOWN);
@@ -84,16 +127,39 @@
FREE_AND_NULL(options);
+ if (opts.stdin_packs) {
+ struct string_list packs = STRING_LIST_INIT_DUP;
+ int ret;
+
+ read_packs_from_stdin(&packs);
+
+ ret = write_midx_file_only(opts.object_dir, &packs,
+ opts.preferred_pack,
+ opts.refs_snapshot, opts.flags);
+
+ string_list_clear(&packs, 0);
+
+ return ret;
+
+ }
return write_midx_file(opts.object_dir, opts.preferred_pack,
- opts.flags);
+ opts.refs_snapshot, opts.flags);
}
static int cmd_multi_pack_index_verify(int argc, const char **argv)
{
- struct option *options = common_opts;
+ struct option *options;
+ static struct option builtin_multi_pack_index_verify_options[] = {
+ OPT_BIT(0, "progress", &opts.flags,
+ N_("force progress reporting"), MIDX_PROGRESS),
+ OPT_END(),
+ };
+ options = add_common_options(builtin_multi_pack_index_verify_options);
trace2_cmd_mode(argv[0]);
+ if (isatty(2))
+ opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_verify_usage,
PARSE_OPT_KEEP_UNKNOWN);
@@ -106,10 +172,18 @@
static int cmd_multi_pack_index_expire(int argc, const char **argv)
{
- struct option *options = common_opts;
+ struct option *options;
+ static struct option builtin_multi_pack_index_expire_options[] = {
+ OPT_BIT(0, "progress", &opts.flags,
+ N_("force progress reporting"), MIDX_PROGRESS),
+ OPT_END(),
+ };
+ options = add_common_options(builtin_multi_pack_index_expire_options);
trace2_cmd_mode(argv[0]);
+ if (isatty(2))
+ opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL,
options, builtin_multi_pack_index_expire_usage,
PARSE_OPT_KEEP_UNKNOWN);
@@ -126,6 +200,8 @@
static struct option builtin_multi_pack_index_repack_options[] = {
OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
+ OPT_BIT(0, "progress", &opts.flags,
+ N_("force progress reporting"), MIDX_PROGRESS),
OPT_END(),
};
@@ -133,6 +209,8 @@
trace2_cmd_mode(argv[0]);
+ if (isatty(2))
+ opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, NULL,
options,
builtin_multi_pack_index_repack_usage,
@@ -154,8 +232,6 @@
git_config(git_default_config, NULL);
- if (isatty(2))
- opts.flags |= MIDX_PROGRESS;
argc = parse_options(argc, argv, prefix,
builtin_multi_pack_index_options,
builtin_multi_pack_index_usage,
@@ -164,7 +240,7 @@
if (!opts.object_dir)
opts.object_dir = get_object_directory();
- if (argc == 0)
+ if (!argc)
goto usage;
if (!strcmp(argv[0], "repack"))
@@ -175,10 +251,9 @@
return cmd_multi_pack_index_verify(argc, argv);
else if (!strcmp(argv[0], "expire"))
return cmd_multi_pack_index_expire(argc, argv);
- else {
- error(_("unrecognized subcommand: %s"), argv[0]);
+
+ error(_("unrecognized subcommand: %s"), argv[0]);
usage:
- usage_with_options(builtin_multi_pack_index_usage,
- builtin_multi_pack_index_options);
- }
+ usage_with_options(builtin_multi_pack_index_usage,
+ builtin_multi_pack_index_options);
}
diff --git a/builtin/mv.c b/builtin/mv.c
index c2f96c8..83a465b 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -118,21 +118,23 @@
int cmd_mv(int argc, const char **argv, const char *prefix)
{
int i, flags, gitmodules_modified = 0;
- int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
+ int verbose = 0, show_only = 0, force = 0, ignore_errors = 0, ignore_sparse = 0;
struct option builtin_mv_options[] = {
OPT__VERBOSE(&verbose, N_("be verbose")),
OPT__DRY_RUN(&show_only, N_("dry run")),
OPT__FORCE(&force, N_("force move/rename even if target exists"),
PARSE_OPT_NOCOMPLETE),
OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
+ OPT_BOOL(0, "sparse", &ignore_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_END(),
};
const char **source, **destination, **dest_path, **submodule_gitfile;
- enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
+ enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX, SPARSE } *modes;
struct stat st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce;
+ struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
git_config(git_default_config, NULL);
@@ -176,14 +178,17 @@
const char *src = source[i], *dst = destination[i];
int length, src_is_dir;
const char *bad = NULL;
+ int skip_sparse = 0;
if (show_only)
printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
length = strlen(src);
- if (lstat(src, &st) < 0)
- bad = _("bad source");
- else if (!strncmp(src, dst, length) &&
+ if (lstat(src, &st) < 0) {
+ /* only error if existence is expected. */
+ if (modes[i] != SPARSE)
+ bad = _("bad source");
+ } else if (!strncmp(src, dst, length) &&
(dst[length] == 0 || dst[length] == '/')) {
bad = _("can not move directory into itself");
} else if ((src_is_dir = S_ISDIR(st.st_mode))
@@ -212,11 +217,12 @@
dst_len = strlen(dst);
for (j = 0; j < last - first; j++) {
- const char *path = active_cache[first + j]->name;
+ const struct cache_entry *ce = active_cache[first + j];
+ const char *path = ce->name;
source[argc + j] = path;
destination[argc + j] =
prefix_path(dst, dst_len, path + length + 1);
- modes[argc + j] = INDEX;
+ modes[argc + j] = ce_skip_worktree(ce) ? SPARSE : INDEX;
submodule_gitfile[argc + j] = NULL;
}
argc += last - first;
@@ -244,14 +250,36 @@
bad = _("multiple sources for the same target");
else if (is_dir_sep(dst[strlen(dst) - 1]))
bad = _("destination directory does not exist");
- else
+ else {
+ /*
+ * We check if the paths are in the sparse-checkout
+ * definition as a very final check, since that
+ * allows us to point the user to the --sparse
+ * option as a way to have a successful run.
+ */
+ if (!ignore_sparse &&
+ !path_in_sparse_checkout(src, &the_index)) {
+ string_list_append(&only_match_skip_worktree, src);
+ skip_sparse = 1;
+ }
+ if (!ignore_sparse &&
+ !path_in_sparse_checkout(dst, &the_index)) {
+ string_list_append(&only_match_skip_worktree, dst);
+ skip_sparse = 1;
+ }
+
+ if (skip_sparse)
+ goto remove_entry;
+
string_list_insert(&src_for_dst, dst);
+ }
if (!bad)
continue;
if (!ignore_errors)
die(_("%s, source=%s, destination=%s"),
bad, src, dst);
+remove_entry:
if (--argc > 0) {
int n = argc - i;
memmove(source + i, source + i + 1,
@@ -266,6 +294,12 @@
}
}
+ if (only_match_skip_worktree.nr) {
+ advise_on_updating_sparse_paths(&only_match_skip_worktree);
+ if (!ignore_errors)
+ return 1;
+ }
+
for (i = 0; i < argc; i++) {
const char *src = source[i], *dst = destination[i];
enum update_mode mode = modes[i];
@@ -274,7 +308,7 @@
printf(_("Renaming %s to %s\n"), src, dst);
if (show_only)
continue;
- if (mode != INDEX && rename(src, dst) < 0) {
+ if (mode != INDEX && mode != SPARSE && rename(src, dst) < 0) {
if (ignore_errors)
continue;
die_errno(_("renaming '%s' failed"), src);
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a01767a..1a3dd44 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1124,6 +1124,11 @@
break;
offset += ewah_bit_ctz64(word >> offset);
+ /*
+ * Can use bit positions directly, even for MIDX
+ * bitmaps. See comment in try_partial_reuse()
+ * for why.
+ */
write_reused_pack_one(pos + offset, f, &w_curs);
display_progress(progress_state, ++written);
}
@@ -1259,7 +1264,8 @@
bitmap_writer_show_progress(progress);
bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
- bitmap_writer_build(&to_pack);
+ if (bitmap_writer_build(&to_pack) < 0)
+ die(_("failed to write bitmap index"));
bitmap_writer_finish(written_list, nr_written,
tmpname.buf, write_bitmap_options);
write_bitmap_index = 0;
@@ -3412,13 +3418,9 @@
}
}
-/* Remember to update object flag allocation in object.h */
-#define OBJECT_ADDED (1u<<20)
-
static void show_commit(struct commit *commit, void *data)
{
add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
- commit->object.flags |= OBJECT_ADDED;
if (write_bitmap_index)
index_commit_for_bitmap(commit);
@@ -3431,7 +3433,6 @@
{
add_preferred_base_object(name);
add_object_entry(&obj->oid, obj->type, name, 0);
- obj->flags |= OBJECT_ADDED;
if (use_delta_islands) {
const char *p;
@@ -3512,79 +3513,23 @@
add_preferred_base(&commit->object.oid);
}
-struct in_pack_object {
- off_t offset;
- struct object *object;
-};
-
-struct in_pack {
- unsigned int alloc;
- unsigned int nr;
- struct in_pack_object *array;
-};
-
-static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
+static int add_object_in_unpacked_pack(const struct object_id *oid,
+ struct packed_git *pack,
+ uint32_t pos,
+ void *_data)
{
- in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
- in_pack->array[in_pack->nr].object = object;
- in_pack->nr++;
-}
-
-/*
- * Compare the objects in the offset order, in order to emulate the
- * "git rev-list --objects" output that produced the pack originally.
- */
-static int ofscmp(const void *a_, const void *b_)
-{
- struct in_pack_object *a = (struct in_pack_object *)a_;
- struct in_pack_object *b = (struct in_pack_object *)b_;
-
- if (a->offset < b->offset)
- return -1;
- else if (a->offset > b->offset)
- return 1;
- else
- return oidcmp(&a->object->oid, &b->object->oid);
+ add_object_entry(oid, OBJ_NONE, "", 0);
+ return 0;
}
static void add_objects_in_unpacked_packs(void)
{
- struct packed_git *p;
- struct in_pack in_pack;
- uint32_t i;
-
- memset(&in_pack, 0, sizeof(in_pack));
-
- for (p = get_all_packs(the_repository); p; p = p->next) {
- struct object_id oid;
- struct object *o;
-
- if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
- continue;
- if (open_pack_index(p))
- die(_("cannot open pack index"));
-
- ALLOC_GROW(in_pack.array,
- in_pack.nr + p->num_objects,
- in_pack.alloc);
-
- for (i = 0; i < p->num_objects; i++) {
- nth_packed_object_id(&oid, p, i);
- o = lookup_unknown_object(the_repository, &oid);
- if (!(o->flags & OBJECT_ADDED))
- mark_in_pack_object(o, p, &in_pack);
- o->flags |= OBJECT_ADDED;
- }
- }
-
- if (in_pack.nr) {
- QSORT(in_pack.array, in_pack.nr, ofscmp);
- for (i = 0; i < in_pack.nr; i++) {
- struct object *o = in_pack.array[i].object;
- add_object_entry(&o->oid, o->type, "", 0);
- }
- }
- free(in_pack.array);
+ if (for_each_packed_object(add_object_in_unpacked_pack, NULL,
+ FOR_EACH_OBJECT_PACK_ORDER |
+ FOR_EACH_OBJECT_LOCAL_ONLY |
+ FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
+ FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
+ die(_("cannot open pack index"));
}
static int add_loose_object(const struct object_id *oid, const char *path,
diff --git a/builtin/prune.c b/builtin/prune.c
index 02c6ab7..485c9a3 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -143,7 +143,6 @@
expire = TIME_MAX;
save_commit_buffer = 0;
read_replace_refs = 0;
- ref_paranoia = 1;
repo_init_revisions(the_repository, &revs, prefix);
argc = parse_options(argc, argv, prefix, options, prune_usage, 0);
diff --git a/builtin/pull.c b/builtin/pull.c
index b311ea6..1cfaf9f 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -26,13 +26,13 @@
#include "wt-status.h"
#include "commit-reach.h"
#include "sequencer.h"
+#include "packfile.h"
/**
* Parses the value of --rebase. If value is a false value, returns
* REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
- * "merges", returns REBASE_MERGES. If value is "preserve", returns
- * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
- * fatal is true, otherwise returns REBASE_INVALID.
+ * "merges", returns REBASE_MERGES. If value is a invalid value, dies with
+ * a fatal error if fatal is true, otherwise returns REBASE_INVALID.
*/
static enum rebase_type parse_config_rebase(const char *key, const char *value,
int fatal)
@@ -84,6 +84,7 @@
static char *cleanup_arg;
static char *opt_ff;
static char *opt_verify_signatures;
+static char *opt_verify;
static int opt_autostash = -1;
static int config_autostash;
static int check_trust_level = 1;
@@ -126,7 +127,7 @@
/* Options passed to git-merge or git-rebase */
OPT_GROUP(N_("Options related to merging")),
OPT_CALLBACK_F('r', "rebase", &opt_rebase,
- "(false|true|merges|preserve|interactive)",
+ "(false|true|merges|interactive)",
N_("incorporate changes by rebasing rather than merging"),
PARSE_OPT_OPTARG, parse_opt_rebase),
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
@@ -160,6 +161,9 @@
OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
N_("abort if fast-forward is not possible"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+ OPT_PASSTHRU(0, "verify", &opt_verify, NULL,
+ N_("control use of pre-merge-commit and commit-msg hooks"),
+ PARSE_OPT_NOARG),
OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
N_("verify that the named commit has a valid GPG signature"),
PARSE_OPT_NOARG),
@@ -577,7 +581,7 @@
strvec_pushv(&args, refspecs);
} else if (*refspecs)
BUG("refspecs without repo?");
- ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+ ret = run_command_v_opt(args.v, RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE);
strvec_clear(&args);
return ret;
}
@@ -675,6 +679,8 @@
strvec_pushf(&args, "--cleanup=%s", cleanup_arg);
if (opt_ff)
strvec_push(&args, opt_ff);
+ if (opt_verify)
+ strvec_push(&args, opt_verify);
if (opt_verify_signatures)
strvec_push(&args, opt_verify_signatures);
strvec_pushv(&args, opt_strategies.v);
@@ -883,8 +889,6 @@
/* Options passed to git-rebase */
if (opt_rebase == REBASE_MERGES)
strvec_push(&args, "--rebase-merges");
- else if (opt_rebase == REBASE_PRESERVE)
- strvec_push(&args, "--preserve-merges");
else if (opt_rebase == REBASE_INTERACTIVE)
strvec_push(&args, "--interactive");
if (opt_diffstat)
@@ -933,6 +937,33 @@
return ret;
}
+/*
+ * Is orig_head a descendant of _all_ merge_heads?
+ * Unfortunately is_descendant_of() cannot be used as it asks
+ * if orig_head is a descendant of at least one of them.
+ */
+static int already_up_to_date(struct object_id *orig_head,
+ struct oid_array *merge_heads)
+{
+ int i;
+ struct commit *ours;
+
+ ours = lookup_commit_reference(the_repository, orig_head);
+ for (i = 0; i < merge_heads->nr; i++) {
+ struct commit_list *list = NULL;
+ struct commit *theirs;
+ int ok;
+
+ theirs = lookup_commit_reference(the_repository, &merge_heads->oid[i]);
+ commit_list_insert(theirs, &list);
+ ok = repo_is_descendant_of(the_repository, ours, list);
+ free_commit_list(list);
+ if (!ok)
+ return 0;
+ }
+ return 1;
+}
+
static void show_advice_pull_non_ff(void)
{
advise(_("You have divergent branches and need to specify how to reconcile them.\n"
@@ -957,6 +988,7 @@
struct object_id rebase_fork_point;
int rebase_unspecified = 0;
int can_ff;
+ int divergent;
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);
@@ -1071,15 +1103,16 @@
}
can_ff = get_can_ff(&orig_head, &merge_heads);
+ divergent = !can_ff && !already_up_to_date(&orig_head, &merge_heads);
/* ff-only takes precedence over rebase */
if (opt_ff && !strcmp(opt_ff, "--ff-only")) {
- if (!can_ff)
+ if (divergent)
die_ff_impossible();
opt_rebase = REBASE_FALSE;
}
/* If no action specified and we can't fast forward, then warn. */
- if (!opt_ff && rebase_unspecified && !can_ff) {
+ if (!opt_ff && rebase_unspecified && divergent) {
show_advice_pull_non_ff();
die(_("Need to specify how to reconcile divergent branches."));
}
diff --git a/builtin/push.c b/builtin/push.c
index e8b10a9..4b026ce 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -289,42 +289,42 @@
static void advise_pull_before_push(void)
{
- if (!advice_push_non_ff_current || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_NON_FF_CURRENT) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_pull_before_push));
}
static void advise_checkout_pull_push(void)
{
- if (!advice_push_non_ff_matching || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_NON_FF_MATCHING) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_checkout_pull_push));
}
static void advise_ref_already_exists(void)
{
- if (!advice_push_already_exists || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_ALREADY_EXISTS) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_ref_already_exists));
}
static void advise_ref_fetch_first(void)
{
- if (!advice_push_fetch_first || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_FETCH_FIRST) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_ref_fetch_first));
}
static void advise_ref_needs_force(void)
{
- if (!advice_push_needs_force || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_NEEDS_FORCE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_ref_needs_force));
}
static void advise_ref_needs_update(void)
{
- if (!advice_push_ref_needs_update || !advice_push_update_rejected)
+ if (!advice_enabled(ADVICE_PUSH_REF_NEEDS_UPDATE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
return;
advise(_(message_advice_ref_needs_update));
}
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 485e7b0..2109c4c 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -38,7 +38,7 @@
}
static const char * const read_tree_usage[] = {
- N_("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>]])"),
+ N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
NULL
};
@@ -53,24 +53,16 @@
static int exclude_per_directory_cb(const struct option *opt, const char *arg,
int unset)
{
- struct dir_struct *dir;
struct unpack_trees_options *opts;
BUG_ON_OPT_NEG(unset);
opts = (struct unpack_trees_options *)opt->value;
- if (opts->dir)
- die("more than one --exclude-per-directory given.");
-
- dir = xcalloc(1, sizeof(*opts->dir));
- dir->flags |= DIR_SHOW_IGNORED;
- dir->exclude_per_dir = arg;
- opts->dir = dir;
- /* We do not need to nor want to do read-directory
- * here; we are merely interested in reusing the
- * per directory ignore stack mechanism.
- */
+ if (!opts->update)
+ die("--exclude-per-directory is meaningless unless -u");
+ if (strcmp(arg, ".gitignore"))
+ die("--exclude-per-directory argument must be .gitignore");
return 0;
}
@@ -174,6 +166,9 @@
if (1 < opts.merge + opts.reset + prefix_set)
die("Which one? -m, --reset, or --prefix?");
+ if (opts.reset)
+ opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+
/*
* NEEDSWORK
*
@@ -209,8 +204,9 @@
if ((opts.update || opts.index_only) && !opts.merge)
die("%s is meaningless without -m, --reset, or --prefix",
opts.update ? "-u" : "-i");
- if ((opts.dir && !opts.update))
- die("--exclude-per-directory is meaningless unless -u");
+ if (opts.update && !opts.reset)
+ opts.preserve_ignored = 0;
+ /* otherwise, opts.preserve_ignored is irrelevant */
if (opts.merge && !opts.index_only)
setup_work_tree();
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 66a0a0f..34b4744 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -48,8 +48,7 @@
enum rebase_type {
REBASE_UNSPECIFIED = -1,
REBASE_APPLY,
- REBASE_MERGE,
- REBASE_PRESERVE_MERGES
+ REBASE_MERGE
};
enum empty_type {
@@ -163,12 +162,7 @@
ACTION_ABORT,
ACTION_QUIT,
ACTION_EDIT_TODO,
- ACTION_SHOW_CURRENT_PATCH,
- ACTION_SHORTEN_OIDS,
- ACTION_EXPAND_OIDS,
- ACTION_CHECK_TODO_LIST,
- ACTION_REARRANGE_SQUASH,
- ACTION_ADD_EXEC
+ ACTION_SHOW_CURRENT_PATCH
};
static const char *action_names[] = { "undefined",
@@ -179,81 +173,6 @@
"edit_todo",
"show_current_patch" };
-static int add_exec_commands(struct string_list *commands)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
-
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- todo_list_add_exec_commands(&todo_list, commands);
- res = todo_list_write_to_file(the_repository, &todo_list,
- todo_file, NULL, NULL, -1, 0);
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
-static int rearrange_squash_in_todo_file(void)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res = 0;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- res = todo_list_rearrange_squash(&todo_list);
- if (!res)
- res = todo_list_write_to_file(the_repository, &todo_list,
- todo_file, NULL, NULL, -1, 0);
-
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
-static int transform_todo_file(unsigned flags)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- int res;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
-
- if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
- &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
- NULL, NULL, -1, flags);
- todo_list_release(&todo_list);
-
- if (res)
- return error_errno(_("could not write '%s'."), todo_file);
- return 0;
-}
-
static int edit_todo_file(unsigned flags)
{
const char *todo_file = rebase_path_todo();
@@ -403,8 +322,8 @@
flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
- flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0;
+ flags |= opts->flags & REBASE_NO_QUIET ? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS : 0;
switch (command) {
case ACTION_NONE: {
@@ -438,24 +357,6 @@
break;
}
- case ACTION_SHORTEN_OIDS:
- case ACTION_EXPAND_OIDS:
- ret = transform_todo_file(flags);
- break;
- case ACTION_CHECK_TODO_LIST:
- ret = check_todo_list_from_file(the_repository);
- break;
- case ACTION_REARRANGE_SQUASH:
- ret = rearrange_squash_in_todo_file();
- break;
- case ACTION_ADD_EXEC: {
- struct string_list commands = STRING_LIST_INIT_DUP;
-
- split_exec_commands(opts->cmd, &commands);
- ret = add_exec_commands(&commands);
- string_list_clear(&commands, 0);
- break;
- }
default:
BUG("invalid command '%d'", command);
}
@@ -477,102 +378,9 @@
return 0;
}
-static const char * const builtin_rebase_interactive_usage[] = {
- N_("git rebase--interactive [<options>]"),
- NULL
-};
-
-int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
-{
- struct rebase_options opts = REBASE_OPTIONS_INIT;
- struct object_id squash_onto = *null_oid();
- enum action command = ACTION_NONE;
- struct option options[] = {
- OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
- REBASE_FORCE),
- OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
- N_("keep commits which start empty"),
- PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
- parse_opt_keep_empty),
- OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
- N_("allow commits with empty messages"),
- PARSE_OPT_HIDDEN),
- OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
- OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
- N_("keep original branch points of cousins")),
- OPT_BOOL(0, "autosquash", &opts.autosquash,
- N_("move commits that begin with squash!/fixup!")),
- OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
- OPT_BIT('v', "verbose", &opts.flags,
- N_("display a diffstat of what changed upstream"),
- REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
- OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
- ACTION_CONTINUE),
- OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
- OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
- ACTION_EDIT_TODO),
- OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
- ACTION_SHOW_CURRENT_PATCH),
- OPT_CMDMODE(0, "shorten-ids", &command,
- N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
- OPT_CMDMODE(0, "expand-ids", &command,
- N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
- OPT_CMDMODE(0, "check-todo-list", &command,
- N_("check the todo list"), ACTION_CHECK_TODO_LIST),
- OPT_CMDMODE(0, "rearrange-squash", &command,
- N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
- OPT_CMDMODE(0, "add-exec-commands", &command,
- N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
- { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
- PARSE_OPT_NONEG, parse_opt_commit, 0 },
- { OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
- N_("restrict-revision"), N_("restrict revision"),
- PARSE_OPT_NONEG, parse_opt_commit, 0 },
- { OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
- N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
- { OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
- N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
- 0 },
- OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
- { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
- N_("GPG-sign commits"),
- PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
- OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
- N_("rebase strategy")),
- OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
- N_("strategy options")),
- OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
- N_("the branch or commit to checkout")),
- OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
- OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
- OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
- OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
- N_("automatically re-schedule any `exec` that fails")),
- OPT_END()
- };
-
- opts.rebase_cousins = -1;
-
- if (argc == 1)
- usage_with_options(builtin_rebase_interactive_usage, options);
-
- argc = parse_options(argc, argv, prefix, options,
- builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
-
- if (!is_null_oid(&squash_onto))
- opts.squash_onto = &squash_onto;
-
- if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
- warning(_("--[no-]rebase-cousins has no effect without "
- "--rebase-merges"));
-
- return !!run_sequencer_rebase(&opts, command);
-}
-
static int is_merge(struct rebase_options *opts)
{
- return opts->type == REBASE_MERGE ||
- opts->type == REBASE_PRESERVE_MERGES;
+ return opts->type == REBASE_MERGE;
}
static void imply_merge(struct rebase_options *opts, const char *option)
@@ -582,7 +390,6 @@
die(_("%s requires the merge backend"), option);
break;
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
break;
default:
opts->type = REBASE_MERGE; /* implied */
@@ -740,7 +547,6 @@
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
unlink(git_path_auto_merge(the_repository));
apply_autostash(state_dir_path("autostash", opts));
- close_object_store(the_repository->objects);
/*
* We ignore errors in 'git maintenance run --auto', since the
* user should see them.
@@ -762,28 +568,6 @@
return ret;
}
-static struct commit *peel_committish(const char *name)
-{
- struct object *obj;
- struct object_id oid;
-
- if (get_oid(name, &oid))
- return NULL;
- obj = parse_object(the_repository, &oid);
- return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
-}
-
-static void add_var(struct strbuf *buf, const char *name, const char *value)
-{
- if (!value)
- strbuf_addf(buf, "unset %s; ", name);
- else {
- strbuf_addf(buf, "%s=", name);
- sq_quote_buf(buf, value);
- strbuf_addstr(buf, "; ");
- }
-}
-
static int move_to_original_branch(struct rebase_options *opts)
{
struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
@@ -940,10 +724,7 @@
static int run_specific_rebase(struct rebase_options *opts, enum action action)
{
- const char *argv[] = { NULL, NULL };
- struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
int status;
- const char *backend, *backend_func;
if (opts->type == REBASE_MERGE) {
/* Run sequencer-based rebase */
@@ -960,87 +741,11 @@
}
status = run_sequencer_rebase(opts, action);
- goto finished_rebase;
- }
-
- if (opts->type == REBASE_APPLY) {
+ } else if (opts->type == REBASE_APPLY)
status = run_am(opts);
- goto finished_rebase;
- }
-
- add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
- add_var(&script_snippet, "state_dir", opts->state_dir);
-
- add_var(&script_snippet, "upstream_name", opts->upstream_name);
- add_var(&script_snippet, "upstream", opts->upstream ?
- oid_to_hex(&opts->upstream->object.oid) : NULL);
- add_var(&script_snippet, "head_name",
- opts->head_name ? opts->head_name : "detached HEAD");
- add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
- add_var(&script_snippet, "onto", opts->onto ?
- oid_to_hex(&opts->onto->object.oid) : NULL);
- add_var(&script_snippet, "onto_name", opts->onto_name);
- add_var(&script_snippet, "revisions", opts->revisions);
- add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
- oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
- sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
- add_var(&script_snippet, "git_am_opt", buf.buf);
- strbuf_release(&buf);
- add_var(&script_snippet, "verbose",
- opts->flags & REBASE_VERBOSE ? "t" : "");
- add_var(&script_snippet, "diffstat",
- opts->flags & REBASE_DIFFSTAT ? "t" : "");
- add_var(&script_snippet, "force_rebase",
- opts->flags & REBASE_FORCE ? "t" : "");
- if (opts->switch_to)
- add_var(&script_snippet, "switch_to", opts->switch_to);
- add_var(&script_snippet, "action", opts->action ? opts->action : "");
- add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
- add_var(&script_snippet, "allow_rerere_autoupdate",
- opts->allow_rerere_autoupdate ?
- opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
- "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
- add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
- add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
- add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
- add_var(&script_snippet, "cmd", opts->cmd);
- add_var(&script_snippet, "allow_empty_message",
- opts->allow_empty_message ? "--allow-empty-message" : "");
- add_var(&script_snippet, "rebase_merges",
- opts->rebase_merges ? "t" : "");
- add_var(&script_snippet, "rebase_cousins",
- opts->rebase_cousins ? "t" : "");
- add_var(&script_snippet, "strategy", opts->strategy);
- add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
- add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
- add_var(&script_snippet, "squash_onto",
- opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
- add_var(&script_snippet, "git_format_patch_opt",
- opts->git_format_patch_opt.buf);
-
- if (is_merge(opts) &&
- !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
- strbuf_addstr(&script_snippet,
- "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
- opts->autosquash = 0;
- }
-
- switch (opts->type) {
- case REBASE_PRESERVE_MERGES:
- backend = "git-rebase--preserve-merges";
- backend_func = "git_rebase__preserve_merges";
- break;
- default:
+ else
BUG("Unhandled rebase type %d", opts->type);
- break;
- }
- strbuf_addf(&script_snippet,
- ". git-sh-setup && . %s && %s", backend, backend_func);
- argv[0] = script_snippet.buf;
-
- status = run_command_v_opt(argv, RUN_USING_SHELL);
-finished_rebase:
if (opts->dont_finish_rebase)
; /* do nothing */
else if (opts->type == REBASE_MERGE)
@@ -1058,8 +763,6 @@
die("Nothing to do");
}
- strbuf_release(&script_snippet);
-
return status ? -1 : 0;
}
@@ -1195,7 +898,7 @@
return 0;
}
-/* -i followed by -p is still explicitly interactive, but -p alone is not */
+/* -i followed by -r is still explicitly interactive, but -r alone is not */
static int parse_opt_interactive(const struct option *opt, const char *arg,
int unset)
{
@@ -1313,6 +1016,7 @@
char *squash_onto_name = NULL;
int reschedule_failed_exec = -1;
int allow_preemptive_ff = 1;
+ int preserve_merges_selected = 0;
struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name,
N_("revision"),
@@ -1377,10 +1081,10 @@
N_("let the user edit the list of commits to rebase"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive),
- OPT_SET_INT_F('p', "preserve-merges", &options.type,
+ OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
N_("(DEPRECATED) try to recreate merges instead of "
"ignoring them"),
- REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
+ 1, PARSE_OPT_HIDDEN),
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
N_("how to handle commits that become empty"),
@@ -1430,6 +1134,9 @@
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
options.allow_empty_message = 1;
git_config(rebase_config, &options);
/* options.gpg_sign_opt will be either "-S" or NULL */
@@ -1448,8 +1155,7 @@
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/rewritten", merge_dir());
if (is_directory(buf.buf)) {
- options.type = REBASE_PRESERVE_MERGES;
- options.flags |= REBASE_INTERACTIVE_EXPLICIT;
+ die("`rebase -p` is no longer supported");
} else {
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir());
@@ -1470,6 +1176,9 @@
builtin_rebase_options,
builtin_rebase_usage, 0);
+ if (preserve_merges_selected)
+ die(_("--preserve-merges was replaced by --rebase-merges"));
+
if (action != ACTION_NONE && total_argc != 2) {
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
@@ -1479,10 +1188,6 @@
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
- if (options.type == REBASE_PRESERVE_MERGES)
- warning(_("git rebase --preserve-merges is deprecated. "
- "Use --rebase-merges instead."));
-
if (keep_base) {
if (options.onto_name)
die(_("cannot combine '--keep-base' with '--onto'"));
@@ -1574,7 +1279,7 @@
die(_("could not move back to %s"),
oid_to_hex(&options.orig_head));
remove_branch_state(the_repository, 0);
- ret = !!finish_rebase(&options);
+ ret = finish_rebase(&options);
goto cleanup;
}
case ACTION_QUIT: {
@@ -1583,11 +1288,11 @@
struct replay_opts replay = REPLAY_OPTS_INIT;
replay.action = REPLAY_INTERACTIVE_REBASE;
- ret = !!sequencer_remove_state(&replay);
+ ret = sequencer_remove_state(&replay);
} else {
strbuf_reset(&buf);
strbuf_addstr(&buf, options.state_dir);
- ret = !!remove_dir_recursively(&buf, 0);
+ ret = remove_dir_recursively(&buf, 0);
if (ret)
error(_("could not remove '%s'"),
options.state_dir);
@@ -1702,7 +1407,7 @@
if (options.ignore_date)
strvec_push(&options.git_am_opts, "--ignore-date");
} else {
- /* REBASE_MERGE and PRESERVE_MERGES */
+ /* REBASE_MERGE */
if (ignore_whitespace) {
string_list_append(&strategy_options,
"ignore-space-change");
@@ -1713,7 +1418,7 @@
int i;
if (!options.strategy)
- options.strategy = "recursive";
+ options.strategy = "ort";
strbuf_reset(&buf);
for (i = 0; i < strategy_options.nr; i++)
@@ -1728,7 +1433,6 @@
case REBASE_APPLY:
die(_("--strategy requires --merge or --interactive"));
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
/* compatible */
break;
case REBASE_UNSPECIFIED:
@@ -1780,7 +1484,6 @@
switch (options.type) {
case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
options.state_dir = merge_dir();
break;
case REBASE_APPLY:
@@ -1805,28 +1508,10 @@
options.reschedule_failed_exec = reschedule_failed_exec;
if (options.signoff) {
- if (options.type == REBASE_PRESERVE_MERGES)
- die("cannot combine '--signoff' with "
- "'--preserve-merges'");
strvec_push(&options.git_am_opts, "--signoff");
options.flags |= REBASE_FORCE;
}
- if (options.type == REBASE_PRESERVE_MERGES) {
- /*
- * Note: incompatibility with --signoff handled in signoff block above
- * Note: incompatibility with --interactive is just a strong warning;
- * git-rebase.txt caveats with "unless you know what you are doing"
- */
- if (options.rebase_merges)
- die(_("cannot combine '--preserve-merges' with "
- "'--rebase-merges'"));
-
- if (options.reschedule_failed_exec)
- die(_("error: cannot combine '--preserve-merges' with "
- "'--reschedule-failed-exec'"));
- }
-
if (!options.root) {
if (argc < 1) {
struct branch *branch;
@@ -1845,7 +1530,8 @@
if (!strcmp(options.upstream_name, "-"))
options.upstream_name = "@{-1}";
}
- options.upstream = peel_committish(options.upstream_name);
+ options.upstream =
+ lookup_commit_reference_by_name(options.upstream_name);
if (!options.upstream)
die(_("invalid upstream '%s'"), options.upstream_name);
options.upstream_arg = options.upstream_name;
@@ -1888,7 +1574,8 @@
options.onto = lookup_commit_or_die(&merge_base,
options.onto_name);
} else {
- options.onto = peel_committish(options.onto_name);
+ options.onto =
+ lookup_commit_reference_by_name(options.onto_name);
if (!options.onto)
die(_("Does not point to a valid commit '%s'"),
options.onto_name);
@@ -1913,13 +1600,15 @@
die_if_checked_out(buf.buf, 1);
options.head_name = xstrdup(buf.buf);
/* If not is it a valid ref (branch or commit)? */
- } else if (!get_oid(branch_name, &options.orig_head) &&
- lookup_commit_reference(the_repository,
- &options.orig_head))
+ } else {
+ struct commit *commit =
+ lookup_commit_reference_by_name(branch_name);
+ if (!commit)
+ die(_("no such branch/commit '%s'"),
+ branch_name);
+ oidcpy(&options.orig_head, &commit->object.oid);
options.head_name = NULL;
- else
- die(_("no such branch/commit '%s'"),
- branch_name);
+ }
} else if (argc == 0) {
/* Do not need to switch branches, we are already on it. */
options.head_name =
@@ -1959,7 +1648,7 @@
if (require_clean_work_tree(the_repository, "rebase",
_("Please commit or stash them."), 1, 1)) {
- ret = 1;
+ ret = -1;
goto cleanup;
}
@@ -1994,7 +1683,7 @@
RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, buf.buf,
DEFAULT_REFLOG_ACTION) < 0) {
- ret = !!error(_("could not switch to "
+ ret = error(_("could not switch to "
"%s"),
options.switch_to);
goto cleanup;
@@ -2009,7 +1698,7 @@
else
printf(_("Current branch %s is up to date.\n"),
branch_name);
- ret = !!finish_rebase(&options);
+ ret = finish_rebase(&options);
goto cleanup;
} else if (!(options.flags & REBASE_NO_QUIET))
; /* be quiet */
@@ -2087,7 +1776,7 @@
RESET_HEAD_REFS_ONLY, "HEAD", msg.buf,
DEFAULT_REFLOG_ACTION);
strbuf_release(&msg);
- ret = !!finish_rebase(&options);
+ ret = finish_rebase(&options);
goto cleanup;
}
@@ -2101,7 +1790,7 @@
options.revisions = revisions.buf;
run_rebase:
- ret = !!run_specific_rebase(&options, action);
+ ret = run_specific_rebase(&options, action);
cleanup:
strbuf_release(&buf);
@@ -2112,5 +1801,5 @@
free(options.strategy);
strbuf_release(&options.git_format_patch_opt);
free(squash_onto_name);
- return ret;
+ return !!ret;
}
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 2d1f97e..49b846d 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -7,6 +7,7 @@
#include "pkt-line.h"
#include "sideband.h"
#include "run-command.h"
+#include "hook.h"
#include "exec-cmd.h"
#include "commit.h"
#include "object.h"
@@ -134,6 +135,10 @@
if (status)
return status;
+ status = git_gpg_config(var, value, NULL);
+ if (status)
+ return status;
+
if (strcmp(var, "receive.denydeletes") == 0) {
deny_deletes = git_config_bool(var, value);
return 0;
@@ -1306,7 +1311,7 @@
rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
}
-static int command_singleton_iterator(void *cb_data, struct object_id *oid);
+static const struct object_id *command_singleton_iterator(void *cb_data);
static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
{
struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT;
@@ -1463,7 +1468,7 @@
strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
- if (!find_hook(push_to_checkout_hook))
+ if (!hook_exists(push_to_checkout_hook))
retval = push_to_deploy(sha1, &env, work_tree);
else
retval = push_to_checkout(sha1, &env, work_tree);
@@ -1731,16 +1736,15 @@
string_list_clear(&ref_list, 0);
}
-static int command_singleton_iterator(void *cb_data, struct object_id *oid)
+static const struct object_id *command_singleton_iterator(void *cb_data)
{
struct command **cmd_list = cb_data;
struct command *cmd = *cmd_list;
if (!cmd || is_null_oid(&cmd->new_oid))
- return -1; /* end of list */
+ return NULL;
*cmd_list = NULL; /* this returns only one */
- oidcpy(oid, &cmd->new_oid);
- return 0;
+ return &cmd->new_oid;
}
static void set_connectivity_errors(struct command *commands,
@@ -1770,7 +1774,7 @@
struct shallow_info *si;
};
-static int iterate_receive_command_list(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_receive_command_list(void *cb_data)
{
struct iterate_data *data = cb_data;
struct command **cmd_list = &data->cmds;
@@ -1781,13 +1785,11 @@
/* to be checked in update_shallow_ref() */
continue;
if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {
- oidcpy(oid, &cmd->new_oid);
*cmd_list = cmd->next;
- return 0;
+ return &cmd->new_oid;
}
}
- *cmd_list = NULL;
- return -1; /* end of list */
+ return NULL;
}
static void reject_updates_to_hidden(struct command *commands)
@@ -2477,7 +2479,8 @@
struct option options[] = {
OPT__QUIET(&quiet, N_("quiet")),
OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL),
- OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL),
+ OPT_HIDDEN_BOOL(0, "http-backend-info-refs", &advertise_refs, NULL),
+ OPT_ALIAS(0, "advertise-refs", "http-backend-info-refs"),
OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL),
OPT_END()
};
@@ -2580,10 +2583,9 @@
proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
- proc.git_cmd = 1;
+ proc.git_cmd = proc.close_object_store = 1;
proc.argv = argv_gc_auto;
- close_object_store(the_repository->objects);
if (!start_command(&proc)) {
if (use_sideband)
copy_to_sideband(proc.err, -1, NULL);
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 09541d1..175c83e 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -629,8 +629,9 @@
free_worktrees(worktrees);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
+
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
- status |= reflog_expire(e->reflog, &e->oid, flags,
+ status |= reflog_expire(e->reflog, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
@@ -642,17 +643,17 @@
for (; i < argc; i++) {
char *ref;
- struct object_id oid;
- if (!dwim_log(argv[i], strlen(argv[i]), &oid, &ref)) {
+ if (!dwim_log(argv[i], strlen(argv[i]), NULL, &ref)) {
status |= error(_("%s points nowhere!"), argv[i]);
continue;
}
set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
- status |= reflog_expire(ref, &oid, flags,
+ status |= reflog_expire(ref, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
&cb);
+ free(ref);
}
return status;
}
@@ -700,7 +701,6 @@
for ( ; i < argc; i++) {
const char *spec = strstr(argv[i], "@{");
- struct object_id oid;
char *ep, *ref;
int recno;
@@ -709,7 +709,7 @@
continue;
}
- if (!dwim_log(argv[i], spec - argv[i], &oid, &ref)) {
+ if (!dwim_log(argv[i], spec - argv[i], NULL, &ref)) {
status |= error(_("no reflog for '%s'"), argv[i]);
continue;
}
@@ -724,7 +724,7 @@
cb.cmd.expire_total = 0;
}
- status |= reflog_expire(ref, &oid, flags,
+ status |= reflog_expire(ref, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
diff --git a/builtin/remote.c b/builtin/remote.c
index 7f88e6c..299c466 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -318,6 +318,9 @@
* truth value with >= REBASE_TRUE.
*/
info->rebase = rebase_parse_value(value);
+ if (info->rebase == REBASE_INVALID)
+ warning(_("unhandled branch.%s.rebase=%s; assuming "
+ "'true'"), name, value);
break;
case PUSH_REMOTE:
if (info->push_remote_name)
@@ -344,6 +347,14 @@
int queried;
};
+#define REF_STATES_INIT { \
+ .new_refs = STRING_LIST_INIT_DUP, \
+ .stale = STRING_LIST_INIT_DUP, \
+ .tracked = STRING_LIST_INIT_DUP, \
+ .heads = STRING_LIST_INIT_DUP, \
+ .push = STRING_LIST_INIT_DUP, \
+}
+
static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
{
struct ref *fetch_map = NULL, **tail = &fetch_map;
@@ -355,9 +366,6 @@
die(_("Could not get fetch map for refspec %s"),
states->remote->fetch.raw[i]);
- states->new_refs.strdup_strings = 1;
- states->tracked.strdup_strings = 1;
- states->stale.strdup_strings = 1;
for (ref = fetch_map; ref; ref = ref->next) {
if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
string_list_append(&states->new_refs, abbrev_branch(ref->name));
@@ -406,7 +414,6 @@
match_push_refs(local_refs, &push_map, &remote->push, MATCH_REFS_NONE);
- states->push.strdup_strings = 1;
for (ref = push_map; ref; ref = ref->next) {
struct string_list_item *item;
struct push_info *info;
@@ -449,7 +456,6 @@
if (remote->mirror)
return 0;
- states->push.strdup_strings = 1;
if (!remote->push.nr) {
item = string_list_append(&states->push, _("(matching)"));
info = item->util = xcalloc(1, sizeof(struct push_info));
@@ -483,7 +489,6 @@
refspec.force = 0;
refspec.pattern = 1;
refspec.src = refspec.dst = "refs/heads/*";
- states->heads.strdup_strings = 1;
get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
fetch_map, 1);
@@ -970,26 +975,31 @@
}
struct show_info {
- struct string_list *list;
- struct ref_states *states;
+ struct string_list list;
+ struct ref_states states;
int width, width2;
int any_rebase;
};
+#define SHOW_INFO_INIT { \
+ .list = STRING_LIST_INIT_DUP, \
+ .states = REF_STATES_INIT, \
+}
+
static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
{
struct show_info *info = cb_data;
int n = strlen(item->string);
if (n > info->width)
info->width = n;
- string_list_insert(info->list, item->string);
+ string_list_insert(&info->list, item->string);
return 0;
}
static int show_remote_info_item(struct string_list_item *item, void *cb_data)
{
struct show_info *info = cb_data;
- struct ref_states *states = info->states;
+ struct ref_states *states = &info->states;
const char *name = item->string;
if (states->queried) {
@@ -1016,7 +1026,7 @@
static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
{
struct show_info *show_info = cb_data;
- struct ref_states *states = show_info->states;
+ struct ref_states *states = &show_info->states;
struct branch_info *branch_info = branch_item->util;
struct string_list_item *item;
int n;
@@ -1029,7 +1039,7 @@
if (branch_info->rebase >= REBASE_TRUE)
show_info->any_rebase = 1;
- item = string_list_insert(show_info->list, branch_item->string);
+ item = string_list_insert(&show_info->list, branch_item->string);
item->util = branch_info;
return 0;
@@ -1084,7 +1094,7 @@
show_info->width = n;
if ((n = strlen(push_info->dest)) > show_info->width2)
show_info->width2 = n;
- item = string_list_append(show_info->list, push_item->string);
+ item = string_list_append(&show_info->list, push_item->string);
item->util = push_item->util;
return 0;
}
@@ -1212,9 +1222,7 @@
OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
OPT_END()
};
- struct ref_states states;
- struct string_list info_list = STRING_LIST_INIT_NODUP;
- struct show_info info;
+ struct show_info info = SHOW_INFO_INIT;
argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
0);
@@ -1225,26 +1233,22 @@
if (!no_query)
query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
- memset(&states, 0, sizeof(states));
- memset(&info, 0, sizeof(info));
- info.states = &states;
- info.list = &info_list;
for (; argc; argc--, argv++) {
int i;
const char **url;
int url_nr;
- get_remote_ref_states(*argv, &states, query_flag);
+ get_remote_ref_states(*argv, &info.states, query_flag);
printf_ln(_("* remote %s"), *argv);
- printf_ln(_(" Fetch URL: %s"), states.remote->url_nr > 0 ?
- states.remote->url[0] : _("(no URL)"));
- if (states.remote->pushurl_nr) {
- url = states.remote->pushurl;
- url_nr = states.remote->pushurl_nr;
+ printf_ln(_(" Fetch URL: %s"), info.states.remote->url_nr > 0 ?
+ info.states.remote->url[0] : _("(no URL)"));
+ if (info.states.remote->pushurl_nr) {
+ url = info.states.remote->pushurl;
+ url_nr = info.states.remote->pushurl_nr;
} else {
- url = states.remote->url;
- url_nr = states.remote->url_nr;
+ url = info.states.remote->url;
+ url_nr = info.states.remote->url_nr;
}
for (i = 0; i < url_nr; i++)
/*
@@ -1257,57 +1261,57 @@
printf_ln(_(" Push URL: %s"), _("(no URL)"));
if (no_query)
printf_ln(_(" HEAD branch: %s"), _("(not queried)"));
- else if (!states.heads.nr)
+ else if (!info.states.heads.nr)
printf_ln(_(" HEAD branch: %s"), _("(unknown)"));
- else if (states.heads.nr == 1)
- printf_ln(_(" HEAD branch: %s"), states.heads.items[0].string);
+ else if (info.states.heads.nr == 1)
+ printf_ln(_(" HEAD branch: %s"), info.states.heads.items[0].string);
else {
printf(_(" HEAD branch (remote HEAD is ambiguous,"
" may be one of the following):\n"));
- for (i = 0; i < states.heads.nr; i++)
- printf(" %s\n", states.heads.items[i].string);
+ for (i = 0; i < info.states.heads.nr; i++)
+ printf(" %s\n", info.states.heads.items[i].string);
}
/* remote branch info */
info.width = 0;
- for_each_string_list(&states.new_refs, add_remote_to_show_info, &info);
- for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
- for_each_string_list(&states.stale, add_remote_to_show_info, &info);
- if (info.list->nr)
+ for_each_string_list(&info.states.new_refs, add_remote_to_show_info, &info);
+ for_each_string_list(&info.states.tracked, add_remote_to_show_info, &info);
+ for_each_string_list(&info.states.stale, add_remote_to_show_info, &info);
+ if (info.list.nr)
printf_ln(Q_(" Remote branch:%s",
" Remote branches:%s",
- info.list->nr),
+ info.list.nr),
no_query ? _(" (status not queried)") : "");
- for_each_string_list(info.list, show_remote_info_item, &info);
- string_list_clear(info.list, 0);
+ for_each_string_list(&info.list, show_remote_info_item, &info);
+ string_list_clear(&info.list, 0);
/* git pull info */
info.width = 0;
info.any_rebase = 0;
for_each_string_list(&branch_list, add_local_to_show_info, &info);
- if (info.list->nr)
+ if (info.list.nr)
printf_ln(Q_(" Local branch configured for 'git pull':",
" Local branches configured for 'git pull':",
- info.list->nr));
- for_each_string_list(info.list, show_local_info_item, &info);
- string_list_clear(info.list, 0);
+ info.list.nr));
+ for_each_string_list(&info.list, show_local_info_item, &info);
+ string_list_clear(&info.list, 0);
/* git push info */
- if (states.remote->mirror)
+ if (info.states.remote->mirror)
printf_ln(_(" Local refs will be mirrored by 'git push'"));
info.width = info.width2 = 0;
- for_each_string_list(&states.push, add_push_to_show_info, &info);
- QSORT(info.list->items, info.list->nr, cmp_string_with_push);
- if (info.list->nr)
+ for_each_string_list(&info.states.push, add_push_to_show_info, &info);
+ QSORT(info.list.items, info.list.nr, cmp_string_with_push);
+ if (info.list.nr)
printf_ln(Q_(" Local ref configured for 'git push'%s:",
" Local refs configured for 'git push'%s:",
- info.list->nr),
+ info.list.nr),
no_query ? _(" (status not queried)") : "");
- for_each_string_list(info.list, show_push_info_item, &info);
- string_list_clear(info.list, 0);
+ for_each_string_list(&info.list, show_push_info_item, &info);
+ string_list_clear(&info.list, 0);
- free_remote_ref_states(&states);
+ free_remote_ref_states(&info.states);
}
return result;
@@ -1334,8 +1338,7 @@
if (!opt_a && !opt_d && argc == 2) {
head_name = xstrdup(argv[1]);
} else if (opt_a && !opt_d && argc == 1) {
- struct ref_states states;
- memset(&states, 0, sizeof(states));
+ struct ref_states states = REF_STATES_INIT;
get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
if (!states.heads.nr)
result |= error(_("Cannot determine remote HEAD"));
@@ -1374,14 +1377,13 @@
static int prune_remote(const char *remote, int dry_run)
{
int result = 0;
- struct ref_states states;
+ struct ref_states states = REF_STATES_INIT;
struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
struct string_list_item *item;
const char *dangling_msg = dry_run
? _(" %s will become dangling!")
: _(" %s has become dangling!");
- memset(&states, 0, sizeof(states));
get_remote_ref_states(remote, &states, GET_REF_STATES);
if (!states.stale.nr) {
diff --git a/builtin/repack.c b/builtin/repack.c
index c3e4771..0b2d1e5 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -15,6 +15,8 @@
#include "promisor-remote.h"
#include "shallow.h"
#include "pack.h"
+#include "pack-bitmap.h"
+#include "refs.h"
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
@@ -94,12 +96,14 @@
}
/*
- * Adds all packs hex strings to the fname list, which do not
- * have a corresponding .keep file. These packs are not to
- * be kept if we are going to pack everything into one file.
+ * Adds all packs hex strings to either fname_nonkept_list or
+ * fname_kept_list based on whether each pack has a corresponding
+ * .keep file or not. Packs without a .keep file are not to be kept
+ * if we are going to pack everything into one file.
*/
-static void get_non_kept_pack_filenames(struct string_list *fname_list,
- const struct string_list *extra_keep)
+static void collect_pack_filenames(struct string_list *fname_nonkept_list,
+ struct string_list *fname_kept_list,
+ const struct string_list *extra_keep)
{
DIR *dir;
struct dirent *e;
@@ -112,21 +116,20 @@
size_t len;
int i;
- for (i = 0; i < extra_keep->nr; i++)
- if (!fspathcmp(e->d_name, extra_keep->items[i].string))
- break;
- if (extra_keep->nr > 0 && i < extra_keep->nr)
- continue;
-
if (!strip_suffix(e->d_name, ".pack", &len))
continue;
+ for (i = 0; i < extra_keep->nr; i++)
+ if (!fspathcmp(e->d_name, extra_keep->items[i].string))
+ break;
+
fname = xmemdupz(e->d_name, len);
- if (!file_exists(mkpath("%s/%s.keep", packdir, fname)))
- string_list_append_nodup(fname_list, fname);
+ if ((extra_keep->nr > 0 && i < extra_keep->nr) ||
+ (file_exists(mkpath("%s/%s.keep", packdir, fname))))
+ string_list_append_nodup(fname_kept_list, fname);
else
- free(fname);
+ string_list_append_nodup(fname_nonkept_list, fname);
}
closedir(dir);
}
@@ -422,6 +425,25 @@
geometry->split = split;
}
+static struct packed_git *get_largest_active_pack(struct pack_geometry *geometry)
+{
+ if (!geometry) {
+ /*
+ * No geometry means either an all-into-one repack (in which
+ * case there is only one pack left and it is the largest) or an
+ * incremental one.
+ *
+ * If repacking incrementally, then we could check the size of
+ * all packs to determine which should be preferred, but leave
+ * this for later.
+ */
+ return NULL;
+ }
+ if (geometry->split == geometry->pack_nr)
+ return NULL;
+ return geometry->pack[geometry->pack_nr - 1];
+}
+
static void clear_pack_geometry(struct pack_geometry *geometry)
{
if (!geometry)
@@ -433,17 +455,162 @@
geometry->split = 0;
}
+struct midx_snapshot_ref_data {
+ struct tempfile *f;
+ struct oidset seen;
+ int preferred;
+};
+
+static int midx_snapshot_ref_one(const char *refname,
+ const struct object_id *oid,
+ int flag, void *_data)
+{
+ struct midx_snapshot_ref_data *data = _data;
+ struct object_id peeled;
+
+ if (!peel_iterated_oid(oid, &peeled))
+ oid = &peeled;
+
+ if (oidset_insert(&data->seen, oid))
+ return 0; /* already seen */
+
+ if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
+ return 0;
+
+ fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",
+ oid_to_hex(oid));
+
+ return 0;
+}
+
+static void midx_snapshot_refs(struct tempfile *f)
+{
+ struct midx_snapshot_ref_data data;
+ const struct string_list *preferred = bitmap_preferred_tips(the_repository);
+
+ data.f = f;
+ data.preferred = 0;
+ oidset_init(&data.seen, 0);
+
+ if (!fdopen_tempfile(f, "w"))
+ die(_("could not open tempfile %s for writing"),
+ get_tempfile_path(f));
+
+ if (preferred) {
+ struct string_list_item *item;
+
+ data.preferred = 1;
+ for_each_string_list_item(item, preferred)
+ for_each_ref_in(item->string, midx_snapshot_ref_one, &data);
+ data.preferred = 0;
+ }
+
+ for_each_ref(midx_snapshot_ref_one, &data);
+
+ if (close_tempfile_gently(f)) {
+ int save_errno = errno;
+ delete_tempfile(&f);
+ errno = save_errno;
+ die_errno(_("could not close refs snapshot tempfile"));
+ }
+
+ oidset_clear(&data.seen);
+}
+
+static void midx_included_packs(struct string_list *include,
+ struct string_list *existing_nonkept_packs,
+ struct string_list *existing_kept_packs,
+ struct string_list *names,
+ struct pack_geometry *geometry)
+{
+ struct string_list_item *item;
+
+ for_each_string_list_item(item, existing_kept_packs)
+ string_list_insert(include, xstrfmt("%s.idx", item->string));
+ for_each_string_list_item(item, names)
+ string_list_insert(include, xstrfmt("pack-%s.idx", item->string));
+ if (geometry) {
+ struct strbuf buf = STRBUF_INIT;
+ uint32_t i;
+ for (i = geometry->split; i < geometry->pack_nr; i++) {
+ struct packed_git *p = geometry->pack[i];
+
+ strbuf_addstr(&buf, pack_basename(p));
+ strbuf_strip_suffix(&buf, ".pack");
+ strbuf_addstr(&buf, ".idx");
+
+ string_list_insert(include, strbuf_detach(&buf, NULL));
+ }
+ } else {
+ for_each_string_list_item(item, existing_nonkept_packs) {
+ if (item->util)
+ continue;
+ string_list_insert(include, xstrfmt("%s.idx", item->string));
+ }
+ }
+}
+
+static int write_midx_included_packs(struct string_list *include,
+ struct pack_geometry *geometry,
+ const char *refs_snapshot,
+ int show_progress, int write_bitmaps)
+{
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct string_list_item *item;
+ struct packed_git *largest = get_largest_active_pack(geometry);
+ FILE *in;
+ int ret;
+
+ if (!include->nr)
+ return 0;
+
+ cmd.in = -1;
+ cmd.git_cmd = 1;
+
+ strvec_push(&cmd.args, "multi-pack-index");
+ strvec_pushl(&cmd.args, "write", "--stdin-packs", NULL);
+
+ if (show_progress)
+ strvec_push(&cmd.args, "--progress");
+ else
+ strvec_push(&cmd.args, "--no-progress");
+
+ if (write_bitmaps)
+ strvec_push(&cmd.args, "--bitmap");
+
+ if (largest)
+ strvec_pushf(&cmd.args, "--preferred-pack=%s",
+ pack_basename(largest));
+
+ if (refs_snapshot)
+ strvec_pushf(&cmd.args, "--refs-snapshot=%s", refs_snapshot);
+
+ ret = start_command(&cmd);
+ if (ret)
+ return ret;
+
+ in = xfdopen(cmd.in, "w");
+ for_each_string_list_item(item, include)
+ fprintf(in, "%s\n", item->string);
+ fclose(in);
+
+ return finish_command(&cmd);
+}
+
int cmd_repack(int argc, const char **argv, const char *prefix)
{
struct child_process cmd = CHILD_PROCESS_INIT;
struct string_list_item *item;
struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP;
- struct string_list existing_packs = STRING_LIST_INIT_DUP;
+ struct string_list existing_nonkept_packs = STRING_LIST_INIT_DUP;
+ struct string_list existing_kept_packs = STRING_LIST_INIT_DUP;
struct pack_geometry *geometry = NULL;
struct strbuf line = STRBUF_INIT;
+ struct tempfile *refs_snapshot = NULL;
int i, ext, ret;
FILE *out;
+ int show_progress = isatty(2);
/* variables to be filled by option parsing */
int pack_everything = 0;
@@ -454,6 +621,7 @@
int no_update_server_info = 0;
struct pack_objects_args po_args = {NULL};
int geometric_factor = 0;
+ int write_midx = 0;
struct option builtin_repack_options[] = {
OPT_BIT('a', NULL, &pack_everything,
@@ -496,6 +664,8 @@
N_("do not repack this pack")),
OPT_INTEGER('g', "geometric", &geometric_factor,
N_("find a geometric progression with factor <N>")),
+ OPT_BOOL('m', "write-midx", &write_midx,
+ N_("write a multi-pack index of the resulting packs")),
OPT_END()
};
@@ -512,16 +682,32 @@
die(_("--keep-unreachable and -A are incompatible"));
if (write_bitmaps < 0) {
- if (!(pack_everything & ALL_INTO_ONE) ||
- !is_bare_repository())
+ if (!write_midx &&
+ (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository()))
write_bitmaps = 0;
+ } else if (write_bitmaps &&
+ git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0) &&
+ git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP, 0)) {
+ write_bitmaps = 0;
}
if (pack_kept_objects < 0)
pack_kept_objects = write_bitmaps > 0;
- if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
+ if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx)
die(_(incremental_bitmap_conflict_error));
+ if (write_midx && write_bitmaps) {
+ struct strbuf path = STRBUF_INIT;
+
+ strbuf_addf(&path, "%s/%s_XXXXXX", get_object_directory(),
+ "bitmap-ref-tips");
+
+ refs_snapshot = xmks_tempfile(path.buf);
+ midx_snapshot_refs(refs_snapshot);
+
+ strbuf_release(&path);
+ }
+
if (geometric_factor) {
if (pack_everything)
die(_("--geometric is incompatible with -A, -a"));
@@ -561,19 +747,22 @@
}
if (has_promisor_remote())
strvec_push(&cmd.args, "--exclude-promisor-objects");
- if (write_bitmaps > 0)
- strvec_push(&cmd.args, "--write-bitmap-index");
- else if (write_bitmaps < 0)
- strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+ if (!write_midx) {
+ if (write_bitmaps > 0)
+ strvec_push(&cmd.args, "--write-bitmap-index");
+ else if (write_bitmaps < 0)
+ strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+ }
if (use_delta_islands)
strvec_push(&cmd.args, "--delta-islands");
- if (pack_everything & ALL_INTO_ONE) {
- get_non_kept_pack_filenames(&existing_packs, &keep_pack_list);
+ collect_pack_filenames(&existing_nonkept_packs, &existing_kept_packs,
+ &keep_pack_list);
+ if (pack_everything & ALL_INTO_ONE) {
repack_promisor_objects(&po_args, &names);
- if (existing_packs.nr && delete_redundant) {
+ if (existing_nonkept_packs.nr && delete_redundant) {
for_each_string_list_item(item, &names) {
strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
packtmp_name, item->string);
@@ -582,15 +771,12 @@
strvec_pushf(&cmd.args,
"--unpack-unreachable=%s",
unpack_unreachable);
- strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
} else if (pack_everything & LOOSEN_UNREACHABLE) {
strvec_push(&cmd.args,
"--unpack-unreachable");
} else if (keep_unreachable) {
strvec_push(&cmd.args, "--keep-unreachable");
strvec_push(&cmd.args, "--pack-loose-unreachable");
- } else {
- strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
}
}
} else if (geometry) {
@@ -676,20 +862,48 @@
}
/* End of pack replacement. */
- reprepare_packed_git(the_repository);
-
- if (delete_redundant) {
+ if (delete_redundant && pack_everything & ALL_INTO_ONE) {
const int hexsz = the_hash_algo->hexsz;
- int opts = 0;
string_list_sort(&names);
- for_each_string_list_item(item, &existing_packs) {
+ for_each_string_list_item(item, &existing_nonkept_packs) {
char *sha1;
size_t len = strlen(item->string);
if (len < hexsz)
continue;
sha1 = item->string + len - hexsz;
- if (!string_list_has_string(&names, sha1))
- remove_redundant_pack(packdir, item->string);
+ /*
+ * Mark this pack for deletion, which ensures that this
+ * pack won't be included in a MIDX (if `--write-midx`
+ * was given) and that we will actually delete this pack
+ * (if `-d` was given).
+ */
+ item->util = (void*)(intptr_t)!string_list_has_string(&names, sha1);
+ }
+ }
+
+ if (write_midx) {
+ struct string_list include = STRING_LIST_INIT_NODUP;
+ midx_included_packs(&include, &existing_nonkept_packs,
+ &existing_kept_packs, &names, geometry);
+
+ ret = write_midx_included_packs(&include, geometry,
+ refs_snapshot ? get_tempfile_path(refs_snapshot) : NULL,
+ show_progress, write_bitmaps > 0);
+
+ string_list_clear(&include, 0);
+
+ if (ret)
+ return ret;
+ }
+
+ reprepare_packed_git(the_repository);
+
+ if (delete_redundant) {
+ int opts = 0;
+ for_each_string_list_item(item, &existing_nonkept_packs) {
+ if (!item->util)
+ continue;
+ remove_redundant_pack(packdir, item->string);
}
if (geometry) {
@@ -710,7 +924,7 @@
}
strbuf_release(&buf);
}
- if (!po_args.quiet && isatty(2))
+ if (!po_args.quiet && show_progress)
opts |= PRUNE_PACKED_VERBOSE;
prune_packed_objects(opts);
@@ -725,12 +939,17 @@
update_server_info(0);
remove_temporary_files();
- if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
- write_midx_file(get_object_directory(), NULL, 0);
+ if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0)) {
+ unsigned flags = 0;
+ if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP, 0))
+ flags |= MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX;
+ write_midx_file(get_object_directory(), NULL, NULL, flags);
+ }
string_list_clear(&names, 0);
string_list_clear(&rollback, 0);
- string_list_clear(&existing_packs, 0);
+ string_list_clear(&existing_nonkept_packs, 0);
+ string_list_clear(&existing_kept_packs, 0);
clear_pack_geometry(geometry);
strbuf_release(&line);
diff --git a/builtin/replace.c b/builtin/replace.c
index cd48765..946938d 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -507,7 +507,7 @@
if (!fp)
return -1;
- advice_graft_file_deprecated = 0;
+ no_graft_file_deprecated_advice = 1;
while (strbuf_getline(&buf, fp) != EOF) {
if (*buf.buf == '#')
continue;
diff --git a/builtin/reset.c b/builtin/reset.c
index 43e855c..7393595 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -67,12 +67,18 @@
case KEEP:
case MERGE:
opts.update = 1;
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
break;
case HARD:
opts.update = 1;
- /* fallthrough */
+ opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+ break;
+ case MIXED:
+ opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
+ /* but opts.update=0, so working tree not updated */
+ break;
default:
- opts.reset = 1;
+ BUG("invalid reset_type passed to reset_index");
}
read_cache_unmerged();
@@ -412,7 +418,7 @@
refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:"));
t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
- if (advice_reset_quiet_warning && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
+ if (advice_enabled(ADVICE_RESET_QUIET_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
printf(_("\nIt took %.2f seconds to enumerate unstaged changes after reset. You can\n"
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
"to make this the default.\n"), t_delta_in_ms / 1000.0);
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 22c4e1a..8480a59 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -863,8 +863,8 @@
continue;
}
if (!strcmp(arg, "--bisect")) {
- for_each_fullref_in("refs/bisect/bad", show_reference, NULL, 0);
- for_each_fullref_in("refs/bisect/good", anti_reference, NULL, 0);
+ for_each_fullref_in("refs/bisect/bad", show_reference, NULL);
+ for_each_fullref_in("refs/bisect/good", anti_reference, NULL);
continue;
}
if (opt_with_value(arg, "--branches", &arg)) {
diff --git a/builtin/revert.c b/builtin/revert.c
index 237f2f1..51776ab 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -136,6 +136,9 @@
PARSE_OPT_KEEP_ARGV0 |
PARSE_OPT_KEEP_UNKNOWN);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
/* implies allow_empty */
if (opts->keep_redundant_commits)
opts->allow_empty = 1;
@@ -191,7 +194,8 @@
struct setup_revision_opt s_r_opt;
opts->revs = xmalloc(sizeof(*opts->revs));
repo_init_revisions(the_repository, opts->revs, NULL);
- opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
+ opts->revs->no_walk = 1;
+ opts->revs->unsorted_input = 1;
if (argc < 2)
usage_with_options(usage_str, options);
if (!strcmp(argv[1], "-"))
diff --git a/builtin/rm.c b/builtin/rm.c
index 8a24c71..3d0967c 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -55,7 +55,7 @@
strbuf_addf(&err_msg,
"\n %s",
files_list->items[i].string);
- if (advice_rm_hints)
+ if (advice_enabled(ADVICE_RM_HINTS))
strbuf_addstr(&err_msg, hints_msg);
*errs = error("%s", err_msg.buf);
strbuf_release(&err_msg);
@@ -237,6 +237,7 @@
static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
static int ignore_unmatch = 0, pathspec_file_nul;
+static int include_sparse;
static char *pathspec_from_file;
static struct option builtin_rm_options[] = {
@@ -247,6 +248,7 @@
OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")),
OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
N_("exit with a zero status even if nothing matched")),
+ OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
OPT_END(),
@@ -298,7 +300,10 @@
ensure_full_index(&the_index);
for (i = 0; i < active_nr; i++) {
const struct cache_entry *ce = active_cache[i];
- if (ce_skip_worktree(ce))
+
+ if (!include_sparse &&
+ (ce_skip_worktree(ce) ||
+ !path_in_sparse_checkout(ce->name, &the_index)))
continue;
if (!ce_path_match(&the_index, ce, &pathspec, seen))
continue;
@@ -322,7 +327,8 @@
seen_any = 1;
else if (ignore_unmatch)
continue;
- else if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
+ else if (!include_sparse &&
+ matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
string_list_append(&only_match_skip_worktree, original);
else
die(_("pathspec '%s' did not match any files"), original);
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 729dea1..69c432e 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -17,10 +17,10 @@
#include "protocol.h"
static const char * const send_pack_usage[] = {
- N_("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."),
+ N_("git send-pack [--mirror] [--dry-run] [--force]\n"
+ " [--receive-pack=<git-receive-pack>]\n"
+ " [--verbose] [--thin] [--atomic]\n"
+ " [<host>:]<directory> (--all | <ref>...)"),
NULL,
};
@@ -87,6 +87,10 @@
break;
case REF_STATUS_EXPECTING_REPORT:
+ res = "error";
+ msg = "expecting report";
+ break;
+
default:
continue;
}
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 3e7ab1c..e7f7af5 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -374,6 +374,9 @@
for (;;) {
switch (parse_options_step(&ctx, options, shortlog_usage)) {
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_UNKNOWN:
+ break;
case PARSE_OPT_HELP:
case PARSE_OPT_ERROR:
exit(129);
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index bea4bbf..0824492 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -11,9 +11,9 @@
static const char* show_branch_usage[] = {
N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
- " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
- " [--more=<n> | --list | --independent | --merge-base]\n"
- " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
+ " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+ " [--more=<n> | --list | --independent | --merge-base]\n"
+ " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
NULL
};
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 8ba9f13..d0f5c47 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -100,6 +100,98 @@
return 0;
}
+static void clean_tracked_sparse_directories(struct repository *r)
+{
+ int i, was_full = 0;
+ struct strbuf path = STRBUF_INIT;
+ size_t pathlen;
+ struct string_list_item *item;
+ struct string_list sparse_dirs = STRING_LIST_INIT_DUP;
+
+ /*
+ * If we are not using cone mode patterns, then we cannot
+ * delete directories outside of the sparse cone.
+ */
+ if (!r || !r->index || !r->worktree)
+ return;
+ if (init_sparse_checkout_patterns(r->index) ||
+ !r->index->sparse_checkout_patterns->use_cone_patterns)
+ return;
+
+ /*
+ * Use the sparse index as a data structure to assist finding
+ * directories that are safe to delete. This conversion to a
+ * sparse index will not delete directories that contain
+ * conflicted entries or submodules.
+ */
+ if (!r->index->sparse_index) {
+ /*
+ * If something, such as a merge conflict or other concern,
+ * prevents us from converting to a sparse index, then do
+ * not try deleting files.
+ */
+ if (convert_to_sparse(r->index, SPARSE_INDEX_MEMORY_ONLY))
+ return;
+ was_full = 1;
+ }
+
+ strbuf_addstr(&path, r->worktree);
+ strbuf_complete(&path, '/');
+ pathlen = path.len;
+
+ /*
+ * Collect directories that have gone out of scope but also
+ * exist on disk, so there is some work to be done. We need to
+ * store the entries in a list before exploring, since that might
+ * expand the sparse-index again.
+ */
+ for (i = 0; i < r->index->cache_nr; i++) {
+ struct cache_entry *ce = r->index->cache[i];
+
+ if (S_ISSPARSEDIR(ce->ce_mode) &&
+ repo_file_exists(r, ce->name))
+ string_list_append(&sparse_dirs, ce->name);
+ }
+
+ for_each_string_list_item(item, &sparse_dirs) {
+ struct dir_struct dir = DIR_INIT;
+ struct pathspec p = { 0 };
+ struct strvec s = STRVEC_INIT;
+
+ strbuf_setlen(&path, pathlen);
+ strbuf_addstr(&path, item->string);
+
+ dir.flags |= DIR_SHOW_IGNORED_TOO;
+
+ setup_standard_excludes(&dir);
+ strvec_push(&s, path.buf);
+
+ parse_pathspec(&p, PATHSPEC_GLOB, 0, NULL, s.v);
+ fill_directory(&dir, r->index, &p);
+
+ if (dir.nr) {
+ warning(_("directory '%s' contains untracked files,"
+ " but is not in the sparse-checkout cone"),
+ item->string);
+ } else if (remove_dir_recursively(&path, 0)) {
+ /*
+ * Removal is "best effort". If something blocks
+ * the deletion, then continue with a warning.
+ */
+ warning(_("failed to remove directory '%s'"),
+ item->string);
+ }
+
+ dir_clear(&dir);
+ }
+
+ string_list_clear(&sparse_dirs, 0);
+ strbuf_release(&path);
+
+ if (was_full)
+ ensure_full_index(r->index);
+}
+
static int update_working_directory(struct pattern_list *pl)
{
enum update_sparsity_result result;
@@ -141,6 +233,8 @@
else
rollback_lock_file(&lock_file);
+ clean_tracked_sparse_directories(r);
+
r->index->sparse_checkout_patterns = NULL;
return result;
}
diff --git a/builtin/stash.c b/builtin/stash.c
index 5512f49..a0ccc86 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -85,7 +85,7 @@
static const char * const git_stash_save_usage[] = {
N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
- " [-u|--include-untracked] [-a|--all] [<message>]"),
+ " [-u|--include-untracked] [-a|--all] [<message>]"),
NULL
};
@@ -256,8 +256,10 @@
opts.src_index = &the_index;
opts.dst_index = &the_index;
opts.merge = 1;
- opts.reset = reset;
+ opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
opts.update = update;
+ if (update)
+ opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
opts.fn = oneway_merge;
if (unpack_trees(nr_trees, t, &opts))
@@ -1533,6 +1535,7 @@
} else {
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
+ /* BUG: this nukes untracked files in the way */
strvec_pushl(&cp.args, "reset", "--hard", "-q",
"--no-recurse-submodules", NULL);
if (run_command(&cp)) {
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index ef2776a..e630f0c 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -199,34 +199,28 @@
return strbuf_detach(&sb, NULL);
}
-static int resolve_relative_url(int argc, const char **argv, const char *prefix)
+static char *resolve_relative_url(const char *rel_url, const char *up_path, int quiet)
{
- char *remoteurl = NULL;
+ char *remoteurl, *resolved_url;
char *remote = get_default_remote();
- const char *up_path = NULL;
- char *res;
- const char *url;
- struct strbuf sb = STRBUF_INIT;
+ struct strbuf remotesb = STRBUF_INIT;
- if (argc != 2 && argc != 3)
- die("resolve-relative-url only accepts one or two arguments");
-
- url = argv[1];
- strbuf_addf(&sb, "remote.%s.url", remote);
- free(remote);
-
- if (git_config_get_string(sb.buf, &remoteurl))
- /* the repository is its own authoritative upstream */
+ strbuf_addf(&remotesb, "remote.%s.url", remote);
+ if (git_config_get_string(remotesb.buf, &remoteurl)) {
+ if (!quiet)
+ warning(_("could not look up configuration '%s'. "
+ "Assuming this repository is its own "
+ "authoritative upstream."),
+ remotesb.buf);
remoteurl = xgetcwd();
+ }
+ resolved_url = relative_url(remoteurl, rel_url, up_path);
- if (argc == 3)
- up_path = argv[2];
-
- res = relative_url(remoteurl, url, up_path);
- puts(res);
- free(res);
+ free(remote);
free(remoteurl);
- return 0;
+ strbuf_release(&remotesb);
+
+ return resolved_url;
}
static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
@@ -313,7 +307,7 @@
const struct cache_entry **entries;
int alloc, nr;
};
-#define MODULE_LIST_INIT { NULL, 0, 0 }
+#define MODULE_LIST_INIT { 0 }
static int module_list_compute(int argc, const char **argv,
const char *prefix,
@@ -590,31 +584,11 @@
return 0;
}
-static char *compute_submodule_clone_url(const char *rel_url)
-{
- char *remoteurl, *relurl;
- char *remote = get_default_remote();
- struct strbuf remotesb = STRBUF_INIT;
-
- strbuf_addf(&remotesb, "remote.%s.url", remote);
- if (git_config_get_string(remotesb.buf, &remoteurl)) {
- warning(_("could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb.buf);
- remoteurl = xgetcwd();
- }
- relurl = relative_url(remoteurl, rel_url, NULL);
-
- free(remote);
- free(remoteurl);
- strbuf_release(&remotesb);
-
- return relurl;
-}
-
struct init_cb {
const char *prefix;
unsigned int flags;
};
-#define INIT_CB_INIT { NULL, 0 }
+#define INIT_CB_INIT { 0 }
static void init_submodule(const char *path, const char *prefix,
unsigned int flags)
@@ -660,7 +634,7 @@
if (starts_with_dot_dot_slash(url) ||
starts_with_dot_slash(url)) {
char *oldurl = url;
- url = compute_submodule_clone_url(oldurl);
+ url = resolve_relative_url(oldurl, NULL, 0);
free(oldurl);
}
@@ -743,7 +717,7 @@
const char *prefix;
unsigned int flags;
};
-#define STATUS_CB_INIT { NULL, 0 }
+#define STATUS_CB_INIT { 0 }
static void print_status(unsigned int flags, char state, const char *path,
const struct object_id *oid, const char *displaypath)
@@ -937,13 +911,13 @@
char status;
const char *sm_path;
};
-#define MODULE_CB_INIT { 0, 0, NULL, NULL, '\0', NULL }
+#define MODULE_CB_INIT { 0 }
struct module_cb_list {
struct module_cb **entries;
int alloc, nr;
};
-#define MODULE_CB_LIST_INIT { NULL, 0, 0 }
+#define MODULE_CB_LIST_INIT { 0 }
struct summary_cb {
int argc;
@@ -954,7 +928,7 @@
unsigned int files: 1;
int summary_limit;
};
-#define SUMMARY_CB_INIT { 0, NULL, NULL, 0, 0, 0, 0 }
+#define SUMMARY_CB_INIT { 0 }
enum diff_cmd {
DIFF_INDEX,
@@ -1360,7 +1334,7 @@
const char *prefix;
unsigned int flags;
};
-#define SYNC_CB_INIT { NULL, 0 }
+#define SYNC_CB_INIT { 0 }
static void sync_submodule(const char *path, const char *prefix,
unsigned int flags)
@@ -1380,20 +1354,10 @@
if (sub && sub->url) {
if (starts_with_dot_dot_slash(sub->url) ||
starts_with_dot_slash(sub->url)) {
- char *remote_url, *up_path;
- char *remote = get_default_remote();
- strbuf_addf(&sb, "remote.%s.url", remote);
-
- if (git_config_get_string(sb.buf, &remote_url))
- remote_url = xgetcwd();
-
- up_path = get_up_path(path);
- sub_origin_url = relative_url(remote_url, sub->url, up_path);
- super_config_url = relative_url(remote_url, sub->url, NULL);
-
- free(remote);
+ char *up_path = get_up_path(path);
+ sub_origin_url = resolve_relative_url(sub->url, up_path, 1);
+ super_config_url = resolve_relative_url(sub->url, NULL, 1);
free(up_path);
- free(remote_url);
} else {
sub_origin_url = xstrdup(sub->url);
super_config_url = xstrdup(sub->url);
@@ -1516,7 +1480,7 @@
const char *prefix;
unsigned int flags;
};
-#define DEINIT_CB_INIT { NULL, 0 }
+#define DEINIT_CB_INIT { 0 }
static void deinit_submodule(const char *path, const char *prefix,
unsigned int flags)
@@ -1683,8 +1647,9 @@
} error_mode;
struct string_list *reference;
};
-#define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
- SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
+#define SUBMODULE_ALTERNATE_SETUP_INIT { \
+ .error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE, \
+}
static const char alternate_error_advice[] = N_(
"An alternate computed from a superproject's alternate is invalid.\n"
@@ -1704,18 +1669,24 @@
* standard layout with .git/(modules/<name>)+/objects
*/
if (strip_suffix(odb->path, "/objects", &len)) {
+ struct repository alternate;
char *sm_alternate;
struct strbuf sb = STRBUF_INIT;
struct strbuf err = STRBUF_INIT;
strbuf_add(&sb, odb->path, len);
+ repo_init(&alternate, sb.buf, NULL);
+
/*
* We need to end the new path with '/' to mark it as a dir,
* otherwise a submodule name containing '/' will be broken
* as the last part of a missing submodule reference would
* be taken as a file name.
*/
- strbuf_addf(&sb, "/modules/%s/", sas->submodule_name);
+ strbuf_reset(&sb);
+ submodule_name_to_gitdir(&sb, &alternate, sas->submodule_name);
+ strbuf_addch(&sb, '/');
+ repo_clear(&alternate);
sm_alternate = compute_alternate_path(sb.buf, &err);
if (sm_alternate) {
@@ -1724,7 +1695,7 @@
} else {
switch (sas->error_mode) {
case SUBMODULE_ALTERNATE_ERROR_DIE:
- if (advice_submodule_alternate_error_strategy_die)
+ if (advice_enabled(ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE))
advise(_(alternate_error_advice));
die(_("submodule '%s' cannot add alternate: %s"),
sas->submodule_name, err.buf);
@@ -1785,7 +1756,7 @@
struct strbuf sb = STRBUF_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
- strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), clone_data->name);
+ submodule_name_to_gitdir(&sb, the_repository, clone_data->name);
sm_gitdir = absolute_pathdup(sb.buf);
strbuf_reset(&sb);
@@ -2045,6 +2016,20 @@
.max_jobs = 1, \
}
+struct update_data {
+ const char *recursive_prefix;
+ const char *sm_path;
+ const char *displaypath;
+ struct object_id oid;
+ struct object_id suboid;
+ struct submodule_update_strategy update_strategy;
+ int depth;
+ unsigned int force: 1;
+ unsigned int quiet: 1;
+ unsigned int nofetch: 1;
+ unsigned int just_cloned: 1;
+};
+#define UPDATE_DATA_INIT { .update_strategy = SUBMODULE_UPDATE_STRATEGY_INIT }
static void next_submodule_warn_missing(struct submodule_update_clone *suc,
struct strbuf *out, const char *displaypath)
@@ -2134,7 +2119,7 @@
if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) {
if (starts_with_dot_slash(sub->url) ||
starts_with_dot_dot_slash(sub->url)) {
- url = compute_submodule_clone_url(sub->url);
+ url = resolve_relative_url(sub->url, NULL, 0);
need_free_url = 1;
} else
url = sub->url;
@@ -2298,6 +2283,181 @@
return 0;
}
+static int is_tip_reachable(const char *path, struct object_id *oid)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct strbuf rev = STRBUF_INIT;
+ char *hex = oid_to_hex(oid);
+
+ cp.git_cmd = 1;
+ cp.dir = xstrdup(path);
+ cp.no_stderr = 1;
+ strvec_pushl(&cp.args, "rev-list", "-n", "1", hex, "--not", "--all", NULL);
+
+ prepare_submodule_repo_env(&cp.env_array);
+
+ if (capture_command(&cp, &rev, GIT_MAX_HEXSZ + 1) || rev.len)
+ return 0;
+
+ return 1;
+}
+
+static int fetch_in_submodule(const char *module_path, int depth, int quiet, struct object_id *oid)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ prepare_submodule_repo_env(&cp.env_array);
+ cp.git_cmd = 1;
+ cp.dir = xstrdup(module_path);
+
+ strvec_push(&cp.args, "fetch");
+ if (quiet)
+ strvec_push(&cp.args, "--quiet");
+ if (depth)
+ strvec_pushf(&cp.args, "--depth=%d", depth);
+ if (oid) {
+ char *hex = oid_to_hex(oid);
+ char *remote = get_default_remote();
+ strvec_pushl(&cp.args, remote, hex, NULL);
+ }
+
+ return run_command(&cp);
+}
+
+static int run_update_command(struct update_data *ud, int subforce)
+{
+ struct strvec args = STRVEC_INIT;
+ struct strvec child_env = STRVEC_INIT;
+ char *oid = oid_to_hex(&ud->oid);
+ int must_die_on_failure = 0;
+ int git_cmd;
+
+ switch (ud->update_strategy.type) {
+ case SM_UPDATE_CHECKOUT:
+ git_cmd = 1;
+ strvec_pushl(&args, "checkout", "-q", NULL);
+ if (subforce)
+ strvec_push(&args, "-f");
+ break;
+ case SM_UPDATE_REBASE:
+ git_cmd = 1;
+ strvec_push(&args, "rebase");
+ if (ud->quiet)
+ strvec_push(&args, "--quiet");
+ must_die_on_failure = 1;
+ break;
+ case SM_UPDATE_MERGE:
+ git_cmd = 1;
+ strvec_push(&args, "merge");
+ if (ud->quiet)
+ strvec_push(&args, "--quiet");
+ must_die_on_failure = 1;
+ break;
+ case SM_UPDATE_COMMAND:
+ git_cmd = 0;
+ strvec_push(&args, ud->update_strategy.command);
+ must_die_on_failure = 1;
+ break;
+ default:
+ BUG("unexpected update strategy type: %s",
+ submodule_strategy_to_string(&ud->update_strategy));
+ }
+ strvec_push(&args, oid);
+
+ prepare_submodule_repo_env(&child_env);
+ if (run_command_v_opt_cd_env(args.v, git_cmd ? RUN_GIT_CMD : RUN_USING_SHELL,
+ ud->sm_path, child_env.v)) {
+ switch (ud->update_strategy.type) {
+ case SM_UPDATE_CHECKOUT:
+ printf(_("Unable to checkout '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
+ break;
+ case SM_UPDATE_REBASE:
+ printf(_("Unable to rebase '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
+ break;
+ case SM_UPDATE_MERGE:
+ printf(_("Unable to merge '%s' in submodule path '%s'"),
+ oid, ud->displaypath);
+ break;
+ case SM_UPDATE_COMMAND:
+ printf(_("Execution of '%s %s' failed in submodule path '%s'"),
+ ud->update_strategy.command, oid, ud->displaypath);
+ break;
+ default:
+ BUG("unexpected update strategy type: %s",
+ submodule_strategy_to_string(&ud->update_strategy));
+ }
+ /*
+ * NEEDSWORK: We are currently printing to stdout with error
+ * return so that the shell caller handles the error output
+ * properly. Once we start handling the error messages within
+ * C, we should use die() instead.
+ */
+ if (must_die_on_failure)
+ return 2;
+ /*
+ * This signifies to the caller in shell that the command
+ * failed without dying
+ */
+ return 1;
+ }
+
+ switch (ud->update_strategy.type) {
+ case SM_UPDATE_CHECKOUT:
+ printf(_("Submodule path '%s': checked out '%s'\n"),
+ ud->displaypath, oid);
+ break;
+ case SM_UPDATE_REBASE:
+ printf(_("Submodule path '%s': rebased into '%s'\n"),
+ ud->displaypath, oid);
+ break;
+ case SM_UPDATE_MERGE:
+ printf(_("Submodule path '%s': merged in '%s'\n"),
+ ud->displaypath, oid);
+ break;
+ case SM_UPDATE_COMMAND:
+ printf(_("Submodule path '%s': '%s %s'\n"),
+ ud->displaypath, ud->update_strategy.command, oid);
+ break;
+ default:
+ BUG("unexpected update strategy type: %s",
+ submodule_strategy_to_string(&ud->update_strategy));
+ }
+
+ return 0;
+}
+
+static int do_run_update_procedure(struct update_data *ud)
+{
+ int subforce = is_null_oid(&ud->suboid) || ud->force;
+
+ if (!ud->nofetch) {
+ /*
+ * Run fetch only if `oid` isn't present or it
+ * is not reachable from a ref.
+ */
+ if (!is_tip_reachable(ud->sm_path, &ud->oid) &&
+ fetch_in_submodule(ud->sm_path, ud->depth, ud->quiet, NULL) &&
+ !ud->quiet)
+ fprintf_ln(stderr,
+ _("Unable to fetch in submodule path '%s'; "
+ "trying to directly fetch %s:"),
+ ud->displaypath, oid_to_hex(&ud->oid));
+ /*
+ * Now we tried the usual fetch, but `oid` may
+ * not be reachable from any of the refs.
+ */
+ if (!is_tip_reachable(ud->sm_path, &ud->oid) &&
+ fetch_in_submodule(ud->sm_path, ud->depth, ud->quiet, &ud->oid))
+ die(_("Fetched in submodule path '%s', but it did not "
+ "contain %s. Direct fetching of that commit failed."),
+ ud->displaypath, oid_to_hex(&ud->oid));
+ }
+
+ return run_update_command(ud, subforce);
+}
+
static void update_submodule(struct update_clone_data *ucd)
{
fprintf(stdout, "dummy %s %d\t%s\n",
@@ -2395,6 +2555,73 @@
return update_submodules(&suc);
}
+static int run_update_procedure(int argc, const char **argv, const char *prefix)
+{
+ int force = 0, quiet = 0, nofetch = 0, just_cloned = 0;
+ char *prefixed_path, *update = NULL;
+ struct update_data update_data = UPDATE_DATA_INIT;
+
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("suppress output for update by rebase or merge")),
+ OPT__FORCE(&force, N_("force checkout updates"), 0),
+ OPT_BOOL('N', "no-fetch", &nofetch,
+ N_("don't fetch new objects from the remote site")),
+ OPT_BOOL(0, "just-cloned", &just_cloned,
+ N_("overrides update mode in case the repository is a fresh clone")),
+ OPT_INTEGER(0, "depth", &update_data.depth, N_("depth for shallow fetch")),
+ OPT_STRING(0, "prefix", &prefix,
+ N_("path"),
+ N_("path into the working tree")),
+ OPT_STRING(0, "update", &update,
+ N_("string"),
+ N_("rebase, merge, checkout or none")),
+ OPT_STRING(0, "recursive-prefix", &update_data.recursive_prefix, N_("path"),
+ N_("path into the working tree, across nested "
+ "submodule boundaries")),
+ OPT_CALLBACK_F(0, "oid", &update_data.oid, N_("sha1"),
+ N_("SHA1 expected by superproject"), PARSE_OPT_NONEG,
+ parse_opt_object_id),
+ OPT_CALLBACK_F(0, "suboid", &update_data.suboid, N_("subsha1"),
+ N_("SHA1 of submodule's HEAD"), PARSE_OPT_NONEG,
+ parse_opt_object_id),
+ OPT_END()
+ };
+
+ const char *const usage[] = {
+ N_("git submodule--helper run-update-procedure [<options>] <path>"),
+ NULL
+ };
+
+ argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+ if (argc != 1)
+ usage_with_options(usage, options);
+
+ update_data.force = !!force;
+ update_data.quiet = !!quiet;
+ update_data.nofetch = !!nofetch;
+ update_data.just_cloned = !!just_cloned;
+ update_data.sm_path = argv[0];
+
+ if (update_data.recursive_prefix)
+ prefixed_path = xstrfmt("%s%s", update_data.recursive_prefix, update_data.sm_path);
+ else
+ prefixed_path = xstrdup(update_data.sm_path);
+
+ update_data.displaypath = get_submodule_displaypath(prefixed_path, prefix);
+
+ determine_submodule_update_strategy(the_repository, update_data.just_cloned,
+ update_data.sm_path, update,
+ &update_data.update_strategy);
+
+ free(prefixed_path);
+
+ if (!oideq(&update_data.oid, &update_data.suboid) || update_data.force)
+ return do_run_update_procedure(&update_data);
+
+ return 3;
+}
+
static int resolve_relative_path(int argc, const char **argv, const char *prefix)
{
struct strbuf sb = STRBUF_INIT;
@@ -2540,7 +2767,6 @@
static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
{
- const struct submodule *sub;
const char *path;
const char *cw;
struct repository subrepo;
@@ -2550,11 +2776,7 @@
path = argv[1];
- sub = submodule_from_path(the_repository, null_oid(), path);
- if (!sub)
- BUG("We could get the submodule handle before?");
-
- if (repo_submodule_init(&subrepo, the_repository, sub))
+ if (repo_submodule_init(&subrepo, the_repository, path, null_oid()))
die(_("could not get a repository handle for submodule '%s'"), path);
if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
@@ -2765,7 +2987,7 @@
const char *prefix;
const char *branch;
const char *reference_path;
- const char *sm_path;
+ char *sm_path;
const char *sm_name;
const char *repo;
const char *realrepo;
@@ -2777,7 +2999,7 @@
};
#define ADD_DATA_INIT { .depth = -1 }
-static void show_fetch_remotes(FILE *output, const char *git_dir_path)
+static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path)
{
struct child_process cp_remote = CHILD_PROCESS_INIT;
struct strbuf sb_remote_out = STRBUF_INIT;
@@ -2793,7 +3015,7 @@
while ((next_line = strchr(line, '\n')) != NULL) {
size_t len = next_line - line;
if (strip_suffix_mem(line, &len, " (fetch)"))
- fprintf(output, " %.*s\n", (int)len, line);
+ strbuf_addf(msg, " %.*s\n", (int)len, line);
line = next_line + 1;
}
}
@@ -2825,19 +3047,27 @@
if (is_directory(submod_gitdir_path)) {
if (!add_data->force) {
- fprintf(stderr, _("A git directory for '%s' is found "
- "locally with remote(s):"),
- add_data->sm_name);
- show_fetch_remotes(stderr, submod_gitdir_path);
+ struct strbuf msg = STRBUF_INIT;
+ char *die_msg;
+
+ strbuf_addf(&msg, _("A git directory for '%s' is found "
+ "locally with remote(s):\n"),
+ add_data->sm_name);
+
+ append_fetch_remotes(&msg, submod_gitdir_path);
free(submod_gitdir_path);
- die(_("If you want to reuse this local git "
- "directory instead of cloning again from\n"
- " %s\n"
- "use the '--force' option. If the local git "
- "directory is not the correct repo\n"
- "or if you are unsure what this means, choose "
- "another name with the '--name' option.\n"),
- add_data->realrepo);
+
+ strbuf_addf(&msg, _("If you want to reuse this local git "
+ "directory instead of cloning again from\n"
+ " %s\n"
+ "use the '--force' option. If the local git "
+ "directory is not the correct repo\n"
+ "or you are unsure what this means choose "
+ "another name with the '--name' option."),
+ add_data->realrepo);
+
+ die_msg = strbuf_detach(&msg, NULL);
+ die("%s", die_msg);
} else {
printf(_("Reactivating local git directory for "
"submodule '%s'\n"), add_data->sm_name);
@@ -2864,6 +3094,10 @@
prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.dir = add_data->sm_path;
+ /*
+ * NOTE: we only get here if add_data->force is true, so
+ * passing --force to checkout is reasonable.
+ */
strvec_pushl(&cp.args, "checkout", "-f", "-q", NULL);
if (add_data->branch) {
@@ -2877,61 +3111,246 @@
return 0;
}
-static int add_clone(int argc, const char **argv, const char *prefix)
+static int config_submodule_in_gitmodules(const char *name, const char *var, const char *value)
{
- int force = 0, quiet = 0, dissociate = 0, progress = 0;
+ char *key;
+ int ret;
+
+ if (!is_writing_gitmodules_ok())
+ die(_("please make sure that the .gitmodules file is in the working tree"));
+
+ key = xstrfmt("submodule.%s.%s", name, var);
+ ret = config_set_in_gitmodules_file_gently(key, value);
+ free(key);
+
+ return ret;
+}
+
+static void configure_added_submodule(struct add_data *add_data)
+{
+ char *key;
+ char *val = NULL;
+ struct child_process add_submod = CHILD_PROCESS_INIT;
+ struct child_process add_gitmodules = CHILD_PROCESS_INIT;
+
+ key = xstrfmt("submodule.%s.url", add_data->sm_name);
+ git_config_set_gently(key, add_data->realrepo);
+ free(key);
+
+ add_submod.git_cmd = 1;
+ strvec_pushl(&add_submod.args, "add",
+ "--no-warn-embedded-repo", NULL);
+ if (add_data->force)
+ strvec_push(&add_submod.args, "--force");
+ strvec_pushl(&add_submod.args, "--", add_data->sm_path, NULL);
+
+ if (run_command(&add_submod))
+ die(_("Failed to add submodule '%s'"), add_data->sm_path);
+
+ if (config_submodule_in_gitmodules(add_data->sm_name, "path", add_data->sm_path) ||
+ config_submodule_in_gitmodules(add_data->sm_name, "url", add_data->repo))
+ die(_("Failed to register submodule '%s'"), add_data->sm_path);
+
+ if (add_data->branch) {
+ if (config_submodule_in_gitmodules(add_data->sm_name,
+ "branch", add_data->branch))
+ die(_("Failed to register submodule '%s'"), add_data->sm_path);
+ }
+
+ add_gitmodules.git_cmd = 1;
+ strvec_pushl(&add_gitmodules.args,
+ "add", "--force", "--", ".gitmodules", NULL);
+
+ if (run_command(&add_gitmodules))
+ die(_("Failed to register submodule '%s'"), add_data->sm_path);
+
+ /*
+ * NEEDSWORK: In a multi-working-tree world this needs to be
+ * set in the per-worktree config.
+ */
+ /*
+ * NEEDSWORK: In the longer run, we need to get rid of this
+ * pattern of querying "submodule.active" before calling
+ * is_submodule_active(), since that function needs to find
+ * out the value of "submodule.active" again anyway.
+ */
+ if (!git_config_get_string("submodule.active", &val) && val) {
+ /*
+ * If the submodule being added isn't already covered by the
+ * current configured pathspec, set the submodule's active flag
+ */
+ if (!is_submodule_active(the_repository, add_data->sm_path)) {
+ key = xstrfmt("submodule.%s.active", add_data->sm_name);
+ git_config_set_gently(key, "true");
+ free(key);
+ }
+ } else {
+ key = xstrfmt("submodule.%s.active", add_data->sm_name);
+ git_config_set_gently(key, "true");
+ free(key);
+ }
+}
+
+static void die_on_index_match(const char *path, int force)
+{
+ struct pathspec ps;
+ const char *args[] = { path, NULL };
+ parse_pathspec(&ps, 0, PATHSPEC_PREFER_CWD, NULL, args);
+
+ if (read_cache_preload(NULL) < 0)
+ die(_("index file corrupt"));
+
+ if (ps.nr) {
+ int i;
+ char *ps_matched = xcalloc(ps.nr, 1);
+
+ /* TODO: audit for interaction with sparse-index. */
+ ensure_full_index(&the_index);
+
+ /*
+ * Since there is only one pathspec, we just need
+ * need to check ps_matched[0] to know if a cache
+ * entry matched.
+ */
+ for (i = 0; i < active_nr; i++) {
+ ce_path_match(&the_index, active_cache[i], &ps,
+ ps_matched);
+
+ if (ps_matched[0]) {
+ if (!force)
+ die(_("'%s' already exists in the index"),
+ path);
+ if (!S_ISGITLINK(active_cache[i]->ce_mode))
+ die(_("'%s' already exists in the index "
+ "and is not a submodule"), path);
+ break;
+ }
+ }
+ free(ps_matched);
+ }
+ clear_pathspec(&ps);
+}
+
+static void die_on_repo_without_commits(const char *path)
+{
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addstr(&sb, path);
+ if (is_nonbare_repository_dir(&sb)) {
+ struct object_id oid;
+ if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
+ die(_("'%s' does not have a commit checked out"), path);
+ }
+ strbuf_release(&sb);
+}
+
+static int module_add(int argc, const char **argv, const char *prefix)
+{
+ int force = 0, quiet = 0, progress = 0, dissociate = 0;
struct add_data add_data = ADD_DATA_INIT;
struct option options[] = {
- OPT_STRING('b', "branch", &add_data.branch,
- N_("branch"),
- N_("branch of repository to checkout on cloning")),
- OPT_STRING(0, "prefix", &prefix,
- N_("path"),
- N_("alternative anchor for relative paths")),
- OPT_STRING(0, "path", &add_data.sm_path,
- N_("path"),
- N_("where the new submodule will be cloned to")),
- OPT_STRING(0, "name", &add_data.sm_name,
- N_("string"),
- N_("name of the new submodule")),
- OPT_STRING(0, "url", &add_data.realrepo,
- N_("string"),
- N_("url where to clone the submodule from")),
- OPT_STRING(0, "reference", &add_data.reference_path,
- N_("repo"),
- N_("reference repository")),
- OPT_BOOL(0, "dissociate", &dissociate,
- N_("use --reference only while cloning")),
- OPT_INTEGER(0, "depth", &add_data.depth,
- N_("depth for shallow clones")),
- OPT_BOOL(0, "progress", &progress,
- N_("force cloning progress")),
+ OPT_STRING('b', "branch", &add_data.branch, N_("branch"),
+ N_("branch of repository to add as submodule")),
OPT__FORCE(&force, N_("allow adding an otherwise ignored submodule path"),
PARSE_OPT_NOCOMPLETE),
- OPT__QUIET(&quiet, "suppress output for cloning a submodule"),
+ OPT__QUIET(&quiet, N_("print only error messages")),
+ OPT_BOOL(0, "progress", &progress, N_("force cloning progress")),
+ OPT_STRING(0, "reference", &add_data.reference_path, N_("repository"),
+ N_("reference repository")),
+ OPT_BOOL(0, "dissociate", &dissociate, N_("borrow the objects from reference repositories")),
+ OPT_STRING(0, "name", &add_data.sm_name, N_("name"),
+ N_("sets the submodule’s name to the given string "
+ "instead of defaulting to its path")),
+ OPT_INTEGER(0, "depth", &add_data.depth, N_("depth for shallow clones")),
OPT_END()
};
const char *const usage[] = {
- N_("git submodule--helper add-clone [<options>...] "
- "--url <url> --path <path> --name <name>"),
+ N_("git submodule--helper add [<options>] [--] <repository> [<path>]"),
NULL
};
argc = parse_options(argc, argv, prefix, options, usage, 0);
- if (argc != 0)
+ if (!is_writing_gitmodules_ok())
+ die(_("please make sure that the .gitmodules file is in the working tree"));
+
+ if (prefix && *prefix &&
+ add_data.reference_path && !is_absolute_path(add_data.reference_path))
+ add_data.reference_path = xstrfmt("%s%s", prefix, add_data.reference_path);
+
+ if (argc == 0 || argc > 2)
usage_with_options(usage, options);
+ add_data.repo = argv[0];
+ if (argc == 1)
+ add_data.sm_path = git_url_basename(add_data.repo, 0, 0);
+ else
+ add_data.sm_path = xstrdup(argv[1]);
+
+ if (prefix && *prefix && !is_absolute_path(add_data.sm_path))
+ add_data.sm_path = xstrfmt("%s%s", prefix, add_data.sm_path);
+
+ if (starts_with_dot_dot_slash(add_data.repo) ||
+ starts_with_dot_slash(add_data.repo)) {
+ if (prefix)
+ die(_("Relative path can only be used from the toplevel "
+ "of the working tree"));
+
+ /* dereference source url relative to parent's url */
+ add_data.realrepo = resolve_relative_url(add_data.repo, NULL, 1);
+ } else if (is_dir_sep(add_data.repo[0]) || strchr(add_data.repo, ':')) {
+ add_data.realrepo = add_data.repo;
+ } else {
+ die(_("repo URL: '%s' must be absolute or begin with ./|../"),
+ add_data.repo);
+ }
+
+ /*
+ * normalize path:
+ * multiple //; leading ./; /./; /../;
+ */
+ normalize_path_copy(add_data.sm_path, add_data.sm_path);
+ strip_dir_trailing_slashes(add_data.sm_path);
+
+ die_on_index_match(add_data.sm_path, force);
+ die_on_repo_without_commits(add_data.sm_path);
+
+ if (!force) {
+ int exit_code = -1;
+ struct strbuf sb = STRBUF_INIT;
+ struct child_process cp = CHILD_PROCESS_INIT;
+ cp.git_cmd = 1;
+ cp.no_stdout = 1;
+ strvec_pushl(&cp.args, "add", "--dry-run", "--ignore-missing",
+ "--no-warn-embedded-repo", add_data.sm_path, NULL);
+ if ((exit_code = pipe_command(&cp, NULL, 0, NULL, 0, &sb, 0))) {
+ strbuf_complete_line(&sb);
+ fputs(sb.buf, stderr);
+ free(add_data.sm_path);
+ return exit_code;
+ }
+ strbuf_release(&sb);
+ }
+
+ if(!add_data.sm_name)
+ add_data.sm_name = add_data.sm_path;
+
+ if (check_submodule_name(add_data.sm_name))
+ die(_("'%s' is not a valid submodule name"), add_data.sm_name);
+
add_data.prefix = prefix;
- add_data.progress = !!progress;
- add_data.dissociate = !!dissociate;
add_data.force = !!force;
add_data.quiet = !!quiet;
+ add_data.progress = !!progress;
+ add_data.dissociate = !!dissociate;
- if (add_submodule(&add_data))
+ if (add_submodule(&add_data)) {
+ free(add_data.sm_path);
return 1;
+ }
+ configure_added_submodule(&add_data);
+ free(add_data.sm_path);
return 0;
}
@@ -2948,12 +3367,12 @@
{"list", module_list, 0},
{"name", module_name, 0},
{"clone", module_clone, 0},
- {"add-clone", add_clone, 0},
+ {"add", module_add, SUPPORT_SUPER_PREFIX},
{"update-module-mode", module_update_module_mode, 0},
{"update-clone", update_clone, 0},
+ {"run-update-procedure", run_update_procedure, 0},
{"ensure-core-worktree", ensure_core_worktree, 0},
{"relative-path", resolve_relative_path, 0},
- {"resolve-relative-url", resolve_relative_url, 0},
{"resolve-relative-url-test", resolve_relative_url_test, 0},
{"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
{"init", module_init, SUPPORT_SUPER_PREFIX},
diff --git a/builtin/tag.c b/builtin/tag.c
index 87552ae..6fe6467 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -23,10 +23,10 @@
static const char * const git_tag_usage[] = {
N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
- "\t\t<tagname> [<head>]"),
+ " <tagname> [<head>]"),
N_("git tag -d <tagname>..."),
N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
- "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
+ " [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
N_("git tag -v [--format=<format>] <tagname>..."),
NULL
};
@@ -146,7 +146,7 @@
const struct object_id *oid, void *cb_data)
{
int flags;
- const struct ref_format *format = cb_data;
+ struct ref_format *format = cb_data;
flags = GPG_VERIFY_VERBOSE;
if (format->format)
@@ -432,7 +432,7 @@
int annotate = 0, force = 0;
int cmdmode = 0, create_tag_object = 0;
const char *msgfile = NULL, *keyid = NULL;
- struct msg_arg msg = { 0, STRBUF_INIT };
+ struct msg_arg msg = { .buf = STRBUF_INIT };
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
struct ref_filter filter;
@@ -482,6 +482,7 @@
OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
OPT_END()
};
+ int ret = 0;
setup_ref_filter_porcelain_msg();
@@ -529,7 +530,6 @@
ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
filter.ignore_case = icase;
if (cmdmode == 'l') {
- int ret;
if (column_active(colopts)) {
struct column_options copts;
memset(&copts, 0, sizeof(copts));
@@ -540,7 +540,7 @@
ret = list_tags(&filter, sorting, &format);
if (column_active(colopts))
stop_column_filter();
- return ret;
+ goto cleanup;
}
if (filter.lines != -1)
die(_("-n option is only allowed in list mode"));
@@ -552,12 +552,15 @@
die(_("--points-at option is only allowed in list mode"));
if (filter.reachable_from || filter.unreachable_from)
die(_("--merged and --no-merged options are only allowed in list mode"));
- if (cmdmode == 'd')
- return delete_tags(argv);
+ if (cmdmode == 'd') {
+ ret = delete_tags(argv);
+ goto cleanup;
+ }
if (cmdmode == 'v') {
if (format.format && verify_ref_format(&format))
usage_with_options(git_tag_usage, options);
- return for_each_tag_name(argv, verify_tag, &format);
+ ret = for_each_tag_name(argv, verify_tag, &format);
+ goto cleanup;
}
if (msg.given || msgfile) {
@@ -626,10 +629,12 @@
printf(_("Updated tag '%s' (was %s)\n"), tag,
find_unique_abbrev(&prev, DEFAULT_ABBREV));
- UNLEAK(buf);
- UNLEAK(ref);
- UNLEAK(reflog_msg);
- UNLEAK(msg);
- UNLEAK(err);
- return 0;
+cleanup:
+ ref_sorting_release(sorting);
+ strbuf_release(&buf);
+ strbuf_release(&ref);
+ strbuf_release(&reflog_msg);
+ strbuf_release(&msg.buf);
+ strbuf_release(&err);
+ return ret;
}
diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 6da8fa2..125af53 100644
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -16,16 +16,18 @@
{
const char *dir;
int strict = 0;
- struct upload_pack_options opts = { 0 };
- struct serve_options serve_opts = SERVE_OPTIONS_INIT;
+ int advertise_refs = 0;
+ int stateless_rpc = 0;
+ int timeout = 0;
struct option options[] = {
- OPT_BOOL(0, "stateless-rpc", &opts.stateless_rpc,
+ OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
N_("quit after a single request/response exchange")),
- OPT_BOOL(0, "advertise-refs", &opts.advertise_refs,
- N_("exit immediately after initial ref advertisement")),
+ OPT_HIDDEN_BOOL(0, "http-backend-info-refs", &advertise_refs,
+ N_("serve up the info/refs for git-http-backend")),
+ OPT_ALIAS(0, "advertise-refs", "http-backend-info-refs"),
OPT_BOOL(0, "strict", &strict,
N_("do not try <directory>/.git/ if <directory> is no Git directory")),
- OPT_INTEGER(0, "timeout", &opts.timeout,
+ OPT_INTEGER(0, "timeout", &timeout,
N_("interrupt transfer after <n> seconds of inactivity")),
OPT_END()
};
@@ -38,9 +40,6 @@
if (argc != 1)
usage_with_options(upload_pack_usage, options);
- if (opts.timeout)
- opts.daemon_mode = 1;
-
setup_path();
dir = argv[0];
@@ -50,21 +49,22 @@
switch (determine_protocol_version_server()) {
case protocol_v2:
- serve_opts.advertise_capabilities = opts.advertise_refs;
- serve_opts.stateless_rpc = opts.stateless_rpc;
- serve(&serve_opts);
+ if (advertise_refs)
+ protocol_v2_advertise_capabilities();
+ else
+ protocol_v2_serve_loop(stateless_rpc);
break;
case protocol_v1:
/*
* v1 is just the original protocol with a version string,
* so just fall through after writing the version string.
*/
- if (opts.advertise_refs || !opts.stateless_rpc)
+ if (advertise_refs || !stateless_rpc)
packet_write_fmt(1, "version 1\n");
/* fallthrough */
case protocol_v0:
- upload_pack(&opts);
+ upload_pack(advertise_refs, stateless_rpc, timeout);
break;
case protocol_unknown_version:
BUG("unknown protocol version");
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 0d0a80d..d22ece9 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -8,6 +8,7 @@
#include "branch.h"
#include "refs.h"
#include "run-command.h"
+#include "hook.h"
#include "sigchain.h"
#include "submodule.h"
#include "utf8.h"
diff --git a/bundle.c b/bundle.c
index ab63f40..a0bb687 100644
--- a/bundle.c
+++ b/bundle.c
@@ -569,18 +569,18 @@
}
int unbundle(struct repository *r, struct bundle_header *header,
- int bundle_fd, int flags)
+ int bundle_fd, struct strvec *extra_index_pack_args)
{
- const char *argv_index_pack[] = {"index-pack",
- "--fix-thin", "--stdin", NULL, NULL};
struct child_process ip = CHILD_PROCESS_INIT;
+ strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL);
- if (flags & BUNDLE_VERBOSE)
- argv_index_pack[3] = "-v";
+ if (extra_index_pack_args) {
+ strvec_pushv(&ip.args, extra_index_pack_args->v);
+ strvec_clear(extra_index_pack_args);
+ }
if (verify_bundle(r, header, 0))
return -1;
- ip.argv = argv_index_pack;
ip.in = bundle_fd;
ip.no_stdout = 1;
ip.git_cmd = 1;
diff --git a/bundle.h b/bundle.h
index 1927d8c..06009fe 100644
--- a/bundle.h
+++ b/bundle.h
@@ -26,9 +26,19 @@
int argc, const char **argv, struct strvec *pack_options,
int version);
int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
-#define BUNDLE_VERBOSE 1
+
+/**
+ * Unbundle after reading the header with read_bundle_header().
+ *
+ * We'll invoke "git index-pack --stdin --fix-thin" for you on the
+ * provided `bundle_fd` from read_bundle_header().
+ *
+ * Provide "extra_index_pack_args" to pass any extra arguments
+ * (e.g. "-v" for verbose/progress), NULL otherwise. The provided
+ * "extra_index_pack_args" (if any) will be strvec_clear()'d for you.
+ */
int unbundle(struct repository *r, struct bundle_header *header,
- int bundle_fd, int flags);
+ int bundle_fd, struct strvec *extra_index_pack_args);
int list_bundle_refs(struct bundle_header *header,
int argc, const char **argv);
diff --git a/cache-tree.c b/cache-tree.c
index 90919f9..79d1681 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -440,8 +440,9 @@
} else if (dryrun) {
hash_object_file(the_hash_algo, buffer.buf, buffer.len,
tree_type, &it->oid);
- } else if (write_object_file(buffer.buf, buffer.len, tree_type,
- &it->oid)) {
+ } else if (write_object_file_flags(buffer.buf, buffer.len, tree_type,
+ &it->oid, flags & WRITE_TREE_SILENT
+ ? HASH_SILENT : 0)) {
strbuf_release(&buffer);
return -1;
}
@@ -826,10 +827,17 @@
path->buf);
}
-static void verify_one(struct repository *r,
- struct index_state *istate,
- struct cache_tree *it,
- struct strbuf *path)
+/*
+ * Returns:
+ * 0 - Verification completed.
+ * 1 - Restart verification - a call to ensure_full_index() freed the cache
+ * tree that is being verified and verification needs to be restarted from
+ * the new toplevel cache tree.
+ */
+static int verify_one(struct repository *r,
+ struct index_state *istate,
+ struct cache_tree *it,
+ struct strbuf *path)
{
int i, pos, len = path->len;
struct strbuf tree_buf = STRBUF_INIT;
@@ -837,21 +845,30 @@
for (i = 0; i < it->subtree_nr; i++) {
strbuf_addf(path, "%s/", it->down[i]->name);
- verify_one(r, istate, it->down[i]->cache_tree, path);
+ if (verify_one(r, istate, it->down[i]->cache_tree, path))
+ return 1;
strbuf_setlen(path, len);
}
if (it->entry_count < 0 ||
/* no verification on tests (t7003) that replace trees */
lookup_replace_object(r, &it->oid) != &it->oid)
- return;
+ return 0;
if (path->len) {
+ /*
+ * If the index is sparse and the cache tree is not
+ * index_name_pos() may trigger ensure_full_index() which will
+ * free the tree that is being verified.
+ */
+ int is_sparse = istate->sparse_index;
pos = index_name_pos(istate, path->buf, path->len);
+ if (is_sparse && !istate->sparse_index)
+ return 1;
if (pos >= 0) {
verify_one_sparse(r, istate, it, path, pos);
- return;
+ return 0;
}
pos = -pos - 1;
@@ -899,6 +916,7 @@
oid_to_hex(&new_oid), oid_to_hex(&it->oid));
strbuf_setlen(path, len);
strbuf_release(&tree_buf);
+ return 0;
}
void cache_tree_verify(struct repository *r, struct index_state *istate)
@@ -907,6 +925,10 @@
if (!istate->cache_tree)
return;
- verify_one(r, istate, istate->cache_tree, &path);
+ if (verify_one(r, istate, istate->cache_tree, &path)) {
+ strbuf_reset(&path);
+ if (verify_one(r, istate, istate->cache_tree, &path))
+ BUG("ensure_full_index() called twice while verifying cache tree");
+ }
strbuf_release(&path);
}
diff --git a/cache.h b/cache.h
index 0a8d44c..eba1248 100644
--- a/cache.h
+++ b/cache.h
@@ -887,6 +887,7 @@
#define HASH_WRITE_OBJECT 1
#define HASH_FORMAT_CHECK 2
#define HASH_RENORMALIZE 4
+#define HASH_SILENT 8
int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);
@@ -995,14 +996,6 @@
extern int core_sparse_checkout_cone;
/*
- * Include broken refs in all ref iterations, which will
- * generally choke dangerous operations rather than letting
- * them silently proceed without taking the broken ref into
- * account.
- */
-extern int ref_paranoia;
-
-/*
* Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
*/
int use_optional_locks(void);
@@ -1210,51 +1203,10 @@
enum scld_error safe_create_leading_directories_const(const char *path);
enum scld_error safe_create_leading_directories_no_share(char *path);
-/*
- * Callback function for raceproof_create_file(). This function is
- * expected to do something that makes dirname(path) permanent despite
- * the fact that other processes might be cleaning up empty
- * directories at the same time. Usually it will create a file named
- * path, but alternatively it could create another file in that
- * directory, or even chdir() into that directory. The function should
- * return 0 if the action was completed successfully. On error, it
- * should return a nonzero result and set errno.
- * raceproof_create_file() treats two errno values specially:
- *
- * - ENOENT -- dirname(path) does not exist. In this case,
- * raceproof_create_file() tries creating dirname(path)
- * (and any parent directories, if necessary) and calls
- * the function again.
- *
- * - EISDIR -- the file already exists and is a directory. In this
- * case, raceproof_create_file() removes the directory if
- * it is empty (and recursively any empty directories that
- * it contains) and calls the function again.
- *
- * Any other errno causes raceproof_create_file() to fail with the
- * callback's return value and errno.
- *
- * Obviously, this function should be OK with being called again if it
- * fails with ENOENT or EISDIR. In other scenarios it will not be
- * called again.
- */
-typedef int create_file_fn(const char *path, void *cb);
-
-/*
- * Create a file in dirname(path) by calling fn, creating leading
- * directories if necessary. Retry a few times in case we are racing
- * with another process that is trying to clean up the directory that
- * contains path. See the documentation for create_file_fn for more
- * details.
- *
- * Return the value and set the errno that resulted from the most
- * recent call of fn. fn is always called at least once, and will be
- * called more than once if it returns ENOENT or EISDIR.
- */
-int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
-
int mkdir_in_gitdir(const char *path);
-char *expand_user_path(const char *path, int real_home);
+char *interpolate_path(const char *path, int real_home);
+/* NEEDSWORK: remove this synonym once in-flight topics have migrated */
+#define expand_user_path interpolate_path
const char *enter_repo(const char *path, int strict);
static inline int is_absolute_path(const char *path)
{
@@ -1296,6 +1248,13 @@
/**
* Return a newly allocated string with the evaluation of
+ * "$XDG_CONFIG_HOME/$subdir/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise
+ * "$HOME/.config/$subdir/$filename". Return NULL upon error.
+ */
+char *xdg_config_home_for(const char *subdir, const char *filename);
+
+/**
+ * Return a newly allocated string with the evaluation of
* "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise
* "$HOME/.config/git/$filename". Return NULL upon error.
*/
@@ -1310,11 +1269,50 @@
int git_open_cloexec(const char *name, int flags);
#define git_open(name) git_open_cloexec(name, O_RDONLY)
-int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
-int parse_loose_header(const char *hdr, unsigned long *sizep);
+
+/**
+ * unpack_loose_header() initializes the data stream needed to unpack
+ * a loose object header.
+ *
+ * Returns:
+ *
+ * - ULHR_OK on success
+ * - ULHR_BAD on error
+ * - ULHR_TOO_LONG if the header was too long
+ *
+ * It will only parse up to MAX_HEADER_LEN bytes unless an optional
+ * "hdrbuf" argument is non-NULL. This is intended for use with
+ * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)
+ * reporting. The full header will be extracted to "hdrbuf" for use
+ * with parse_loose_header(), ULHR_TOO_LONG will still be returned
+ * from this function to indicate that the header was too long.
+ */
+enum unpack_loose_header_result {
+ ULHR_OK,
+ ULHR_BAD,
+ ULHR_TOO_LONG,
+};
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+ unsigned char *map,
+ unsigned long mapsize,
+ void *buffer,
+ unsigned long bufsiz,
+ struct strbuf *hdrbuf);
+
+/**
+ * parse_loose_header() parses the starting "<type> <len>\0" of an
+ * object. If it doesn't follow that format -1 is returned. To check
+ * the validity of the <type> populate the "typep" in the "struct
+ * object_info". It will be OBJ_BAD if the object type is unknown. The
+ * parsed <len> can be retrieved via "oi->sizep", and from there
+ * passed to unpack_loose_rest().
+ */
+struct object_info;
+int parse_loose_header(const char *hdr, struct object_info *oi);
int check_object_signature(struct repository *r, const struct object_id *oid,
- void *buf, unsigned long size, const char *type);
+ void *buf, unsigned long size, const char *type,
+ struct object_id *real_oidp);
int finalize_object_file(const char *tmpfile, const char *filename);
@@ -1659,7 +1657,9 @@
int track_flags;
int prefix_len_stat_func;
};
-#define CACHE_DEF_INIT { STRBUF_INIT, 0, 0, 0 }
+#define CACHE_DEF_INIT { \
+ .path = STRBUF_INIT, \
+}
static inline void cache_def_clear(struct cache_def *cache)
{
strbuf_release(&cache->path);
@@ -1716,13 +1716,6 @@
const char *get_log_output_encoding(void);
const char *get_commit_output_encoding(void);
-/*
- * This is a hack for test programs like test-dump-untracked-cache to
- * ensure that they do not modify the untracked cache when reading it.
- * Do not use it otherwise!
- */
-extern int ignore_untracked_cache_config;
-
int committer_ident_sufficiently_given(void);
int author_ident_sufficiently_given(void);
@@ -1735,6 +1728,8 @@
void maybe_flush_or_die(FILE *, const char *);
__attribute__((format (printf, 2, 3)))
void fprintf_or_die(FILE *, const char *fmt, ...);
+void fwrite_or_die(FILE *f, const void *buf, size_t count);
+void fflush_or_die(FILE *f);
#define COPY_READ_ERROR (-2)
#define COPY_WRITE_ERROR (-3)
diff --git a/cbtree.h b/cbtree.h
index a04a312..dedbb8e 100644
--- a/cbtree.h
+++ b/cbtree.h
@@ -37,11 +37,12 @@
CB_BREAK = 1
};
-#define CBTREE_INIT { .root = NULL }
+#define CBTREE_INIT { 0 }
static inline void cb_init(struct cb_tree *t)
{
- t->root = NULL;
+ struct cb_tree blank = CBTREE_INIT;
+ memcpy(t, &blank, sizeof(*t));
}
struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);
diff --git a/checkout.c b/checkout.c
index 6586e30..2e39dae 100644
--- a/checkout.c
+++ b/checkout.c
@@ -14,7 +14,7 @@
struct object_id *default_dst_oid;
};
-#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 0, NULL, NULL, NULL }
+#define TRACKING_NAME_DATA_INIT { 0 }
static int check_tracking_name(struct remote *remote, void *cb_data)
{
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 5772081..1d0e48f 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -12,7 +12,7 @@
libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
case "$jobname" in
-linux-clang|linux-gcc)
+linux-clang|linux-gcc|linux-leaks)
sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
sudo apt-get -q update
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
diff --git a/ci/lib.sh b/ci/lib.sh
index 476c3f3..82cb17f 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -183,7 +183,7 @@
export SKIP_DASHED_BUILT_INS=YesPlease
case "$jobname" in
-linux-clang|linux-gcc)
+linux-clang|linux-gcc|linux-leaks)
if [ "$jobname" = linux-gcc ]
then
export CC=gcc-8
@@ -233,4 +233,11 @@
;;
esac
+case "$jobname" in
+linux-leaks)
+ export SANITIZE=leak
+ export GIT_TEST_PASSING_SANITIZE_LEAK=true
+ ;;
+esac
+
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index f3aba5d..cc62616 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -28,6 +28,7 @@
export GIT_TEST_COMMIT_GRAPH=1
export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
export GIT_TEST_MULTI_PACK_INDEX=1
+ export GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=1
export GIT_TEST_ADD_I_USE_BUILTIN=1
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_WRITE_REV_INDEX=1
diff --git a/command-list.txt b/command-list.txt
index a289f09..eb9cee8 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -168,7 +168,7 @@
git-show-ref plumbinginterrogators
git-sh-i18n purehelpers
git-sh-setup purehelpers
-git-sparse-checkout mainporcelain worktree
+git-sparse-checkout mainporcelain
git-stash mainporcelain
git-stage complete
git-status mainporcelain info
diff --git a/commit-graph.c b/commit-graph.c
index 3860a0d..2706683 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -713,6 +713,7 @@
if (!g)
return;
+ clear_commit_graph_data_slab(&commit_graph_data_slab);
close_commit_graph_one(g->base_graph);
free_commit_graph(g);
}
@@ -723,7 +724,7 @@
o->commit_graph = NULL;
}
-static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos)
+static int bsearch_graph(struct commit_graph *g, const struct object_id *oid, uint32_t *pos)
{
return bsearch_hash(oid->hash, g->chunk_oid_fanout,
g->chunk_oid_lookup, g->hash_len, pos);
@@ -864,28 +865,57 @@
return 1;
}
-static int find_commit_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos)
+static int search_commit_pos_in_graph(const struct object_id *id, struct commit_graph *g, uint32_t *pos)
+{
+ struct commit_graph *cur_g = g;
+ uint32_t lex_index;
+
+ while (cur_g && !bsearch_graph(cur_g, id, &lex_index))
+ cur_g = cur_g->base_graph;
+
+ if (cur_g) {
+ *pos = lex_index + cur_g->num_commits_in_base;
+ return 1;
+ }
+
+ return 0;
+}
+
+static int find_commit_pos_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos)
{
uint32_t graph_pos = commit_graph_position(item);
if (graph_pos != COMMIT_NOT_FROM_GRAPH) {
*pos = graph_pos;
return 1;
} else {
- struct commit_graph *cur_g = g;
- uint32_t lex_index;
-
- while (cur_g && !bsearch_graph(cur_g, &(item->object.oid), &lex_index))
- cur_g = cur_g->base_graph;
-
- if (cur_g) {
- *pos = lex_index + cur_g->num_commits_in_base;
- return 1;
- }
-
- return 0;
+ return search_commit_pos_in_graph(&item->object.oid, g, pos);
}
}
+struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id)
+{
+ struct commit *commit;
+ uint32_t pos;
+
+ if (!repo->objects->commit_graph)
+ return NULL;
+ if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos))
+ return NULL;
+ if (!repo_has_object_file(repo, id))
+ return NULL;
+
+ commit = lookup_commit(repo, id);
+ if (!commit)
+ return NULL;
+ if (commit->object.parsed)
+ return commit;
+
+ if (!fill_commit_in_graph(repo, commit, repo->objects->commit_graph, pos))
+ return NULL;
+
+ return commit;
+}
+
static int parse_commit_in_graph_one(struct repository *r,
struct commit_graph *g,
struct commit *item)
@@ -895,7 +925,7 @@
if (item->object.parsed)
return 1;
- if (find_commit_in_graph(item, g, &pos))
+ if (find_commit_pos_in_graph(item, g, &pos))
return fill_commit_in_graph(r, item, g, pos);
return 0;
@@ -921,7 +951,7 @@
uint32_t pos;
if (!prepare_commit_graph(r))
return;
- if (find_commit_in_graph(item, r->objects->commit_graph, &pos))
+ if (find_commit_pos_in_graph(item, r->objects->commit_graph, &pos))
fill_commit_graph_info(item, r->objects->commit_graph, pos);
}
@@ -1091,9 +1121,9 @@
edge_value += ctx->new_num_commits_in_base;
else if (ctx->new_base_graph) {
uint32_t pos;
- if (find_commit_in_graph(parent->item,
- ctx->new_base_graph,
- &pos))
+ if (find_commit_pos_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
edge_value = pos;
}
@@ -1122,9 +1152,9 @@
edge_value += ctx->new_num_commits_in_base;
else if (ctx->new_base_graph) {
uint32_t pos;
- if (find_commit_in_graph(parent->item,
- ctx->new_base_graph,
- &pos))
+ if (find_commit_pos_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
edge_value = pos;
}
@@ -1235,9 +1265,9 @@
edge_value += ctx->new_num_commits_in_base;
else if (ctx->new_base_graph) {
uint32_t pos;
- if (find_commit_in_graph(parent->item,
- ctx->new_base_graph,
- &pos))
+ if (find_commit_pos_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
edge_value = pos;
}
@@ -2096,7 +2126,7 @@
ctx->num_extra_edges = 0;
for (i = 0; i < ctx->commits.nr; i++) {
- display_progress(ctx->progress, i);
+ display_progress(ctx->progress, i + 1);
if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
&ctx->commits.list[i]->object.oid)) {
diff --git a/commit-graph.h b/commit-graph.h
index 96c24fb..04a94e1 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -41,6 +41,14 @@
int parse_commit_in_graph(struct repository *r, struct commit *item);
/*
+ * Look up the given commit ID in the commit-graph. This will only return a
+ * commit if the ID exists both in the graph and in the object database such
+ * that we don't return commits whose object has been pruned. Otherwise, this
+ * function returns `NULL`.
+ */
+struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id);
+
+/*
* It is possible that we loaded commit contents from the commit buffer,
* but we also want to ensure the commit-graph content is correctly
* checked and filled. Fill the graph_pos and generation members of
diff --git a/commit.c b/commit.c
index 143f472..551de49 100644
--- a/commit.c
+++ b/commit.c
@@ -25,6 +25,7 @@
static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
int save_commit_buffer = 1;
+int no_graft_file_deprecated_advice;
const char *commit_type = "commit";
@@ -190,7 +191,8 @@
struct strbuf buf = STRBUF_INIT;
if (!fp)
return -1;
- if (advice_graft_file_deprecated)
+ if (!no_graft_file_deprecated_advice &&
+ advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED))
advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
diff --git a/commit.h b/commit.h
index df42eb4..3ea3276 100644
--- a/commit.h
+++ b/commit.h
@@ -41,6 +41,7 @@
};
extern int save_commit_buffer;
+extern int no_graft_file_deprecated_advice;
extern const char *commit_type;
/* While we can decorate any object with a name, it's only used for commits.. */
diff --git a/compat/linux/procinfo.c b/compat/linux/procinfo.c
new file mode 100644
index 0000000..bc2f938
--- /dev/null
+++ b/compat/linux/procinfo.c
@@ -0,0 +1,176 @@
+#include "cache.h"
+
+#include "strbuf.h"
+#include "strvec.h"
+#include "trace2.h"
+
+/*
+ * We need more complex parsing in stat_parent_pid() and
+ * parse_proc_stat() below than a dumb fscanf(). That's because while
+ * the statcomm field is surrounded by parentheses, the process itself
+ * is free to insert any arbitrary byte sequence its its name. That
+ * can include newlines, spaces, closing parentheses etc.
+ *
+ * See do_task_stat() in fs/proc/array.c in linux.git, this is in
+ * contrast with the escaped version of the name found in
+ * /proc/%d/status.
+ *
+ * So instead of using fscanf() we'll read N bytes from it, look for
+ * the first "(", and then the last ")", anything in-between is our
+ * process name.
+ *
+ * How much N do we need? On Linux /proc/sys/kernel/pid_max is 2^15 by
+ * default, but it can be raised set to values of up to 2^22. So
+ * that's 7 digits for a PID. We have 2 PIDs in the first four fields
+ * we're interested in, so 2 * 7 = 14.
+ *
+ * We then have 3 spaces between those four values, and we'd like to
+ * get to the space between the 4th and the 5th (the "pgrp" field) to
+ * make sure we read the entire "ppid" field. So that brings us up to
+ * 14 + 3 + 1 = 18. Add the two parentheses around the "comm" value
+ * and it's 20. The "state" value itself is then one character (now at
+ * 21).
+ *
+ * Finally the maximum length of the "comm" name itself is 15
+ * characters, e.g. a setting of "123456789abcdefg" will be truncated
+ * to "123456789abcdef". See PR_SET_NAME in prctl(2). So all in all
+ * we'd need to read 21 + 15 = 36 bytes.
+ *
+ * Let's just read 2^6 (64) instead for good measure. If PID_MAX ever
+ * grows past 2^22 we'll be future-proof. We'll then anchor at the
+ * last ")" we find to locate the parent PID.
+ */
+#define STAT_PARENT_PID_READ_N 64
+
+static int parse_proc_stat(struct strbuf *sb, struct strbuf *name,
+ int *statppid)
+{
+ const char *comm_lhs = strchr(sb->buf, '(');
+ const char *comm_rhs = strrchr(sb->buf, ')');
+ const char *ppid_lhs, *ppid_rhs;
+ char *p;
+ pid_t ppid;
+
+ if (!comm_lhs || !comm_rhs)
+ goto bad_kernel;
+
+ /*
+ * We're at the ")", that's followed by " X ", where X is a
+ * single "state" character. So advance by 4 bytes.
+ */
+ ppid_lhs = comm_rhs + 4;
+
+ /*
+ * Read until the space between the "ppid" and "pgrp" fields
+ * to make sure we're anchored after the untruncated "ppid"
+ * field..
+ */
+ ppid_rhs = strchr(ppid_lhs, ' ');
+ if (!ppid_rhs)
+ goto bad_kernel;
+
+ ppid = strtol(ppid_lhs, &p, 10);
+ if (ppid_rhs == p) {
+ const char *comm = comm_lhs + 1;
+ size_t commlen = comm_rhs - comm;
+
+ strbuf_add(name, comm, commlen);
+ *statppid = ppid;
+
+ return 0;
+ }
+
+bad_kernel:
+ /*
+ * We were able to read our STAT_PARENT_PID_READ_N bytes from
+ * /proc/%d/stat, but the content is bad. Broken kernel?
+ * Should not happen, but handle it gracefully.
+ */
+ return -1;
+}
+
+static int stat_parent_pid(pid_t pid, struct strbuf *name, int *statppid)
+{
+ struct strbuf procfs_path = STRBUF_INIT;
+ struct strbuf sb = STRBUF_INIT;
+ FILE *fp;
+ int ret = -1;
+
+ /* try to use procfs if it's present. */
+ strbuf_addf(&procfs_path, "/proc/%d/stat", pid);
+ fp = fopen(procfs_path.buf, "r");
+ if (!fp)
+ goto cleanup;
+
+ /*
+ * We could be more strict here and assert that we read at
+ * least STAT_PARENT_PID_READ_N. My reading of procfs(5) is
+ * that on any modern kernel (at least since 2.6.0 released in
+ * 2003) even if all the mandatory numeric fields were zero'd
+ * out we'd get at least 100 bytes, but let's just check that
+ * we got anything at all and trust the parse_proc_stat()
+ * function to handle its "Bad Kernel?" error checking.
+ */
+ if (!strbuf_fread(&sb, STAT_PARENT_PID_READ_N, fp))
+ goto cleanup;
+ if (parse_proc_stat(&sb, name, statppid) < 0)
+ goto cleanup;
+
+ ret = 0;
+cleanup:
+ if (fp)
+ fclose(fp);
+ strbuf_release(&procfs_path);
+ strbuf_release(&sb);
+
+ return ret;
+}
+
+static void push_ancestry_name(struct strvec *names, pid_t pid)
+{
+ struct strbuf name = STRBUF_INIT;
+ int ppid;
+
+ if (stat_parent_pid(pid, &name, &ppid) < 0)
+ goto cleanup;
+
+ strvec_push(names, name.buf);
+
+ /*
+ * Both errors and reaching the end of the process chain are
+ * reported as fields of 0 by proc(5)
+ */
+ if (ppid)
+ push_ancestry_name(names, ppid);
+cleanup:
+ strbuf_release(&name);
+
+ return;
+}
+
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+ struct strvec names = STRVEC_INIT;
+
+ if (!trace2_is_enabled())
+ return;
+
+ switch (reason) {
+ case TRACE2_PROCESS_INFO_EXIT:
+ /*
+ * The Windows version of this calls its
+ * get_peak_memory_info() here. We may want to insert
+ * similar process-end statistics here in the future.
+ */
+ break;
+ case TRACE2_PROCESS_INFO_STARTUP:
+ push_ancestry_name(&names, getppid());
+
+ if (names.nr)
+ trace2_cmd_ancestry(names.v);
+ strvec_clear(&names);
+ break;
+ }
+
+ return;
+}
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index 1cc31c3..edb438a 100644
--- a/compat/nedmalloc/nedmalloc.c
+++ b/compat/nedmalloc/nedmalloc.c
@@ -510,7 +510,7 @@
assert(idx<=THREADCACHEMAXBINS);
if(tck==*binsptr)
{
- fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", tck);
+ fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", (void *)tck);
abort();
}
#ifdef FULLSANITYCHECKS
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
index 1927e6e..28a7928 100644
--- a/compat/simple-ipc/ipc-unix-socket.c
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -35,6 +35,28 @@
}
}
+#ifdef __CYGWIN__
+ /*
+ * Cygwin emulates Unix sockets by writing special-crafted files whose
+ * `system` bit is set.
+ *
+ * If we are too fast, Cygwin might still be in the process of marking
+ * the underlying file as a system file. Until then, we will not see a
+ * Unix socket here, but a plain file instead. Just in case that this
+ * is happening, wait a little and try again.
+ */
+ {
+ static const int delay[] = { 1, 10, 20, 40, -1 };
+ int i;
+
+ for (i = 0; S_ISREG(st.st_mode) && delay[i] > 0; i++) {
+ sleep_millisec(delay[i]);
+ if (lstat(path, &st) == -1)
+ return IPC_STATE__INVALID_PATH;
+ }
+ }
+#endif
+
/* also complain if a plain file is in the way */
if ((st.st_mode & S_IFMT) != S_IFSOCK)
return IPC_STATE__INVALID_PATH;
@@ -168,7 +190,8 @@
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = 0;
@@ -176,7 +199,7 @@
trace2_region_enter("ipc-client", "send-command", NULL);
- if (write_packetized_from_buf_no_flush(message, strlen(message),
+ if (write_packetized_from_buf_no_flush(message, message_len,
connection->fd) < 0 ||
packet_flush_gently(connection->fd) < 0) {
ret = error(_("could not send IPC command"));
@@ -197,7 +220,8 @@
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = -1;
enum ipc_active_state state;
@@ -208,7 +232,9 @@
if (state != IPC_STATE__LISTENING)
return ret;
- ret = ipc_client_send_command_to_connection(connection, message, answer);
+ ret = ipc_client_send_command_to_connection(connection,
+ message, message_len,
+ answer);
ipc_client_close_connection(connection);
@@ -503,7 +529,7 @@
if (ret >= 0) {
ret = worker_thread_data->server_data->application_cb(
worker_thread_data->server_data->application_data,
- buf.buf, do_io_reply_callback, &reply_data);
+ buf.buf, buf.len, do_io_reply_callback, &reply_data);
packet_flush_gently(reply_data.fd);
}
diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index 8dc7bda..20ea7b6 100644
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -3,6 +3,8 @@
#include "strbuf.h"
#include "pkt-line.h"
#include "thread-utils.h"
+#include "accctrl.h"
+#include "aclapi.h"
#ifndef SUPPORTS_SIMPLE_IPC
/*
@@ -49,6 +51,9 @@
if (GetLastError() == ERROR_FILE_NOT_FOUND)
return IPC_STATE__PATH_NOT_FOUND;
+ trace2_data_intmax("ipc-debug", NULL, "getstate/waitpipe/gle",
+ (intmax_t)GetLastError());
+
return IPC_STATE__OTHER_ERROR;
}
@@ -109,9 +114,15 @@
t_start_ms = (DWORD)(getnanotime() / 1000000);
if (!WaitNamedPipeW(wpath, timeout_ms)) {
- if (GetLastError() == ERROR_SEM_TIMEOUT)
+ DWORD gleWait = GetLastError();
+
+ if (gleWait == ERROR_SEM_TIMEOUT)
return IPC_STATE__NOT_LISTENING;
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/waitpipe/gle",
+ (intmax_t)gleWait);
+
return IPC_STATE__OTHER_ERROR;
}
@@ -133,17 +144,31 @@
break; /* try again */
default:
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/createfile/gle",
+ (intmax_t)gle);
+
return IPC_STATE__OTHER_ERROR;
}
}
if (!SetNamedPipeHandleState(hPipe, &mode, NULL, NULL)) {
+ gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/setpipestate/gle",
+ (intmax_t)gle);
+
CloseHandle(hPipe);
return IPC_STATE__OTHER_ERROR;
}
*pfd = _open_osfhandle((intptr_t)hPipe, O_RDWR|O_BINARY);
if (*pfd < 0) {
+ gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL,
+ "connect/openosfhandle/gle",
+ (intmax_t)gle);
+
CloseHandle(hPipe);
return IPC_STATE__OTHER_ERROR;
}
@@ -208,7 +233,8 @@
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer)
+ const char *message, size_t message_len,
+ struct strbuf *answer)
{
int ret = 0;
@@ -216,7 +242,7 @@
trace2_region_enter("ipc-client", "send-command", NULL);
- if (write_packetized_from_buf_no_flush(message, strlen(message),
+ if (write_packetized_from_buf_no_flush(message, message_len,
connection->fd) < 0 ||
packet_flush_gently(connection->fd) < 0) {
ret = error(_("could not send IPC command"));
@@ -239,7 +265,8 @@
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *response)
+ const char *message, size_t message_len,
+ struct strbuf *response)
{
int ret = -1;
enum ipc_active_state state;
@@ -250,7 +277,9 @@
if (state != IPC_STATE__LISTENING)
return ret;
- ret = ipc_client_send_command_to_connection(connection, message, response);
+ ret = ipc_client_send_command_to_connection(connection,
+ message, message_len,
+ response);
ipc_client_close_connection(connection);
@@ -458,7 +487,7 @@
if (ret >= 0) {
ret = server_thread_data->server_data->application_cb(
server_thread_data->server_data->application_data,
- buf.buf, do_io_reply_callback, &reply_data);
+ buf.buf, buf.len, do_io_reply_callback, &reply_data);
packet_flush_gently(reply_data.fd);
@@ -565,11 +594,132 @@
return NULL;
}
+/*
+ * We need to build a Windows "SECURITY_ATTRIBUTES" object and use it
+ * to apply an ACL when we create the initial instance of the Named
+ * Pipe. The construction is somewhat involved and consists of
+ * several sequential steps and intermediate objects.
+ *
+ * We use this structure to hold these intermediate pointers so that
+ * we can free them as a group. (It is unclear from the docs whether
+ * some of these intermediate pointers can be freed before we are
+ * finished using the "lpSA" member.)
+ */
+struct my_sa_data
+{
+ PSID pEveryoneSID;
+ PACL pACL;
+ PSECURITY_DESCRIPTOR pSD;
+ LPSECURITY_ATTRIBUTES lpSA;
+};
+
+static void init_sa(struct my_sa_data *d)
+{
+ memset(d, 0, sizeof(*d));
+}
+
+static void release_sa(struct my_sa_data *d)
+{
+ if (d->pEveryoneSID)
+ FreeSid(d->pEveryoneSID);
+ if (d->pACL)
+ LocalFree(d->pACL);
+ if (d->pSD)
+ LocalFree(d->pSD);
+ if (d->lpSA)
+ LocalFree(d->lpSA);
+
+ memset(d, 0, sizeof(*d));
+}
+
+/*
+ * Create SECURITY_ATTRIBUTES to apply to the initial named pipe. The
+ * creator of the first server instance gets to set the ACLs on it.
+ *
+ * We allow the well-known group `EVERYONE` to have read+write access
+ * to the named pipe so that clients can send queries to the daemon
+ * and receive the response.
+ *
+ * Normally, this is not necessary since the daemon is usually
+ * automatically started by a foreground command like `git status`,
+ * but in those cases where an elevated Git command started the daemon
+ * (such that the daemon itself runs with elevation), we need to add
+ * the ACL so that non-elevated commands can write to it.
+ *
+ * The following document was helpful:
+ * https://docs.microsoft.com/en-us/windows/win32/secauthz/creating-a-security-descriptor-for-a-new-object-in-c--
+ *
+ * Returns d->lpSA set to a SA or NULL.
+ */
+static LPSECURITY_ATTRIBUTES get_sa(struct my_sa_data *d)
+{
+ SID_IDENTIFIER_AUTHORITY sid_auth_world = SECURITY_WORLD_SID_AUTHORITY;
+#define NR_EA (1)
+ EXPLICIT_ACCESS ea[NR_EA];
+ DWORD dwResult;
+
+ if (!AllocateAndInitializeSid(&sid_auth_world, 1,
+ SECURITY_WORLD_RID, 0,0,0,0,0,0,0,
+ &d->pEveryoneSID)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "alloc-world-sid/gle",
+ (intmax_t)gle);
+ goto fail;
+ }
+
+ memset(ea, 0, NR_EA * sizeof(EXPLICIT_ACCESS));
+
+ ea[0].grfAccessPermissions = GENERIC_READ | GENERIC_WRITE;
+ ea[0].grfAccessMode = SET_ACCESS;
+ ea[0].grfInheritance = NO_INHERITANCE;
+ ea[0].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+ ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+ ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
+ ea[0].Trustee.ptstrName = (LPTSTR)d->pEveryoneSID;
+
+ dwResult = SetEntriesInAcl(NR_EA, ea, NULL, &d->pACL);
+ if (dwResult != ERROR_SUCCESS) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/gle",
+ (intmax_t)gle);
+ trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/dw",
+ (intmax_t)dwResult);
+ goto fail;
+ }
+
+ d->pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(
+ LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
+ if (!InitializeSecurityDescriptor(d->pSD, SECURITY_DESCRIPTOR_REVISION)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "init-sd/gle", (intmax_t)gle);
+ goto fail;
+ }
+
+ if (!SetSecurityDescriptorDacl(d->pSD, TRUE, d->pACL, FALSE)) {
+ DWORD gle = GetLastError();
+ trace2_data_intmax("ipc-debug", NULL, "set-sd-dacl/gle", (intmax_t)gle);
+ goto fail;
+ }
+
+ d->lpSA = (LPSECURITY_ATTRIBUTES)LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES));
+ d->lpSA->nLength = sizeof(SECURITY_ATTRIBUTES);
+ d->lpSA->lpSecurityDescriptor = d->pSD;
+ d->lpSA->bInheritHandle = FALSE;
+
+ return d->lpSA;
+
+fail:
+ release_sa(d);
+ return NULL;
+}
+
static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
{
HANDLE hPipe;
DWORD dwOpenMode, dwPipeMode;
- LPSECURITY_ATTRIBUTES lpsa = NULL;
+ struct my_sa_data my_sa_data;
+
+ init_sa(&my_sa_data);
dwOpenMode = PIPE_ACCESS_INBOUND | PIPE_ACCESS_OUTBOUND |
FILE_FLAG_OVERLAPPED;
@@ -585,20 +735,15 @@
* set the ACL / Security Attributes on the named
* pipe; subsequent instances inherit and cannot
* change them.
- *
- * TODO Should we allow the application layer to
- * specify security attributes, such as `LocalService`
- * or `LocalSystem`, when we create the named pipe?
- * This question is probably not important when the
- * daemon is started by a foreground user process and
- * only needs to talk to the current user, but may be
- * if the daemon is run via the Control Panel as a
- * System Service.
*/
+ get_sa(&my_sa_data);
}
hPipe = CreateNamedPipeW(wpath, dwOpenMode, dwPipeMode,
- PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, lpsa);
+ PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0,
+ my_sa_data.lpSA);
+
+ release_sa(&my_sa_data);
return hPipe;
}
diff --git a/compat/stub/procinfo.c b/compat/stub/procinfo.c
new file mode 100644
index 0000000..12c0a23
--- /dev/null
+++ b/compat/stub/procinfo.c
@@ -0,0 +1,11 @@
+#include "git-compat-util.h"
+
+#include "trace2.h"
+
+/*
+ * Stub. See sample implementations in compat/linux/procinfo.c and
+ * compat/win32/trace2_win32_process_info.c.
+ */
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+}
diff --git a/compat/terminal.c b/compat/terminal.c
index 43b73dd..5b903e7 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -8,8 +8,6 @@
#if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
-static void restore_term(void);
-
static void restore_term_on_signal(int sig)
{
restore_term();
@@ -25,7 +23,7 @@
static int term_fd = -1;
static struct termios old_term;
-static void restore_term(void)
+void restore_term(void)
{
if (term_fd < 0)
return;
@@ -35,15 +33,22 @@
term_fd = -1;
}
+int save_term(int full_duplex)
+{
+ if (term_fd < 0)
+ term_fd = open("/dev/tty", O_RDWR);
+
+ return (term_fd < 0) ? -1 : tcgetattr(term_fd, &old_term);
+}
+
static int disable_bits(tcflag_t bits)
{
struct termios t;
- term_fd = open("/dev/tty", O_RDWR);
- if (tcgetattr(term_fd, &t) < 0)
+ if (save_term(0) < 0)
goto error;
- old_term = t;
+ t = old_term;
sigchain_push_common(restore_term_on_signal);
t.c_lflag &= ~bits;
@@ -75,9 +80,10 @@
static int use_stty = 1;
static struct string_list stty_restore = STRING_LIST_INIT_DUP;
static HANDLE hconin = INVALID_HANDLE_VALUE;
-static DWORD cmode;
+static HANDLE hconout = INVALID_HANDLE_VALUE;
+static DWORD cmode_in, cmode_out;
-static void restore_term(void)
+void restore_term(void)
{
if (use_stty) {
int i;
@@ -97,9 +103,42 @@
if (hconin == INVALID_HANDLE_VALUE)
return;
- SetConsoleMode(hconin, cmode);
+ SetConsoleMode(hconin, cmode_in);
+ CloseHandle(hconin);
+ if (cmode_out) {
+ assert(hconout != INVALID_HANDLE_VALUE);
+ SetConsoleMode(hconout, cmode_out);
+ CloseHandle(hconout);
+ }
+
+ hconin = hconout = INVALID_HANDLE_VALUE;
+}
+
+int save_term(int full_duplex)
+{
+ hconin = CreateFileA("CONIN$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ, NULL, OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hconin == INVALID_HANDLE_VALUE)
+ return -1;
+
+ if (full_duplex) {
+ hconout = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hconout == INVALID_HANDLE_VALUE)
+ goto error;
+
+ GetConsoleMode(hconout, &cmode_out);
+ }
+
+ GetConsoleMode(hconin, &cmode_in);
+ use_stty = 0;
+ return 0;
+error:
CloseHandle(hconin);
hconin = INVALID_HANDLE_VALUE;
+ return -1;
}
static int disable_bits(DWORD bits)
@@ -135,15 +174,11 @@
use_stty = 0;
}
- hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ, NULL, OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL, NULL);
- if (hconin == INVALID_HANDLE_VALUE)
+ if (save_term(0) < 0)
return -1;
- GetConsoleMode(hconin, &cmode);
sigchain_push_common(restore_term_on_signal);
- if (!SetConsoleMode(hconin, cmode & ~bits)) {
+ if (!SetConsoleMode(hconin, cmode_in & ~bits)) {
CloseHandle(hconin);
hconin = INVALID_HANDLE_VALUE;
return -1;
@@ -361,6 +396,16 @@
#else
+int save_term(int full_duplex)
+{
+ /* full_duplex == 1, but no support available */
+ return -full_duplex;
+}
+
+void restore_term(void)
+{
+}
+
char *git_terminal_prompt(const char *prompt, int echo)
{
return getpass(prompt);
diff --git a/compat/terminal.h b/compat/terminal.h
index a9d52b8..e1770c5 100644
--- a/compat/terminal.h
+++ b/compat/terminal.h
@@ -1,6 +1,9 @@
#ifndef COMPAT_TERMINAL_H
#define COMPAT_TERMINAL_H
+int save_term(int full_duplex);
+void restore_term(void);
+
char *git_terminal_prompt(const char *prompt, int echo);
/* Read a single keystroke, without echoing it to the terminal */
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 51fb083..29ec1d0 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -92,7 +92,7 @@
the git operations.
3. Inside Git's directory run the command:
- make command-list.h config-list.h
+ make generated-hdrs
to generate the header file needed to compile git.
4. Then either build Git with the GNU Make Makefile in the Git projects
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
index 9e631c8..2b36371 100644
--- a/compat/win32/lazyload.h
+++ b/compat/win32/lazyload.h
@@ -15,10 +15,12 @@
* source, target);
*/
+typedef void (*FARVOIDPROC)(void);
+
struct proc_addr {
const char *const dll;
const char *const function;
- FARPROC pfunction;
+ FARVOIDPROC pfunction;
unsigned initialized : 1;
};
@@ -26,7 +28,8 @@
#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
static struct proc_addr proc_addr_##function = \
{ #dll, #function, NULL, 0 }; \
- static rettype (WINAPI *function)(__VA_ARGS__)
+ typedef rettype (WINAPI *proc_type_##function)(__VA_ARGS__); \
+ static proc_type_##function function
/*
* Loads a function from a DLL (once-only).
@@ -35,9 +38,9 @@
* This function is not thread-safe.
*/
#define INIT_PROC_ADDR(function) \
- (function = get_proc_addr(&proc_addr_##function))
+ (function = (proc_type_##function)get_proc_addr(&proc_addr_##function))
-static inline void *get_proc_addr(struct proc_addr *proc)
+static inline FARVOIDPROC get_proc_addr(struct proc_addr *proc)
{
/* only do this once */
if (!proc->initialized) {
@@ -46,7 +49,8 @@
hnd = LoadLibraryExA(proc->dll, NULL,
LOAD_LIBRARY_SEARCH_SYSTEM32);
if (hnd)
- proc->pfunction = GetProcAddress(hnd, proc->function);
+ proc->pfunction = (FARVOIDPROC)GetProcAddress(hnd,
+ proc->function);
}
/* set ENOSYS if DLL or function was not found */
if (!proc->pfunction)
diff --git a/config.c b/config.c
index 7a6ff18..c5873f3 100644
--- a/config.c
+++ b/config.c
@@ -136,7 +136,7 @@
if (!path)
return config_error_nonbool("include.path");
- expanded = expand_user_path(path, 0);
+ expanded = interpolate_path(path, 0);
if (!expanded)
return error(_("could not expand include path '%s'"), path);
path = expanded;
@@ -148,8 +148,10 @@
if (!is_absolute_path(path)) {
char *slash;
- if (!cf || !cf->path)
- return error(_("relative config includes must come from files"));
+ if (!cf || !cf->path) {
+ ret = error(_("relative config includes must come from files"));
+ goto cleanup;
+ }
slash = find_last_dir_sep(cf->path);
if (slash)
@@ -167,6 +169,7 @@
ret = git_config_from_file(git_config_include, path, inc);
inc->depth--;
}
+cleanup:
strbuf_release(&buf);
free(expanded);
return ret;
@@ -184,7 +187,7 @@
char *expanded;
int prefix = 0;
- expanded = expand_user_path(pat->buf, 1);
+ expanded = interpolate_path(pat->buf, 1);
if (expanded) {
strbuf_reset(pat);
strbuf_addstr(pat, expanded);
@@ -425,7 +428,7 @@
* baselen - pointer to size_t which will hold the length of the
* section + subsection part, can be NULL
*/
-static int git_config_parse_key_1(const char *key, char **store_key, size_t *baselen_, int quiet)
+int git_config_parse_key(const char *key, char **store_key, size_t *baselen_)
{
size_t i, baselen;
int dot;
@@ -437,14 +440,12 @@
*/
if (last_dot == NULL || last_dot == key) {
- if (!quiet)
- error(_("key does not contain a section: %s"), key);
+ error(_("key does not contain a section: %s"), key);
return -CONFIG_NO_SECTION_OR_NAME;
}
if (!last_dot[1]) {
- if (!quiet)
- error(_("key does not contain variable name: %s"), key);
+ error(_("key does not contain variable name: %s"), key);
return -CONFIG_NO_SECTION_OR_NAME;
}
@@ -455,8 +456,7 @@
/*
* Validate the key and while at it, lower case it for matching.
*/
- if (store_key)
- *store_key = xmallocz(strlen(key));
+ *store_key = xmallocz(strlen(key));
dot = 0;
for (i = 0; key[i]; i++) {
@@ -467,39 +467,24 @@
if (!dot || i > baselen) {
if (!iskeychar(c) ||
(i == baselen + 1 && !isalpha(c))) {
- if (!quiet)
- error(_("invalid key: %s"), key);
+ error(_("invalid key: %s"), key);
goto out_free_ret_1;
}
c = tolower(c);
} else if (c == '\n') {
- if (!quiet)
- error(_("invalid key (newline): %s"), key);
+ error(_("invalid key (newline): %s"), key);
goto out_free_ret_1;
}
- if (store_key)
- (*store_key)[i] = c;
+ (*store_key)[i] = c;
}
return 0;
out_free_ret_1:
- if (store_key) {
- FREE_AND_NULL(*store_key);
- }
+ FREE_AND_NULL(*store_key);
return -CONFIG_INVALID_KEY;
}
-int git_config_parse_key(const char *key, char **store_key, size_t *baselen)
-{
- return git_config_parse_key_1(key, store_key, baselen, 0);
-}
-
-int git_config_key_is_valid(const char *key)
-{
- return !git_config_parse_key_1(key, NULL, NULL, 1);
-}
-
static int config_parse_pair(const char *key, const char *value,
config_fn_t fn, void *data)
{
@@ -1269,7 +1254,7 @@
{
if (!value)
return config_error_nonbool(var);
- *dest = expand_user_path(value, 0);
+ *dest = interpolate_path(value, 0);
if (!*dest)
die(_("failed to expand user dir in: '%s'"), value);
return 0;
@@ -1793,6 +1778,7 @@
int git_config_from_blob_oid(config_fn_t fn,
const char *name,
+ struct repository *repo,
const struct object_id *oid,
void *data)
{
@@ -1801,7 +1787,7 @@
unsigned long size;
int ret;
- buf = read_object_file(oid, &type, &size);
+ buf = repo_read_object_file(repo, oid, &type, &size);
if (!buf)
return error(_("unable to load config blob object '%s'"), name);
if (type != OBJ_BLOB) {
@@ -1817,14 +1803,15 @@
}
static int git_config_from_blob_ref(config_fn_t fn,
+ struct repository *repo,
const char *name,
void *data)
{
struct object_id oid;
- if (get_oid(name, &oid) < 0)
+ if (repo_get_oid(repo, name, &oid) < 0)
return error(_("unable to resolve config blob '%s'"), name);
- return git_config_from_blob_oid(fn, name, &oid, data);
+ return git_config_from_blob_oid(fn, name, repo, &oid, data);
}
char *git_system_config(void)
@@ -1842,7 +1829,7 @@
char *xdg_config = NULL;
if (!user_config) {
- user_config = expand_user_path("~/.gitconfig", 0);
+ user_config = interpolate_path("~/.gitconfig", 0);
xdg_config = xdg_config_home("config");
}
@@ -1955,12 +1942,16 @@
* If we have a specific filename, use it. Otherwise, follow the
* regular lookup sequence.
*/
- if (config_source && config_source->use_stdin)
+ if (config_source && config_source->use_stdin) {
return git_config_from_stdin(fn, data);
- else if (config_source && config_source->file)
+ } else if (config_source && config_source->file) {
return git_config_from_file(fn, config_source->file, data);
- else if (config_source && config_source->blob)
- return git_config_from_blob_ref(fn, config_source->blob, data);
+ } else if (config_source && config_source->blob) {
+ struct repository *repo = config_source->repo ?
+ config_source->repo : the_repository;
+ return git_config_from_blob_ref(fn, repo, config_source->blob,
+ data);
+ }
return do_git_config_sequence(opts, fn, data);
}
diff --git a/config.h b/config.h
index a2200f3..f119de0 100644
--- a/config.h
+++ b/config.h
@@ -49,6 +49,8 @@
struct git_config_source {
unsigned int use_stdin:1;
const char *file;
+ /* The repository if blob is not NULL; leave blank for the_repository */
+ struct repository *repo;
const char *blob;
enum config_scope scope;
};
@@ -136,6 +138,7 @@
const char *buf, size_t len,
void *data, const struct config_options *opts);
int git_config_from_blob_oid(config_fn_t fn, const char *name,
+ struct repository *repo,
const struct object_id *oid, void *data);
void git_config_push_parameter(const char *text);
void git_config_push_env(const char *spec);
@@ -256,7 +259,6 @@
void git_config_set(const char *, const char *);
int git_config_parse_key(const char *, char **, size_t *);
-int git_config_key_is_valid(const char *key);
/*
* The following macros specify flag bits that alter the behavior
@@ -606,7 +608,6 @@
int git_config_get_pathname(const char *key, const char **dest);
int git_config_get_index_threads(int *dest);
-int git_config_get_untracked_cache(void);
int git_config_get_split_index(void);
int git_config_get_max_percent_split_change(void);
int git_config_get_fsmonitor(void);
diff --git a/config.mak.dev b/config.mak.dev
index 022fb58..7673fed 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -1,13 +1,24 @@
+ifndef COMPILER_FEATURES
+COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
+endif
+
ifeq ($(filter no-error,$(DEVOPTS)),)
DEVELOPER_CFLAGS += -Werror
SPARSE_FLAGS += -Wsparse-error
endif
-ifneq ($(filter pedantic,$(DEVOPTS)),)
-DEVELOPER_CFLAGS += -pedantic
-# don't warn for each N_ use
-DEVELOPER_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
-endif
+
DEVELOPER_CFLAGS += -Wall
+ifeq ($(filter no-pedantic,$(DEVOPTS)),)
+DEVELOPER_CFLAGS += -pedantic
+ifneq (($or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
+DEVELOPER_CFLAGS += -Wpedantic
+ifneq ($(filter gcc10,$(COMPILER_FEATURES)),)
+ifeq ($(uname_S),MINGW)
+DEVELOPER_CFLAGS += -Wno-pedantic-ms-format
+endif
+endif
+endif
+endif
DEVELOPER_CFLAGS += -Wdeclaration-after-statement
DEVELOPER_CFLAGS += -Wformat-security
DEVELOPER_CFLAGS += -Wold-style-definition
@@ -18,10 +29,6 @@
DEVELOPER_CFLAGS += -Wvla
DEVELOPER_CFLAGS += -fno-common
-ifndef COMPILER_FEATURES
-COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
-endif
-
ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
endif
diff --git a/config.mak.uname b/config.mak.uname
index 69413fb..3236a49 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -11,6 +11,10 @@
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+ifneq ($(findstring MINGW,$(uname_S)),)
+ uname_S := MINGW
+endif
+
ifdef MSVC
# avoid the MingW and Cygwin configuration sections
uname_S := Windows
@@ -58,6 +62,8 @@
FREAD_READS_DIRECTORIES = UnfortunatelyYes
BASIC_CFLAGS += -DHAVE_SYSINFO
PROCFS_EXECUTABLE_PATH = /proc/self/exe
+ HAVE_PLATFORM_PROCINFO = YesPlease
+ COMPAT_OBJS += compat/linux/procinfo.o
endif
ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease
@@ -586,7 +592,7 @@
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
SHELL_PATH = /usr/coreutils/bin/bash
endif
-ifneq (,$(findstring MINGW,$(uname_S)))
+ifeq ($(uname_S),MINGW)
pathsep = ;
HAVE_ALLOCA_H = YesPlease
NO_PREAD = YesPlease
@@ -617,6 +623,7 @@
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
+ HAVE_PLATFORM_PROCINFO = YesPlease
BASIC_LDFLAGS += -municode
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@ -732,9 +739,9 @@
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
- # Add command-list.h and config-list.h
- $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h
- git add -f config-list.h command-list.h
+ # Add generated headers
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
+ git add -f $(GENERATED_H)
# Add scripts
rm -f perl/perl.mak
diff --git a/connected.c b/connected.c
index b18299f..35bd4a2 100644
--- a/connected.c
+++ b/connected.c
@@ -24,7 +24,7 @@
struct child_process rev_list = CHILD_PROCESS_INIT;
FILE *rev_list_in;
struct check_connected_options defaults = CHECK_CONNECTED_INIT;
- struct object_id oid;
+ const struct object_id *oid;
int err = 0;
struct packed_git *new_pack = NULL;
struct transport *transport;
@@ -34,7 +34,8 @@
opt = &defaults;
transport = opt->transport;
- if (fn(cb_data, &oid)) {
+ oid = fn(cb_data);
+ if (!oid) {
if (opt->err_fd)
close(opt->err_fd);
return err;
@@ -73,7 +74,7 @@
for (p = get_all_packs(the_repository); p; p = p->next) {
if (!p->pack_promisor)
continue;
- if (find_pack_entry_one(oid.hash, p))
+ if (find_pack_entry_one(oid->hash, p))
goto promisor_pack_found;
}
/*
@@ -83,7 +84,7 @@
goto no_promisor_pack_found;
promisor_pack_found:
;
- } while (!fn(cb_data, &oid));
+ } while ((oid = fn(cb_data)) != NULL);
return 0;
}
@@ -132,12 +133,12 @@
* are sure the ref is good and not sending it to
* rev-list for verification.
*/
- if (new_pack && find_pack_entry_one(oid.hash, new_pack))
+ if (new_pack && find_pack_entry_one(oid->hash, new_pack))
continue;
- if (fprintf(rev_list_in, "%s\n", oid_to_hex(&oid)) < 0)
+ if (fprintf(rev_list_in, "%s\n", oid_to_hex(oid)) < 0)
break;
- } while (!fn(cb_data, &oid));
+ } while ((oid = fn(cb_data)) != NULL);
if (ferror(rev_list_in) || fflush(rev_list_in)) {
if (errno != EPIPE && errno != EINVAL)
diff --git a/connected.h b/connected.h
index 8d5a6b3..6e59c92 100644
--- a/connected.h
+++ b/connected.h
@@ -9,7 +9,7 @@
* When called after returning the name for the last object, return -1
* to signal EOF, otherwise return 0.
*/
-typedef int (*oid_iterate_fn)(void *, struct object_id *oid);
+typedef const struct object_id *(*oid_iterate_fn)(void *);
/*
* Named-arguments struct for check_connected. All arguments are
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 171b412..fd1399c 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -624,6 +624,13 @@
OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h)
endif()
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/hook-list.h)
+ message("Generating hook-list.h")
+ execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-hooklist.sh
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_FILE ${CMAKE_BINARY_DIR}/hook-list.h)
+endif()
+
include_directories(${CMAKE_BINARY_DIR})
#build
diff --git a/contrib/coccinelle/xopen.cocci b/contrib/coccinelle/xopen.cocci
index 814d7b8..b71db67 100644
--- a/contrib/coccinelle/xopen.cocci
+++ b/contrib/coccinelle/xopen.cocci
@@ -2,15 +2,18 @@
identifier fd;
identifier die_fn =~ "^(die|die_errno)$";
@@
-(
- fd =
-- open
-+ xopen
- (...);
-|
int fd =
- open
+ xopen
(...);
-)
+- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }
+
+@@
+expression fd;
+identifier die_fn =~ "^(die|die_errno)$";
+@@
+ fd =
+- open
++ xopen
+ (...);
- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8108eda..7c3a753 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -515,7 +515,7 @@
# argument, and using the options specified in the second argument.
__git_ls_files_helper ()
{
- if [ "$2" == "--committable" ]; then
+ if [ "$2" = "--committable" ]; then
__git -C "$1" -c core.quotePath=false diff-index \
--name-only --relative HEAD -- "${3//\\/\\\\}*"
else
@@ -2503,7 +2503,14 @@
__git_compute_config_vars ()
{
test -n "$__git_config_vars" ||
- __git_config_vars="$(git help --config-for-completion | sort -u)"
+ __git_config_vars="$(git help --config-for-completion)"
+}
+
+__git_config_sections=
+__git_compute_config_sections ()
+{
+ test -n "$__git_config_sections" ||
+ __git_config_sections="$(git help --config-sections-for-completion)"
}
# Completes possible values of various configuration variables.
@@ -2543,7 +2550,7 @@
return
;;
branch.*.rebase)
- __gitcomp "false true merges preserve interactive" "" "$cur_"
+ __gitcomp "false true merges interactive" "" "$cur_"
return
;;
remote.pushdefault)
@@ -2717,16 +2724,8 @@
__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
;;
*)
- __git_compute_config_vars
- __gitcomp "$(echo "$__git_config_vars" |
- awk -F . '{
- sections[$1] = 1
- }
- END {
- for (s in sections)
- print s "."
- }
- ')" "" "$cur_"
+ __git_compute_config_sections
+ __gitcomp "$__git_config_sections" "" "$cur_" "."
;;
esac
}
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index d389bfa..5927e27 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -138,7 +138,7 @@
char *password;
};
-#define CREDENTIAL_INIT { NULL, NULL, 0, NULL, NULL, NULL }
+#define CREDENTIAL_INIT { 0 }
typedef int (*credential_op_cb)(struct credential *);
diff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c
index e6598b6..2c5d76d 100644
--- a/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@ -41,7 +41,7 @@
char *password;
};
-#define CREDENTIAL_INIT { NULL, NULL, 0, NULL, NULL, NULL }
+#define CREDENTIAL_INIT { 0 }
typedef int (*credential_op_cb)(struct credential *);
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index eeee45d..75125d6 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -91,7 +91,7 @@
git checkout -q $commit -- .
git rerere
fi
- git reset -q --hard
+ git reset -q --hard # Might nuke untracked files...
done
if test -z "$branch"
diff --git a/credential.c b/credential.c
index 000ac7a..e7240f3 100644
--- a/credential.c
+++ b/credential.c
@@ -105,7 +105,7 @@
static void credential_apply_config(struct credential *c)
{
char *normalized_url;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
struct strbuf url = STRBUF_INIT;
if (!c->host)
diff --git a/daemon.c b/daemon.c
index 5c4cbad..b1fcbe0 100644
--- a/daemon.c
+++ b/daemon.c
@@ -63,6 +63,12 @@
unsigned int hostname_lookup_done:1;
unsigned int saw_extended_args:1;
};
+#define HOSTINFO_INIT { \
+ .hostname = STRBUF_INIT, \
+ .canon_hostname = STRBUF_INIT, \
+ .ip_address = STRBUF_INIT, \
+ .tcp_port = STRBUF_INIT, \
+}
static void lookup_hostname(struct hostinfo *hi);
@@ -727,15 +733,6 @@
}
}
-static void hostinfo_init(struct hostinfo *hi)
-{
- memset(hi, 0, sizeof(*hi));
- strbuf_init(&hi->hostname, 0);
- strbuf_init(&hi->canon_hostname, 0);
- strbuf_init(&hi->ip_address, 0);
- strbuf_init(&hi->tcp_port, 0);
-}
-
static void hostinfo_clear(struct hostinfo *hi)
{
strbuf_release(&hi->hostname);
@@ -760,17 +757,15 @@
char *line = packet_buffer;
int pktlen, len, i;
char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
- struct hostinfo hi;
+ struct hostinfo hi = HOSTINFO_INIT;
struct strvec env = STRVEC_INIT;
- hostinfo_init(&hi);
-
if (addr)
loginfo("Connection from %s:%s", addr, port);
set_keep_alive(0);
alarm(init_timeout ? init_timeout : timeout);
- pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0);
+ pktlen = packet_read(0, packet_buffer, sizeof(packet_buffer), 0);
alarm(0);
len = strlen(line);
diff --git a/diff.c b/diff.c
index a8113f1..861282d 100644
--- a/diff.c
+++ b/diff.c
@@ -26,6 +26,7 @@
#include "parse-options.h"
#include "help.h"
#include "promisor-remote.h"
+#include "dir.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
@@ -774,13 +775,13 @@
int indent_width; /* The visual width of the indentation */
enum diff_symbol s;
};
-#define EMITTED_DIFF_SYMBOL_INIT {NULL}
+#define EMITTED_DIFF_SYMBOL_INIT { 0 }
struct emitted_diff_symbols {
struct emitted_diff_symbol *buf;
int nr, alloc;
};
-#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
+#define EMITTED_DIFF_SYMBOLS_INIT { 0 }
static void append_emitted_diff_symbol(struct diff_options *o,
struct emitted_diff_symbol *e)
@@ -3907,6 +3908,13 @@
if (!want_file && would_convert_to_git(istate, name))
return 0;
+ /*
+ * If this path does not match our sparse-checkout definition,
+ * then the file will not be in the working directory.
+ */
+ if (!path_in_sparse_checkout(name, istate))
+ return 0;
+
len = strlen(name);
pos = index_name_pos(istate, name, len);
if (pos < 0)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index c95857b..bebd4ed 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -317,10 +317,11 @@
}
static void insert_file_table(struct repository *r,
+ struct mem_pool *pool,
struct hashmap *table, int index,
struct diff_filespec *filespec)
{
- struct file_similarity *entry = xmalloc(sizeof(*entry));
+ struct file_similarity *entry = mem_pool_alloc(pool, sizeof(*entry));
entry->index = index;
entry->filespec = filespec;
@@ -336,7 +337,8 @@
* and then during the second round we try to match
* cache-dirty entries as well.
*/
-static int find_exact_renames(struct diff_options *options)
+static int find_exact_renames(struct diff_options *options,
+ struct mem_pool *pool)
{
int i, renames = 0;
struct hashmap file_table;
@@ -346,7 +348,7 @@
*/
hashmap_init(&file_table, NULL, NULL, rename_src_nr);
for (i = rename_src_nr-1; i >= 0; i--)
- insert_file_table(options->repo,
+ insert_file_table(options->repo, pool,
&file_table, i,
rename_src[i].p->one);
@@ -354,8 +356,8 @@
for (i = 0; i < rename_dst_nr; i++)
renames += find_identical_files(&file_table, i, options);
- /* Free the hash data structure and entries */
- hashmap_clear_and_free(&file_table, struct file_similarity, entry);
+ /* Free the hash data structure (entries will be freed with the pool) */
+ hashmap_clear(&file_table);
return renames;
}
@@ -1330,7 +1332,47 @@
rename_src_nr = new_num_src;
}
+static void free_filespec_data(struct diff_filespec *spec)
+{
+ if (!--spec->count)
+ diff_free_filespec_data(spec);
+}
+
+static void pool_free_filespec(struct mem_pool *pool,
+ struct diff_filespec *spec)
+{
+ if (!pool) {
+ free_filespec(spec);
+ return;
+ }
+
+ /*
+ * Similar to free_filespec(), but only frees the data. The spec
+ * itself was allocated in the pool and should not be individually
+ * freed.
+ */
+ free_filespec_data(spec);
+}
+
+void pool_diff_free_filepair(struct mem_pool *pool,
+ struct diff_filepair *p)
+{
+ if (!pool) {
+ diff_free_filepair(p);
+ return;
+ }
+
+ /*
+ * Similar to diff_free_filepair() but only frees the data from the
+ * filespecs; not the filespecs or the filepair which were
+ * allocated from the pool.
+ */
+ free_filespec_data(p->one);
+ free_filespec_data(p->two);
+}
+
void diffcore_rename_extended(struct diff_options *options,
+ struct mem_pool *pool,
struct strintmap *relevant_sources,
struct strintmap *dirs_removed,
struct strmap *dir_rename_count,
@@ -1345,6 +1387,7 @@
int num_destinations, dst_cnt;
int num_sources, want_copies;
struct progress *progress = NULL;
+ struct mem_pool local_pool;
struct dir_rename_info info;
struct diff_populate_filespec_options dpf_options = {
.check_binary = 0,
@@ -1413,11 +1456,18 @@
goto cleanup; /* nothing to do */
trace2_region_enter("diff", "exact renames", options->repo);
+ mem_pool_init(&local_pool, 32*1024);
/*
* We really want to cull the candidates list early
* with cheap tests in order to avoid doing deltas.
*/
- rename_count = find_exact_renames(options);
+ rename_count = find_exact_renames(options, &local_pool);
+ /*
+ * Discard local_pool immediately instead of at "cleanup:" in order
+ * to reduce maximum memory usage; inexact rename detection uses up
+ * a fair amount of memory, and mem_pools can too.
+ */
+ mem_pool_discard(&local_pool, 0);
trace2_region_leave("diff", "exact renames", options->repo);
/* Did we only want exact renames? */
@@ -1636,7 +1686,7 @@
pair_to_free = p;
if (pair_to_free)
- diff_free_filepair(pair_to_free);
+ pool_diff_free_filepair(pool, pair_to_free);
}
diff_debug_queue("done copying original", &outq);
@@ -1646,7 +1696,7 @@
for (i = 0; i < rename_dst_nr; i++)
if (rename_dst[i].filespec_to_free)
- free_filespec(rename_dst[i].filespec_to_free);
+ pool_free_filespec(pool, rename_dst[i].filespec_to_free);
cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
FREE_AND_NULL(rename_dst);
@@ -1663,5 +1713,5 @@
void diffcore_rename(struct diff_options *options)
{
- diffcore_rename_extended(options, NULL, NULL, NULL, NULL);
+ diffcore_rename_extended(options, NULL, NULL, NULL, NULL, NULL);
}
diff --git a/diffcore.h b/diffcore.h
index 533b30e..badc226 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -127,6 +127,8 @@
#define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
void diff_free_filepair(struct diff_filepair *);
+void pool_diff_free_filepair(struct mem_pool *pool,
+ struct diff_filepair *p);
int diff_unmodified_pair(struct diff_filepair *);
@@ -179,6 +181,7 @@
void diffcore_break(struct repository *, int);
void diffcore_rename(struct diff_options *);
void diffcore_rename_extended(struct diff_options *options,
+ struct mem_pool *pool,
struct strintmap *relevant_sources,
struct strintmap *dirs_removed,
struct strmap *dir_rename_count,
diff --git a/dir.c b/dir.c
index 03c4d21..5aa6fba 100644
--- a/dir.c
+++ b/dir.c
@@ -1439,6 +1439,75 @@
return result;
}
+int init_sparse_checkout_patterns(struct index_state *istate)
+{
+ if (!core_apply_sparse_checkout)
+ return 1;
+ if (istate->sparse_checkout_patterns)
+ return 0;
+
+ CALLOC_ARRAY(istate->sparse_checkout_patterns, 1);
+
+ if (get_sparse_checkout_patterns(istate->sparse_checkout_patterns) < 0) {
+ FREE_AND_NULL(istate->sparse_checkout_patterns);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int path_in_sparse_checkout_1(const char *path,
+ struct index_state *istate,
+ int require_cone_mode)
+{
+ int dtype = DT_REG;
+ enum pattern_match_result match = UNDECIDED;
+ const char *end, *slash;
+
+ /*
+ * We default to accepting a path if there are no patterns or
+ * they are of the wrong type.
+ */
+ if (init_sparse_checkout_patterns(istate) ||
+ (require_cone_mode &&
+ !istate->sparse_checkout_patterns->use_cone_patterns))
+ return 1;
+
+ /*
+ * If UNDECIDED, use the match from the parent dir (recursively), or
+ * fall back to NOT_MATCHED at the topmost level. Note that cone mode
+ * never returns UNDECIDED, so we will execute only one iteration in
+ * this case.
+ */
+ for (end = path + strlen(path);
+ end > path && match == UNDECIDED;
+ end = slash) {
+
+ for (slash = end - 1; slash > path && *slash != '/'; slash--)
+ ; /* do nothing */
+
+ match = path_matches_pattern_list(path, end - path,
+ slash > path ? slash + 1 : path, &dtype,
+ istate->sparse_checkout_patterns, istate);
+
+ /* We are going to match the parent dir now */
+ dtype = DT_DIR;
+ }
+ return match > 0;
+}
+
+int path_in_sparse_checkout(const char *path,
+ struct index_state *istate)
+{
+ return path_in_sparse_checkout_1(path, istate, 0);
+}
+
+int path_in_cone_mode_sparse_checkout(const char *path,
+ struct index_state *istate)
+{
+ return path_in_sparse_checkout_1(path, istate, 1);
+}
+
static struct path_pattern *last_matching_pattern_from_lists(
struct dir_struct *dir, struct index_state *istate,
const char *pathname, int pathlen,
@@ -2970,6 +3039,120 @@
return ret;
}
+char *git_url_basename(const char *repo, int is_bundle, int is_bare)
+{
+ const char *end = repo + strlen(repo), *start, *ptr;
+ size_t len;
+ char *dir;
+
+ /*
+ * Skip scheme.
+ */
+ start = strstr(repo, "://");
+ if (start == NULL)
+ start = repo;
+ else
+ start += 3;
+
+ /*
+ * Skip authentication data. The stripping does happen
+ * greedily, such that we strip up to the last '@' inside
+ * the host part.
+ */
+ for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
+ if (*ptr == '@')
+ start = ptr + 1;
+ }
+
+ /*
+ * Strip trailing spaces, slashes and /.git
+ */
+ while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
+ end--;
+ if (end - start > 5 && is_dir_sep(end[-5]) &&
+ !strncmp(end - 4, ".git", 4)) {
+ end -= 5;
+ while (start < end && is_dir_sep(end[-1]))
+ end--;
+ }
+
+ /*
+ * Strip trailing port number if we've got only a
+ * hostname (that is, there is no dir separator but a
+ * colon). This check is required such that we do not
+ * strip URI's like '/foo/bar:2222.git', which should
+ * result in a dir '2222' being guessed due to backwards
+ * compatibility.
+ */
+ if (memchr(start, '/', end - start) == NULL
+ && memchr(start, ':', end - start) != NULL) {
+ ptr = end;
+ while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':')
+ ptr--;
+ if (start < ptr && ptr[-1] == ':')
+ end = ptr - 1;
+ }
+
+ /*
+ * Find last component. To remain backwards compatible we
+ * also regard colons as path separators, such that
+ * cloning a repository 'foo:bar.git' would result in a
+ * directory 'bar' being guessed.
+ */
+ ptr = end;
+ while (start < ptr && !is_dir_sep(ptr[-1]) && ptr[-1] != ':')
+ ptr--;
+ start = ptr;
+
+ /*
+ * Strip .{bundle,git}.
+ */
+ len = end - start;
+ strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
+
+ if (!len || (len == 1 && *start == '/'))
+ die(_("No directory name could be guessed.\n"
+ "Please specify a directory on the command line"));
+
+ if (is_bare)
+ dir = xstrfmt("%.*s.git", (int)len, start);
+ else
+ dir = xstrndup(start, len);
+ /*
+ * Replace sequences of 'control' characters and whitespace
+ * with one ascii space, remove leading and trailing spaces.
+ */
+ if (*dir) {
+ char *out = dir;
+ int prev_space = 1 /* strip leading whitespace */;
+ for (end = dir; *end; ++end) {
+ char ch = *end;
+ if ((unsigned char)ch < '\x20')
+ ch = '\x20';
+ if (isspace(ch)) {
+ if (prev_space)
+ continue;
+ prev_space = 1;
+ } else
+ prev_space = 0;
+ *out++ = ch;
+ }
+ *out = '\0';
+ if (out > dir && prev_space)
+ out[-1] = '\0';
+ }
+ return dir;
+}
+
+void strip_dir_trailing_slashes(char *dir)
+{
+ char *end = dir + strlen(dir);
+
+ while (dir < end - 1 && is_dir_sep(end[-1]))
+ end--;
+ *end = '\0';
+}
+
static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
{
DIR *dir;
@@ -3633,7 +3816,7 @@
strbuf_reset(&sub_wt);
strbuf_reset(&sub_gd);
strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
- strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
+ submodule_name_to_gitdir(&sub_gd, &subrepo, sub->name);
connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1);
}
diff --git a/dir.h b/dir.h
index b3e1a54a..83f46c0 100644
--- a/dir.h
+++ b/dir.h
@@ -394,6 +394,14 @@
const char *basename, int *dtype,
struct pattern_list *pl,
struct index_state *istate);
+
+int init_sparse_checkout_patterns(struct index_state *state);
+
+int path_in_sparse_checkout(const char *path,
+ struct index_state *istate);
+int path_in_cone_mode_sparse_checkout(const char *path,
+ struct index_state *istate);
+
struct dir_entry *dir_add_ignored(struct dir_struct *dir,
struct index_state *istate,
const char *pathname, int len);
@@ -453,6 +461,17 @@
int is_empty_dir(const char *dir);
+/*
+ * Retrieve the "humanish" basename of the given Git URL.
+ *
+ * For example:
+ * /path/to/repo.git => "repo"
+ * host.xz:foo/.git => "foo"
+ * http://example.com/user/bar.baz => "bar.baz"
+ */
+char *git_url_basename(const char *repo, int is_bundle, int is_bare);
+void strip_dir_trailing_slashes(char *dir);
+
void setup_standard_excludes(struct dir_struct *dir);
char *get_sparse_checkout_filename(void);
diff --git a/editor.c b/editor.c
index 6303ae0..fdd3eea 100644
--- a/editor.c
+++ b/editor.c
@@ -58,7 +58,7 @@
const char *args[] = { editor, NULL, NULL };
struct child_process p = CHILD_PROCESS_INIT;
int ret, sig;
- int print_waiting_for_editor = advice_waiting_for_editor && isatty(2);
+ int print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
if (print_waiting_for_editor) {
/*
diff --git a/entry.c b/entry.c
index 044e8ec..9b0f968 100644
--- a/entry.c
+++ b/entry.c
@@ -163,24 +163,21 @@
int show_progress)
{
int errs = 0;
- unsigned delayed_object_count;
+ unsigned processed_paths = 0;
off_t filtered_bytes = 0;
struct string_list_item *filter, *path;
- struct progress *progress;
+ struct progress *progress = NULL;
struct delayed_checkout *dco = state->delayed_checkout;
if (!state->delayed_checkout)
return errs;
dco->state = CE_RETRY;
- delayed_object_count = dco->paths.nr;
- progress = show_progress
- ? start_delayed_progress(_("Filtering content"), delayed_object_count)
- : NULL;
+ if (show_progress)
+ progress = start_delayed_progress(_("Filtering content"), dco->paths.nr);
while (dco->filters.nr > 0) {
for_each_string_list_item(filter, &dco->filters) {
struct string_list available_paths = STRING_LIST_INIT_NODUP;
- display_progress(progress, delayed_object_count - dco->paths.nr);
if (!async_query_available_blobs(filter->string, &available_paths)) {
/* Filter reported an error */
@@ -227,6 +224,7 @@
ce = index_file_exists(state->istate, path->string,
strlen(path->string), 0);
if (ce) {
+ display_progress(progress, ++processed_paths);
errs |= checkout_entry(ce, state, NULL, nr_checkouts);
filtered_bytes += ce->ce_stat_data.sd_size;
display_throughput(progress, filtered_bytes);
diff --git a/entry.h b/entry.h
index 7c889e5..2254c62 100644
--- a/entry.h
+++ b/entry.h
@@ -16,7 +16,7 @@
clone:1,
refresh_cache:1;
};
-#define CHECKOUT_INIT { NULL, "" }
+#define CHECKOUT_INIT { .base_dir = "" }
#define TEMPORARY_FILENAME_LENGTH 25
/*
diff --git a/environment.c b/environment.c
index b4ba4fa..9da7f3c 100644
--- a/environment.c
+++ b/environment.c
@@ -31,7 +31,6 @@
int is_bare_repository_cfg = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int warn_on_object_refname_ambiguity = 1;
-int ref_paranoia = -1;
int repository_format_precious_objects;
int repository_format_worktree_config;
const char *git_commit_encoding;
@@ -95,13 +94,6 @@
/* Parallel index stat data preload? */
int core_preload_index = 1;
-/*
- * This is a hack for test programs like test-dump-untracked-cache to
- * ensure that they do not modify the untracked cache when reading it.
- * Do not use it otherwise!
- */
-int ignore_untracked_cache_config;
-
/* This is set by setup_git_dir_gently() and/or git_default_config() */
char *git_work_tree_cfg;
@@ -329,8 +321,7 @@
static void set_git_dir_1(const char *path)
{
- if (setenv(GIT_DIR_ENVIRONMENT, path, 1))
- die(_("could not set GIT_DIR to '%s'"), path);
+ xsetenv(GIT_DIR_ENVIRONMENT, path, 1);
setup_git_env(path);
}
diff --git a/fetch-negotiator.c b/fetch-negotiator.c
index 57ed578..2733902 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -19,7 +19,6 @@
return;
case FETCH_NEGOTIATION_DEFAULT:
- default:
default_negotiator_init(negotiator);
return;
}
diff --git a/fetch-pack.c b/fetch-pack.c
index b0c7be7..a9604f3 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -119,6 +119,11 @@
{
enum object_type type;
struct object_info info = { .typep = &type };
+ struct commit *commit;
+
+ commit = lookup_commit_in_graph(the_repository, oid);
+ if (commit)
+ return commit;
while (1) {
if (oid_object_info_extended(the_repository, oid, &info,
@@ -137,8 +142,14 @@
break;
}
}
- if (type == OBJ_COMMIT)
- return (struct commit *) parse_object(the_repository, oid);
+
+ if (type == OBJ_COMMIT) {
+ struct commit *commit = lookup_commit(the_repository, oid);
+ if (!commit || repo_parse_commit(the_repository, commit))
+ return NULL;
+ return commit;
+ }
+
return NULL;
}
@@ -1906,16 +1917,15 @@
oid_array_clear(&ref);
}
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
{
struct ref **rm = cb_data;
struct ref *ref = *rm;
if (!ref)
- return -1; /* end of the list */
+ return NULL;
*rm = ref->next;
- oidcpy(oid, &ref->old_oid);
- return 0;
+ return &ref->old_oid;
}
struct ref *fetch_pack(struct fetch_pack_args *args,
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index b969dc6..5216191 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -9,6 +9,7 @@
#include "branch.h"
#include "fmt-merge-msg.h"
#include "commit-reach.h"
+#include "gpg-interface.h"
static int use_branch_desc;
static int suppress_dest_pattern_seen;
@@ -16,6 +17,8 @@
int fmt_merge_msg_config(const char *key, const char *value, void *cb)
{
+ int status = 0;
+
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
int is_bool;
merge_log_config = git_config_bool_or_int(key, value, &is_bool);
@@ -34,6 +37,9 @@
string_list_append(&suppress_dest_patterns, value);
suppress_dest_pattern_seen = 1;
} else {
+ status = git_gpg_config(key, value, NULL);
+ if (status)
+ return status;
return git_default_config(key, value, cb);
}
return 0;
@@ -528,11 +534,11 @@
buf = payload.buf;
len = payload.len;
if (check_signature(payload.buf, payload.len, sig.buf,
- sig.len, &sigc) &&
- !sigc.gpg_output)
+ sig.len, &sigc) &&
+ !sigc.output)
strbuf_addstr(&sig, "gpg verification failed.\n");
else
- strbuf_addstr(&sig, sigc.gpg_output);
+ strbuf_addstr(&sig, sigc.output);
}
signature_check_clear(&sigc);
diff --git a/generate-hooklist.sh b/generate-hooklist.sh
new file mode 100755
index 0000000..2f9f54e
--- /dev/null
+++ b/generate-hooklist.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Usage: ./generate-hooklist.sh >hook-list.h
+
+cat <<EOF
+/* Automatically generated by generate-hooklist.sh */
+
+static const char *hook_name_list[] = {
+EOF
+
+sed -n \
+ -e '/^~~~~*$/ {x; s/^.*$/ "&",/; p;}' \
+ -e 'x' \
+ <Documentation/githooks.txt |
+ LC_ALL=C sort
+
+cat <<EOF
+ NULL,
+};
+EOF
diff --git a/gettext.h b/gettext.h
index c8b34fd..d209911 100644
--- a/gettext.h
+++ b/gettext.h
@@ -55,31 +55,7 @@
}
/* Mark msgid for translation but do not translate it. */
-#if !USE_PARENS_AROUND_GETTEXT_N
#define N_(msgid) msgid
-#else
-/*
- * Strictly speaking, this will lead to invalid C when
- * used this way:
- * static const char s[] = N_("FOO");
- * which will expand to
- * static const char s[] = ("FOO");
- * and in valid C, the initializer on the right hand side must
- * be without the parentheses. But many compilers do accept it
- * as a language extension and it will allow us to catch mistakes
- * like:
- * static const char *msgs[] = {
- * N_("one")
- * N_("two"),
- * N_("three"),
- * NULL
- * };
- * (notice the missing comma on one of the lines) by forcing
- * a compilation error, because parenthesised ("one") ("two")
- * will not get silently turned into ("onetwo").
- */
-#define N_(msgid) (msgid)
-#endif
const char *get_preferred_languages(void);
int is_utf8_locale(void);
diff --git a/git-bisect.sh b/git-bisect.sh
index 6a7afae..405cf76 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -34,94 +34,9 @@
OPTIONS_SPEC=
. git-sh-setup
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
TERM_BAD=bad
TERM_GOOD=good
-bisect_visualize() {
- git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
-
- if test $# = 0
- then
- if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
- type gitk >/dev/null 2>&1
- then
- set gitk
- else
- set git log
- fi
- else
- case "$1" in
- git*|tig) ;;
- -*) set git log "$@" ;;
- *) set git "$@" ;;
- esac
- fi
-
- eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
-}
-
-bisect_run () {
- git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
-
- test -n "$*" || die "$(gettext "bisect run failed: no command provided.")"
-
- while true
- do
- command="$@"
- eval_gettextln "running \$command"
- "$@"
- res=$?
-
- # Check for really bad run error.
- if [ $res -lt 0 -o $res -ge 128 ]
- then
- eval_gettextln "bisect run failed:
-exit code \$res from '\$command' is < 0 or >= 128" >&2
- exit $res
- fi
-
- # Find current state depending on run success or failure.
- # A special exit code of 125 means cannot test.
- if [ $res -eq 125 ]
- then
- state='skip'
- elif [ $res -gt 0 ]
- then
- state="$TERM_BAD"
- else
- state="$TERM_GOOD"
- fi
-
- git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN"
- res=$?
-
- cat "$GIT_DIR/BISECT_RUN"
-
- if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
- >/dev/null
- then
- gettextln "bisect run cannot continue any more" >&2
- exit $res
- fi
-
- if [ $res -ne 0 ]
- then
- eval_gettextln "bisect run failed:
-'bisect-state \$state' exited with error code \$res" >&2
- exit $res
- fi
-
- if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null
- then
- gettextln "bisect run success"
- exit 0;
- fi
-
- done
-}
-
get_terms () {
if test -s "$GIT_DIR/BISECT_TERMS"
then
@@ -152,7 +67,7 @@
# Not sure we want "next" at the UI level anymore.
git bisect--helper --bisect-next "$@" || exit ;;
visualize|view)
- bisect_visualize "$@" ;;
+ git bisect--helper --bisect-visualize "$@" || exit;;
reset)
git bisect--helper --bisect-reset "$@" ;;
replay)
@@ -160,7 +75,7 @@
log)
git bisect--helper --bisect-log || exit ;;
run)
- bisect_run "$@" ;;
+ git bisect--helper --bisect-run "$@" || exit;;
terms)
git bisect--helper --bisect-terms "$@" || exit;;
*)
diff --git a/git-compat-util.h b/git-compat-util.h
index dc52aea..4b57ae6 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -162,6 +162,9 @@
# endif
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
#include <winsock2.h>
+#ifndef NO_UNIX_SOCKETS
+#include <afunix.h>
+#endif
#include <windows.h>
#define GIT_WINDOWS_NATIVE
#endif
@@ -889,6 +892,7 @@
char *xstrndup(const char *str, size_t len);
void *xrealloc(void *ptr, size_t size);
void *xcalloc(size_t nmemb, size_t size);
+void xsetenv(const char *name, const char *value, int overwrite);
void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
const char *mmap_os_err(void);
void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
@@ -1267,10 +1271,6 @@
*/
int open_nofollow(const char *path, int flags);
-#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
-#define USE_PARENS_AROUND_GETTEXT_N 1
-#endif
-
#ifndef SHELL_PATH
# define SHELL_PATH "/bin/sh"
#endif
diff --git a/git-curl-compat.h b/git-curl-compat.h
new file mode 100644
index 0000000..56a83b6
--- /dev/null
+++ b/git-curl-compat.h
@@ -0,0 +1,129 @@
+#ifndef GIT_CURL_COMPAT_H
+#define GIT_CURL_COMPAT_H
+#include <curl/curl.h>
+
+/**
+ * This header centralizes the declaration of our libcurl dependencies
+ * to make it easy to discover the oldest versions we support, and to
+ * inform decisions about removing support for older libcurl in the
+ * future.
+ *
+ * The oldest supported version of curl is documented in the "INSTALL"
+ * document.
+ *
+ * The source of truth for what versions have which symbols is
+ * https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions;
+ * the release dates are taken from curl.git (at
+ * https://github.com/curl/curl/).
+ *
+ * For each X symbol we need from curl we define our own
+ * GIT_CURL_HAVE_X. If multiple similar symbols with the same prefix
+ * were defined in the same version we pick one and check for that name.
+ *
+ * We may also define a missing CURL_* symbol to its known value, if
+ * doing so is sufficient to add support for it to older versions that
+ * don't have it.
+ *
+ * Keep any symbols in date order of when their support was
+ * introduced, oldest first, in the official version of cURL library.
+ */
+
+/**
+ * CURL_SOCKOPT_OK was added in 7.21.5, released in April 2011.
+ */
+#if LIBCURL_VERSION_NUM < 0x071505
+#define CURL_SOCKOPT_OK 0
+#endif
+
+/**
+ * CURLOPT_TCP_KEEPALIVE was added in 7.25.0, released in March 2012.
+ */
+#if LIBCURL_VERSION_NUM >= 0x071900
+#define GITCURL_HAVE_CURLOPT_TCP_KEEPALIVE 1
+#endif
+
+
+/**
+ * CURLOPT_LOGIN_OPTIONS was added in 7.34.0, released in December
+ * 2013.
+ *
+ * If we start requiring 7.34.0 we might also be able to remove the
+ * code conditional on USE_CURL_FOR_IMAP_SEND in imap-send.c, see
+ * 1e16b255b95 (git-imap-send: use libcurl for implementation,
+ * 2014-11-09) and the check it added for "072200" in the Makefile.
+
+ */
+#if LIBCURL_VERSION_NUM >= 0x072200
+#define GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS 1
+#endif
+
+/**
+ * CURL_SSLVERSION_TLSv1_[012] was added in 7.34.0, released in
+ * December 2013.
+ */
+#if LIBCURL_VERSION_NUM >= 0x072200
+#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_0
+#endif
+
+/**
+ * CURLOPT_PINNEDPUBLICKEY was added in 7.39.0, released in November
+ * 2014. CURLE_SSL_PINNEDPUBKEYNOTMATCH was added in that same version.
+ */
+#if LIBCURL_VERSION_NUM >= 0x072c00
+#define GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY 1
+#define GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH 1
+#endif
+
+/**
+ * CURL_HTTP_VERSION_2 was added in 7.43.0, released in June 2015.
+ *
+ * The CURL_HTTP_VERSION_2 alias (but not CURL_HTTP_VERSION_2_0) has
+ * always been a macro, not an enum field (checked on curl version
+ * 7.78.0)
+ */
+#if LIBCURL_VERSION_NUM >= 0x072b00
+#define GIT_CURL_HAVE_CURL_HTTP_VERSION_2 1
+#endif
+
+/**
+ * CURLSSLOPT_NO_REVOKE was added in 7.44.0, released in August 2015.
+ *
+ * The CURLSSLOPT_NO_REVOKE is, has always been a macro, not an enum
+ * field (checked on curl version 7.78.0)
+ */
+#if LIBCURL_VERSION_NUM >= 0x072c00
+#define GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE 1
+#endif
+
+/**
+ * CURLOPT_PROXY_CAINFO was added in 7.52.0, released in August 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO 1
+#endif
+
+/**
+ * CURLOPT_PROXY_{KEYPASSWD,SSLCERT,SSLKEY} was added in 7.52.0,
+ * released in August 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD 1
+#endif
+
+/**
+ * CURL_SSLVERSION_TLSv1_3 was added in 7.53.0, released in February
+ * 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_3 1
+#endif
+
+/**
+ * CURLSSLSET_{NO_BACKENDS,OK,TOO_LATE,UNKNOWN_BACKEND} were added in
+ * 7.56.0, released in September 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073800
+#define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
+#endif
+
+#endif
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
deleted file mode 100644
index b9c71d2..0000000
--- a/git-rebase--preserve-merges.sh
+++ /dev/null
@@ -1,1057 +0,0 @@
-# This shell script fragment is sourced by git-rebase to implement its
-# preserve-merges mode.
-#
-# Copyright (c) 2006 Johannes E. Schindelin
-#
-# The file containing rebase commands, comments, and empty lines.
-# This file is created by "git rebase -i" then edited by the user. As
-# the lines are processed, they are removed from the front of this
-# file and written to the tail of $done.
-todo="$state_dir"/git-rebase-todo
-
-# The rebase command lines that have already been processed. A line
-# is moved here when it is first handled, before any associated user
-# actions.
-done="$state_dir"/done
-
-# The commit message that is planned to be used for any changes that
-# need to be committed following a user interaction.
-msg="$state_dir"/message
-
-# The file into which is accumulated the suggested commit message for
-# squash/fixup commands. When the first of a series of squash/fixups
-# is seen, the file is created and the commit message from the
-# previous commit and from the first squash/fixup commit are written
-# to it. The commit message for each subsequent squash/fixup commit
-# is appended to the file as it is processed.
-#
-# The first line of the file is of the form
-# # This is a combination of $count commits.
-# where $count is the number of commits whose messages have been
-# written to the file so far (including the initial "pick" commit).
-# Each time that a commit message is processed, this line is read and
-# updated. It is deleted just before the combined commit is made.
-squash_msg="$state_dir"/message-squash
-
-# If the current series of squash/fixups has not yet included a squash
-# command, then this file exists and holds the commit message of the
-# original "pick" commit. (If the series ends without a "squash"
-# command, then this can be used as the commit message of the combined
-# commit without opening the editor.)
-fixup_msg="$state_dir"/message-fixup
-
-# $rewritten is the name of a directory containing files for each
-# commit that is reachable by at least one merge base of $head and
-# $upstream. They are not necessarily rewritten, but their children
-# might be. This ensures that commits on merged, but otherwise
-# unrelated side branches are left alone. (Think "X" in the man page's
-# example.)
-rewritten="$state_dir"/rewritten
-
-dropped="$state_dir"/dropped
-
-end="$state_dir"/end
-msgnum="$state_dir"/msgnum
-
-# A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE that will be used for the commit that is currently
-# being rebased.
-author_script="$state_dir"/author-script
-
-# When an "edit" rebase command is being processed, the SHA1 of the
-# commit to be edited is recorded in this file. When "git rebase
-# --continue" is executed, if there are any staged changes then they
-# will be amended to the HEAD commit, but only provided the HEAD
-# commit is still the commit to be edited. When any other rebase
-# command is processed, this file is deleted.
-amend="$state_dir"/amend
-
-# For the post-rewrite hook, we make a list of rewritten commits and
-# their new sha1s. The rewritten-pending list keeps the sha1s of
-# commits that have been processed, but not committed yet,
-# e.g. because they are waiting for a 'squash' command.
-rewritten_list="$state_dir"/rewritten-list
-rewritten_pending="$state_dir"/rewritten-pending
-
-# Work around Git for Windows' Bash whose "read" does not strip CRLF
-# and leaves CR at the end instead.
-cr=$(printf "\015")
-
-resolvemsg="
-$(gettext 'Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".')
-"
-
-write_basic_state () {
- echo "$head_name" > "$state_dir"/head-name &&
- echo "$onto" > "$state_dir"/onto &&
- echo "$orig_head" > "$state_dir"/orig-head &&
- test t = "$GIT_QUIET" && : > "$state_dir"/quiet
- test t = "$verbose" && : > "$state_dir"/verbose
- test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
- test -n "$strategy_opts" && echo "$strategy_opts" > \
- "$state_dir"/strategy_opts
- test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
- "$state_dir"/allow_rerere_autoupdate
- test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
- test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
- test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
-}
-
-apply_autostash () {
- if test -f "$state_dir/autostash"
- then
- stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 >/dev/null 2>&1
- then
- echo "$(gettext 'Applied autostash.')" >&2
- else
- git stash store -m "autostash" -q $stash_sha1 ||
- die "$(eval_gettext "Cannot store \$stash_sha1")"
- gettext 'Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-' >&2
- fi
- fi
-}
-
-output () {
- case "$verbose" in
- '')
- output=$("$@" 2>&1 )
- status=$?
- test $status != 0 && printf "%s\n" "$output"
- return $status
- ;;
- *)
- "$@"
- ;;
- esac
-}
-
-strategy_args=${strategy:+--strategy=$strategy}
-test -n "$strategy_opts" &&
-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
-
-comment_char=$(git config --get core.commentchar 2>/dev/null)
-case "$comment_char" in
-'' | auto)
- comment_char="#"
- ;;
-?)
- ;;
-*)
- comment_char=$(echo "$comment_char" | cut -c1)
- ;;
-esac
-
-warn () {
- printf '%s\n' "$*" >&2
-}
-
-# Output the commit message for the specified commit.
-commit_message () {
- git cat-file commit "$1" | sed "1,/^$/d"
-}
-
-orig_reflog_action="$GIT_REFLOG_ACTION"
-
-comment_for_reflog () {
- case "$orig_reflog_action" in
- ''|rebase*)
- GIT_REFLOG_ACTION="rebase -i ($1)"
- export GIT_REFLOG_ACTION
- ;;
- esac
-}
-
-last_count=
-mark_action_done () {
- sed -e 1q < "$todo" >> "$done"
- sed -e 1d < "$todo" >> "$todo".new
- mv -f "$todo".new "$todo"
- new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
- echo $new_count >"$msgnum"
- total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
- echo $total >"$end"
- if test "$last_count" != "$new_count"
- then
- last_count=$new_count
- eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r"
- test -z "$verbose" || echo
- fi
-}
-
-append_todo_help () {
- gettext "
-Commands:
-p, pick <commit> = use commit
-r, reword <commit> = use commit, but edit the commit message
-e, edit <commit> = use commit, but stop for amending
-s, squash <commit> = use commit, but meld into previous commit
-f, fixup <commit> = like \"squash\", but discard this commit's log message
-x, exec <commit> = run command (the rest of the line) using shell
-d, drop <commit> = remove commit
-l, label <label> = label current HEAD with a name
-t, reset <label> = reset HEAD to a label
-m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-. create a merge commit using the original merge commit's
-. message (or the oneline, if no original merge commit was
-. specified). Use -c <commit> to reword the commit message.
-
-These lines can be re-ordered; they are executed from top to bottom.
-" | git stripspace --comment-lines >>"$todo"
-
- if test $(get_missing_commit_check_level) = error
- then
- gettext "
-Do not remove any line. Use 'drop' explicitly to remove a commit.
-" | git stripspace --comment-lines >>"$todo"
- else
- gettext "
-If you remove a line here THAT COMMIT WILL BE LOST.
-" | git stripspace --comment-lines >>"$todo"
- fi
-}
-
-make_patch () {
- sha1_and_parents="$(git rev-list --parents -1 "$1")"
- case "$sha1_and_parents" in
- ?*' '?*' '?*)
- git diff --cc $sha1_and_parents
- ;;
- ?*' '?*)
- git diff-tree -p "$1^!"
- ;;
- *)
- echo "Root commit"
- ;;
- esac > "$state_dir"/patch
- test -f "$msg" ||
- commit_message "$1" > "$msg"
- test -f "$author_script" ||
- get_author_ident_from_commit "$1" > "$author_script"
-}
-
-die_with_patch () {
- echo "$1" > "$state_dir"/stopped-sha
- git update-ref REBASE_HEAD "$1"
- make_patch "$1"
- die "$2"
-}
-
-exit_with_patch () {
- echo "$1" > "$state_dir"/stopped-sha
- git update-ref REBASE_HEAD "$1"
- make_patch $1
- git rev-parse --verify HEAD > "$amend"
- gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- warn "$(eval_gettext "\
-You can amend the commit now, with
-
- git commit --amend \$gpg_sign_opt_quoted
-
-Once you are satisfied with your changes, run
-
- git rebase --continue")"
- warn
- exit $2
-}
-
-die_abort () {
- apply_autostash
- rm -rf "$state_dir"
- die "$1"
-}
-
-has_action () {
- test -n "$(git stripspace --strip-comments <"$1")"
-}
-
-is_empty_commit() {
- tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || {
- sha1=$1
- die "$(eval_gettext "\$sha1: not a commit that can be picked")"
- }
- ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
- ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
- test "$tree" = "$ptree"
-}
-
-is_merge_commit()
-{
- git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
-}
-
-# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE exported from the current environment.
-do_with_author () {
- (
- export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
- "$@"
- )
-}
-
-git_sequence_editor () {
- if test -z "$GIT_SEQUENCE_EDITOR"
- then
- GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
- if [ -z "$GIT_SEQUENCE_EDITOR" ]
- then
- GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
- fi
- fi
-
- eval "$GIT_SEQUENCE_EDITOR" '"$@"'
-}
-
-pick_one () {
- ff=--ff
-
- case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
- case "$force_rebase" in '') ;; ?*) ff= ;; esac
- output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")"
-
- if is_empty_commit "$sha1"
- then
- empty_args="--allow-empty"
- fi
-
- pick_one_preserving_merges "$@"
-}
-
-pick_one_preserving_merges () {
- fast_forward=t
- case "$1" in
- -n)
- fast_forward=f
- sha1=$2
- ;;
- *)
- sha1=$1
- ;;
- esac
- sha1=$(git rev-parse $sha1)
-
- if test -f "$state_dir"/current-commit && test "$fast_forward" = t
- then
- while read current_commit
- do
- git rev-parse HEAD > "$rewritten"/$current_commit
- done <"$state_dir"/current-commit
- rm "$state_dir"/current-commit ||
- die "$(gettext "Cannot write current commit's replacement sha1")"
- fi
-
- echo $sha1 >> "$state_dir"/current-commit
-
- # rewrite parents; if none were rewritten, we can fast-forward.
- new_parents=
- pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
- if test "$pend" = " "
- then
- pend=" root"
- fi
- while [ "$pend" != "" ]
- do
- p=$(expr "$pend" : ' \([^ ]*\)')
- pend="${pend# $p}"
-
- if test -f "$rewritten"/$p
- then
- new_p=$(cat "$rewritten"/$p)
-
- # If the todo reordered commits, and our parent is marked for
- # rewriting, but hasn't been gotten to yet, assume the user meant to
- # drop it on top of the current HEAD
- if test -z "$new_p"
- then
- new_p=$(git rev-parse HEAD)
- fi
-
- test $p != $new_p && fast_forward=f
- case "$new_parents" in
- *$new_p*)
- ;; # do nothing; that parent is already there
- *)
- new_parents="$new_parents $new_p"
- ;;
- esac
- else
- if test -f "$dropped"/$p
- then
- fast_forward=f
- replacement="$(cat "$dropped"/$p)"
- test -z "$replacement" && replacement=root
- pend=" $replacement$pend"
- else
- new_parents="$new_parents $p"
- fi
- fi
- done
- case $fast_forward in
- t)
- output warn "$(eval_gettext "Fast-forward to \$sha1")"
- output git reset --hard $sha1 ||
- die "$(eval_gettext "Cannot fast-forward to \$sha1")"
- ;;
- f)
- first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
-
- if [ "$1" != "-n" ]
- then
- # detach HEAD to current parent
- output git checkout $first_parent 2> /dev/null ||
- die "$(eval_gettext "Cannot move HEAD to \$first_parent")"
- fi
-
- case "$new_parents" in
- ' '*' '*)
- test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")"
-
- # redo merge
- author_script_content=$(get_author_ident_from_commit $sha1)
- eval "$author_script_content"
- msg_content="$(commit_message $sha1)"
- # No point in merging the first parent, that's HEAD
- new_parents=${new_parents# $first_parent}
- merge_args="--no-log --no-ff"
- if ! do_with_author output eval \
- git merge ${gpg_sign_opt:+$(git rev-parse \
- --sq-quote "$gpg_sign_opt")} \
- $allow_rerere_autoupdate "$merge_args" \
- "$strategy_args" \
- -m "$(git rev-parse --sq-quote "$msg_content")" \
- "$new_parents"
- then
- printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
- die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")"
- fi
- echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
- ;;
- *)
- output eval git cherry-pick $allow_rerere_autoupdate \
- $allow_empty_message \
- ${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
- "$strategy_args" "$@" ||
- die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
- ;;
- esac
- ;;
- esac
-}
-
-this_nth_commit_message () {
- n=$1
- eval_gettext "This is the commit message #\${n}:"
-}
-
-skip_nth_commit_message () {
- n=$1
- eval_gettext "The commit message #\${n} will be skipped:"
-}
-
-update_squash_messages () {
- if test -f "$squash_msg"; then
- mv "$squash_msg" "$squash_msg".bak || exit
- count=$(($(sed -n \
- -e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \
- -e "q" < "$squash_msg".bak)+1))
- {
- printf '%s\n' "$comment_char $(eval_ngettext \
- "This is a combination of \$count commit." \
- "This is a combination of \$count commits." \
- $count)"
- sed -e 1d -e '2,/^./{
- /^$/d
- }' <"$squash_msg".bak
- } >"$squash_msg"
- else
- commit_message HEAD >"$fixup_msg" ||
- die "$(eval_gettext "Cannot write \$fixup_msg")"
- count=2
- {
- printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
- printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")"
- echo
- cat "$fixup_msg"
- } >"$squash_msg"
- fi
- case $1 in
- squash)
- rm -f "$fixup_msg"
- echo
- printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
- echo
- commit_message $2
- ;;
- fixup)
- echo
- printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
- echo
- # Change the space after the comment character to TAB:
- commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /'
- ;;
- esac >>"$squash_msg"
-}
-
-peek_next_command () {
- git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q
-}
-
-# A squash/fixup has failed. Prepare the long version of the squash
-# commit message, then die_with_patch. This code path requires the
-# user to edit the combined commit message for all commits that have
-# been squashed/fixedup so far. So also erase the old squash
-# messages, effectively causing the combined commit to be used as the
-# new basis for any further squash/fixups. Args: sha1 rest
-die_failed_squash() {
- sha1=$1
- rest=$2
- mv "$squash_msg" "$msg" || exit
- rm -f "$fixup_msg"
- cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
- warn
- warn "$(eval_gettext "Could not apply \$sha1... \$rest")"
- die_with_patch $sha1 ""
-}
-
-flush_rewritten_pending() {
- test -s "$rewritten_pending" || return
- newsha1="$(git rev-parse HEAD^0)"
- sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
- rm -f "$rewritten_pending"
-}
-
-record_in_rewritten() {
- oldsha1="$(git rev-parse $1)"
- echo "$oldsha1" >> "$rewritten_pending"
-
- case "$(peek_next_command)" in
- squash|s|fixup|f)
- ;;
- *)
- flush_rewritten_pending
- ;;
- esac
-}
-
-do_pick () {
- sha1=$1
- rest=$2
- if test "$(git rev-parse HEAD)" = "$squash_onto"
- then
- # Set the correct commit message and author info on the
- # sentinel root before cherry-picking the original changes
- # without committing (-n). Finally, update the sentinel again
- # to include these changes. If the cherry-pick results in a
- # conflict, this means our behaviour is similar to a standard
- # failed cherry-pick during rebase, with a dirty index to
- # resolve before manually running git commit --amend then git
- # rebase --continue.
- git commit --allow-empty --allow-empty-message --amend \
- --no-post-rewrite -n -q -C $sha1 $signoff &&
- pick_one -n $sha1 &&
- git commit --allow-empty --allow-empty-message \
- --amend --no-post-rewrite -n -q -C $sha1 $signoff \
- ${gpg_sign_opt:+"$gpg_sign_opt"} ||
- die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
- else
- pick_one $sha1 ||
- die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
- fi
-}
-
-do_next () {
- rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit
- read -r command sha1 rest < "$todo"
- case "$command" in
- "$comment_char"*|''|noop|drop|d)
- mark_action_done
- ;;
- "$cr")
- # Work around CR left by "read" (e.g. with Git for Windows' Bash).
- mark_action_done
- ;;
- pick|p)
- comment_for_reflog pick
-
- mark_action_done
- do_pick $sha1 "$rest"
- record_in_rewritten $sha1
- ;;
- reword|r)
- comment_for_reflog reword
-
- mark_action_done
- do_pick $sha1 "$rest"
- git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \
- $allow_empty_message || {
- warn "$(eval_gettext "\
-Could not amend commit after successfully picking \$sha1... \$rest
-This is most likely due to an empty commit message, or the pre-commit hook
-failed. If the pre-commit hook failed, you may need to resolve the issue before
-you are able to reword the commit.")"
- exit_with_patch $sha1 1
- }
- record_in_rewritten $sha1
- ;;
- edit|e)
- comment_for_reflog edit
-
- mark_action_done
- do_pick $sha1 "$rest"
- sha1_abbrev=$(git rev-parse --short $sha1)
- warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")"
- exit_with_patch $sha1 0
- ;;
- squash|s|fixup|f)
- case "$command" in
- squash|s)
- squash_style=squash
- ;;
- fixup|f)
- squash_style=fixup
- ;;
- esac
- comment_for_reflog $squash_style
-
- test -f "$done" && has_action "$done" ||
- die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")"
-
- mark_action_done
- update_squash_messages $squash_style $sha1
- author_script_content=$(get_author_ident_from_commit HEAD)
- echo "$author_script_content" > "$author_script"
- eval "$author_script_content"
- if ! pick_one -n $sha1
- then
- git rev-parse --verify HEAD >"$amend"
- die_failed_squash $sha1 "$rest"
- fi
- case "$(peek_next_command)" in
- squash|s|fixup|f)
- # This is an intermediate commit; its message will only be
- # used in case of trouble. So use the long version:
- do_with_author output git commit --amend --no-verify -F "$squash_msg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- ;;
- *)
- # This is the final command of this squash/fixup group
- if test -f "$fixup_msg"
- then
- do_with_author git commit --amend --no-verify -F "$fixup_msg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- else
- cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
- rm -f "$GIT_DIR"/MERGE_MSG
- do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die_failed_squash $sha1 "$rest"
- fi
- rm -f "$squash_msg" "$fixup_msg"
- ;;
- esac
- record_in_rewritten $sha1
- ;;
- x|"exec")
- read -r command rest < "$todo"
- mark_action_done
- eval_gettextln "Executing: \$rest"
- "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
- status=$?
- # Run in subshell because require_clean_work_tree can die.
- dirty=f
- (require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
- if test "$status" -ne 0
- then
- warn "$(eval_gettext "Execution failed: \$rest")"
- test "$dirty" = f ||
- warn "$(gettext "and made changes to the index and/or the working tree")"
-
- warn "$(gettext "\
-You can fix the problem, and then run
-
- git rebase --continue")"
- warn
- if test $status -eq 127 # command not found
- then
- status=1
- fi
- exit "$status"
- elif test "$dirty" = t
- then
- # TRANSLATORS: after these lines is a command to be issued by the user
- warn "$(eval_gettext "\
-Execution succeeded: \$rest
-but left changes to the index and/or the working tree
-Commit or stash your changes, and then run
-
- git rebase --continue")"
- warn
- exit 1
- fi
- ;;
- *)
- warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")"
- fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")"
- if git rev-parse --verify -q "$sha1" >/dev/null
- then
- die_with_patch $sha1 "$fixtodo"
- else
- die "$fixtodo"
- fi
- ;;
- esac
- test -s "$todo" && return
-
- comment_for_reflog finish &&
- newhead=$(git rev-parse HEAD) &&
- case $head_name in
- refs/*)
- message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
- git update-ref -m "$message" $head_name $newhead $orig_head &&
- git symbolic-ref \
- -m "$GIT_REFLOG_ACTION: returning to $head_name" \
- HEAD $head_name
- ;;
- esac && {
- test ! -f "$state_dir"/verbose ||
- git diff-tree --stat $orig_head..HEAD
- } &&
- {
- test -s "$rewritten_list" &&
- git notes copy --for-rewrite=rebase < "$rewritten_list" ||
- true # we don't care if this copying failed
- } &&
- hook="$(git rev-parse --git-path hooks/post-rewrite)"
- if test -x "$hook" && test -s "$rewritten_list"; then
- "$hook" rebase < "$rewritten_list"
- true # we don't care if this hook failed
- fi &&
- warn "$(eval_gettext "Successfully rebased and updated \$head_name.")"
-
- return 1 # not failure; just to break the do_rest loop
-}
-
-# can only return 0, when the infinite loop breaks
-do_rest () {
- while :
- do
- do_next || break
- done
-}
-
-expand_todo_ids() {
- git rebase--interactive --expand-ids
-}
-
-collapse_todo_ids() {
- git rebase--interactive --shorten-ids
-}
-
-# Switch to the branch in $into and notify it in the reflog
-checkout_onto () {
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
- output git checkout $onto || die_abort "$(gettext "could not detach HEAD")"
- git update-ref ORIG_HEAD $orig_head
-}
-
-get_missing_commit_check_level () {
- check_level=$(git config --get rebase.missingCommitsCheck)
- check_level=${check_level:-ignore}
- # Don't be case sensitive
- printf '%s' "$check_level" | tr 'A-Z' 'a-z'
-}
-
-# Initiate an action. If the cannot be any
-# further action it may exec a command
-# or exit and not return.
-#
-# TODO: Consider a cleaner return model so it
-# never exits and always return 0 if process
-# is complete.
-#
-# Parameter 1 is the action to initiate.
-#
-# Returns 0 if the action was able to complete
-# and if 1 if further processing is required.
-initiate_action () {
- case "$1" in
- continue)
- # do we have anything to commit?
- if git diff-index --cached --quiet HEAD --
- then
- # Nothing to commit -- skip this commit
-
- test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
- rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
- die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
- else
- if ! test -f "$author_script"
- then
- gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
- die "$(eval_gettext "\
-You have staged changes in your working tree.
-If these changes are meant to be
-squashed into the previous commit, run:
-
- git commit --amend \$gpg_sign_opt_quoted
-
-If they are meant to go into a new commit, run:
-
- git commit \$gpg_sign_opt_quoted
-
-In both cases, once you're done, continue with:
-
- git rebase --continue
-")"
- fi
- . "$author_script" ||
- die "$(gettext "Error trying to find the author identity to amend commit")"
- if test -f "$amend"
- then
- current_head=$(git rev-parse --verify HEAD)
- test "$current_head" = $(cat "$amend") ||
- die "$(gettext "\
-You have uncommitted changes in your working tree. Please commit them
-first and then run 'git rebase --continue' again.")"
- do_with_author git commit --amend --no-verify -F "$msg" -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die "$(gettext "Could not commit staged changes.")"
- else
- do_with_author git commit --no-verify -F "$msg" -e \
- ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
- die "$(gettext "Could not commit staged changes.")"
- fi
- fi
-
- if test -r "$state_dir"/stopped-sha
- then
- record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
- fi
-
- require_clean_work_tree "rebase"
- do_rest
- return 0
- ;;
- skip)
- git rerere clear
- do_rest
- return 0
- ;;
- edit-todo)
- git stripspace --strip-comments <"$todo" >"$todo".new
- mv -f "$todo".new "$todo"
- collapse_todo_ids
- append_todo_help
- gettext "
-You are editing the todo file of an ongoing interactive rebase.
-To continue rebase after editing, run:
- git rebase --continue
-
-" | git stripspace --comment-lines >>"$todo"
-
- git_sequence_editor "$todo" ||
- die "$(gettext "Could not execute editor")"
- expand_todo_ids
-
- exit
- ;;
- show-current-patch)
- exec git show REBASE_HEAD --
- ;;
- *)
- return 1 # continue
- ;;
- esac
-}
-
-setup_reflog_action () {
- comment_for_reflog start
-
- if test ! -z "$switch_to"
- then
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
- output git checkout "$switch_to" -- ||
- die "$(eval_gettext "Could not checkout \$switch_to")"
-
- comment_for_reflog start
- fi
-}
-
-init_basic_state () {
- orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
- mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
- rm -f "$(git rev-parse --git-path REBASE_HEAD)"
-
- : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
- write_basic_state
-}
-
-init_revisions_and_shortrevisions () {
- shorthead=$(git rev-parse --short $orig_head)
- shortonto=$(git rev-parse --short $onto)
- if test -z "$rebase_root"
- # this is now equivalent to ! -z "$upstream"
- then
- shortupstream=$(git rev-parse --short $upstream)
- revisions=$upstream...$orig_head
- shortrevisions=$shortupstream..$shorthead
- else
- revisions=$onto...$orig_head
- shortrevisions=$shorthead
- test -z "$squash_onto" ||
- echo "$squash_onto" >"$state_dir"/squash-onto
- fi
-}
-
-complete_action() {
- test -s "$todo" || echo noop >> "$todo"
- test -z "$autosquash" || git rebase--interactive --rearrange-squash || exit
- test -n "$cmd" && git rebase--interactive --add-exec-commands --cmd "$cmd"
-
- todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
- todocount=${todocount##* }
-
-cat >>"$todo" <<EOF
-
-$comment_char $(eval_ngettext \
- "Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
- "Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
- "$todocount")
-EOF
- append_todo_help
- gettext "
-However, if you remove everything, the rebase will be aborted.
-
-" | git stripspace --comment-lines >>"$todo"
-
- if test -z "$keep_empty"
- then
- printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
- fi
-
-
- has_action "$todo" ||
- return 2
-
- cp "$todo" "$todo".backup
- collapse_todo_ids
- git_sequence_editor "$todo" ||
- die_abort "$(gettext "Could not execute editor")"
-
- has_action "$todo" ||
- return 2
-
- git rebase--interactive --check-todo-list || {
- ret=$?
- checkout_onto
- exit $ret
- }
-
- expand_todo_ids
- checkout_onto
- do_rest
-}
-
-git_rebase__preserve_merges () {
- initiate_action "$action"
- ret=$?
- if test $ret = 0; then
- return 0
- fi
-
- setup_reflog_action
- init_basic_state
-
- if test -z "$rebase_root"
- then
- mkdir "$rewritten" &&
- for c in $(git merge-base --all $orig_head $upstream)
- do
- echo $onto > "$rewritten"/$c ||
- die "$(gettext "Could not init rewritten commits")"
- done
- else
- mkdir "$rewritten" &&
- echo $onto > "$rewritten"/root ||
- die "$(gettext "Could not init rewritten commits")"
- fi
-
- init_revisions_and_shortrevisions
-
- format=$(git config --get rebase.instructionFormat)
- # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
- git rev-list --format="%m%H ${format:-%s}" \
- --reverse --left-right --topo-order \
- $revisions ${restrict_revision+^$restrict_revision} | \
- sed -n "s/^>//p" |
- while read -r sha1 rest
- do
- if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
- then
- comment_out="$comment_char "
- else
- comment_out=
- fi
-
- if test -z "$rebase_root"
- then
- preserve=t
- for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
- do
- if test -f "$rewritten"/$p
- then
- preserve=f
- fi
- done
- else
- preserve=f
- fi
- if test f = "$preserve"
- then
- touch "$rewritten"/$sha1
- printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
- fi
- done
-
- # Watch for commits that been dropped by --cherry-pick
- mkdir "$dropped"
- # Save all non-cherry-picked changes
- git rev-list $revisions --left-right --cherry-pick | \
- sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
- # Now all commits and note which ones are missing in
- # not-cherry-picks and hence being dropped
- git rev-list $revisions |
- while read rev
- do
- if test -f "$rewritten"/$rev &&
- ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
- then
- # Use -f2 because if rev-list is telling us this commit is
- # not worthwhile, we don't want to track its multiple heads,
- # just the history of its first-parent for others that will
- # be rebasing on top of it
- git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev
- sha1=$(git rev-list -1 $rev)
- sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
- rm "$rewritten"/$rev
- fi
- done
-
- complete_action
-}
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e3d9f48..a15c062 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -51,12 +51,6 @@
)
}
- eval_ngettext () {
- ngettext "$1" "$2" "$3" | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
;;
*)
gettext () {
@@ -70,12 +64,6 @@
)
}
- eval_ngettext () {
- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
- export PATH $(git sh-i18n--envsubst --variables "$2");
- git sh-i18n--envsubst "$2"
- )
- }
;;
esac
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 10d9764..960982f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -217,15 +217,9 @@
then
action=$1
case "$action" in
- rebase)
- gettextln "Cannot rebase: You have unstaged changes." >&2
- ;;
"rewrite branches")
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
;;
- "pull with rebase")
- gettextln "Cannot pull with rebase: You have unstaged changes." >&2
- ;;
*)
eval_gettextln "Cannot \$action: You have unstaged changes." >&2
;;
@@ -238,17 +232,7 @@
if test $err = 0
then
action=$1
- case "$action" in
- rebase)
- gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
- ;;
- "pull with rebase")
- gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
- ;;
- *)
- eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
- ;;
- esac
+ eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
else
gettextln "Additionally, your index contains uncommitted changes." >&2
fi
diff --git a/git-submodule.sh b/git-submodule.sh
index dbd2ec2..652861a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -63,11 +63,6 @@
n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
}
-# Given a full hex object ID, is this the zero OID?
-is_zero_oid () {
- echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1
-}
-
# Sanitize the local git environment for use within a submodule. We
# can't simply use clear_local_git_env since we want to preserve some
# of the settings from GIT_CONFIG_PARAMETERS.
@@ -145,130 +140,12 @@
shift
done
- if ! git submodule--helper config --check-writeable >/dev/null 2>&1
+ if test -z "$1"
then
- die "fatal: $(eval_gettext "please make sure that the .gitmodules file is in the working tree")"
- fi
-
- if test -n "$reference_path"
- then
- is_absolute_path "$reference_path" ||
- reference_path="$wt_prefix$reference_path"
-
- reference="--reference=$reference_path"
- fi
-
- repo=$1
- sm_path=$2
-
- if test -z "$sm_path"; then
- sm_path=$(printf '%s\n' "$repo" |
- sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
- fi
-
- if test -z "$repo" || test -z "$sm_path"; then
usage
fi
- is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
-
- # assure repo is absolute or relative to parent
- case "$repo" in
- ./*|../*)
- test -z "$wt_prefix" ||
- die "fatal: $(gettext "Relative path can only be used from the toplevel of the working tree")"
-
- # dereference source url relative to parent's url
- realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
- ;;
- *:*|/*)
- # absolute url
- realrepo=$repo
- ;;
- *)
- die "fatal: $(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
- ;;
- esac
-
- # normalize path:
- # multiple //; leading ./; /./; /../; trailing /
- sm_path=$(printf '%s/\n' "$sm_path" |
- sed -e '
- s|//*|/|g
- s|^\(\./\)*||
- s|/\(\./\)*|/|g
- :start
- s|\([^/]*\)/\.\./||
- tstart
- s|/*$||
- ')
- if test -z "$force"
- then
- git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
- die "fatal: $(eval_gettext "'\$sm_path' already exists in the index")"
- else
- git ls-files -s "$sm_path" | sane_grep -v "^160000" > /dev/null 2>&1 &&
- die "fatal: $(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")"
- fi
-
- if test -d "$sm_path" &&
- test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null)
- then
- git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null ||
- die "fatal: $(eval_gettext "'\$sm_path' does not have a commit checked out")"
- fi
-
- if test -z "$force"
- then
- dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null)
- res=$?
- if test $res -ne 0
- then
- echo >&2 "$dryerr"
- exit $res
- fi
- fi
-
- if test -n "$custom_name"
- then
- sm_name="$custom_name"
- else
- sm_name="$sm_path"
- fi
-
- if ! git submodule--helper check-name "$sm_name"
- then
- die "fatal: $(eval_gettext "'$sm_name' is not a valid submodule name")"
- fi
-
- git submodule--helper add-clone ${GIT_QUIET:+--quiet} ${force:+"--force"} ${progress:+"--progress"} ${branch:+--branch "$branch"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit
- git config submodule."$sm_name".url "$realrepo"
-
- git add --no-warn-embedded-repo $force "$sm_path" ||
- die "fatal: $(eval_gettext "Failed to add submodule '\$sm_path'")"
-
- git submodule--helper config submodule."$sm_name".path "$sm_path" &&
- git submodule--helper config submodule."$sm_name".url "$repo" &&
- if test -n "$branch"
- then
- git submodule--helper config submodule."$sm_name".branch "$branch"
- fi &&
- git add --force .gitmodules ||
- die "fatal: $(eval_gettext "Failed to register submodule '\$sm_path'")"
-
- # NEEDSWORK: In a multi-working-tree world, this needs to be
- # set in the per-worktree config.
- if git config --get submodule.active >/dev/null
- then
- # If the submodule being adding isn't already covered by the
- # current configured pathspec, set the submodule's active flag
- if ! git submodule--helper is-active "$sm_path"
- then
- git config submodule."$sm_name".active "true"
- fi
- else
- git config submodule."$sm_name".active "true"
- fi
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper add ${GIT_QUIET:+--quiet} ${force:+--force} ${progress:+"--progress"} ${branch:+--branch "$branch"} ${reference_path:+--reference "$reference_path"} ${dissociate:+--dissociate} ${custom_name:+--name "$custom_name"} ${depth:+"$depth"} -- "$@"
}
#
@@ -369,13 +246,6 @@
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@"
}
-is_tip_reachable () (
- sanitize_submodule_env &&
- cd "$1" &&
- rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
- test -z "$rev"
-)
-
# usage: fetch_in_submodule <module_path> [<depth>] [<sha1>]
# Because arguments are positional, use an empty string to omit <depth>
# but include <sha1>.
@@ -519,14 +389,13 @@
git submodule--helper ensure-core-worktree "$sm_path" || exit 1
- update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
-
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
if test $just_cloned -eq 1
then
subsha1=
else
+ just_cloned=
subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify HEAD) ||
die "fatal: $(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
@@ -547,70 +416,38 @@
die "fatal: $(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
fi
- if test "$subsha1" != "$sha1" || test -n "$force"
- then
- subforce=$force
- # If we don't already have a -f flag and the submodule has never been checked out
- if test -z "$subsha1" && test -z "$force"
- then
- subforce="-f"
- fi
+ out=$(git submodule--helper run-update-procedure \
+ ${wt_prefix:+--prefix "$wt_prefix"} \
+ ${GIT_QUIET:+--quiet} \
+ ${force:+--force} \
+ ${just_cloned:+--just-cloned} \
+ ${nofetch:+--no-fetch} \
+ ${depth:+"$depth"} \
+ ${update:+--update "$update"} \
+ ${prefix:+--recursive-prefix "$prefix"} \
+ ${sha1:+--oid "$sha1"} \
+ ${subsha1:+--suboid "$subsha1"} \
+ "--" \
+ "$sm_path")
- if test -z "$nofetch"
- then
- # Run fetch only if $sha1 isn't present or it
- # is not reachable from a ref.
- is_tip_reachable "$sm_path" "$sha1" ||
- fetch_in_submodule "$sm_path" $depth ||
- say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")"
-
- # Now we tried the usual fetch, but $sha1 may
- # not be reachable from any of the refs
- is_tip_reachable "$sm_path" "$sha1" ||
- fetch_in_submodule "$sm_path" "$depth" "$sha1" ||
- die "fatal: $(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
- fi
-
- must_die_on_failure=
- case "$update_module" in
- checkout)
- command="git checkout $subforce -q"
- die_msg="fatal: $(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
- say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
- ;;
- rebase)
- command="git rebase ${GIT_QUIET:+--quiet}"
- die_msg="fatal: $(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
- say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
- must_die_on_failure=yes
- ;;
- merge)
- command="git merge ${GIT_QUIET:+--quiet}"
- die_msg="fatal: $(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
- say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
- must_die_on_failure=yes
- ;;
- !*)
- command="${update_module#!}"
- die_msg="fatal: $(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
- say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
- must_die_on_failure=yes
- ;;
- *)
- die "fatal: $(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")"
- esac
-
- if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
- then
- say "$say_msg"
- elif test -n "$must_die_on_failure"
- then
- die_with_status 2 "$die_msg"
- else
- err="${err};$die_msg"
- continue
- fi
- fi
+ # exit codes for run-update-procedure:
+ # 0: update was successful, say command output
+ # 1: update procedure failed, but should not die
+ # 2 or 128: subcommand died during execution
+ # 3: no update procedure was run
+ res="$?"
+ case $res in
+ 0)
+ say "$out"
+ ;;
+ 1)
+ err="${err};fatal: $out"
+ continue
+ ;;
+ 2|128)
+ die_with_status $res "fatal: $out"
+ ;;
+ esac
if test -n "$recursive"
then
diff --git a/git-svn.perl b/git-svn.perl
index 70cb5e2..be987e3 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -273,7 +273,6 @@
'fetch-all|all' => \$_fetch_all,
'dry-run|n' => \$_dry_run,
'rebase-merges|p' => \$_rebase_merges,
- 'preserve-merges|p' => \$_rebase_merges,
%fc_opts } ],
'commit-diff' => [ \&cmd_commit_diff,
'Commit a diff between two trees',
diff --git a/git.c b/git.c
index 18bed9a..5ff21be 100644
--- a/git.c
+++ b/git.c
@@ -561,7 +561,7 @@
{ "merge-tree", cmd_merge_tree, RUN_SETUP | NO_PARSEOPT },
{ "mktag", cmd_mktag, RUN_SETUP | NO_PARSEOPT },
{ "mktree", cmd_mktree, RUN_SETUP },
- { "multi-pack-index", cmd_multi_pack_index, RUN_SETUP_GENTLY },
+ { "multi-pack-index", cmd_multi_pack_index, RUN_SETUP },
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
{ "name-rev", cmd_name_rev, RUN_SETUP },
{ "notes", cmd_notes, RUN_SETUP },
@@ -577,7 +577,6 @@
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
- { "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "remote", cmd_remote, RUN_SETUP },
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e09e024..fbd1c20 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3796,7 +3796,8 @@
my @headslist;
open my $fd, '-|', git_cmd(), 'for-each-ref',
- ($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
+ ($limit ? '--count='.($limit+1) : ()),
+ '--sort=-HEAD', '--sort=-committerdate',
'--format=%(objectname) %(refname) %(subject)%00%(committer)',
@patterns
or return;
diff --git a/gpg-interface.c b/gpg-interface.c
index 127aecf..3e7255a 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -3,11 +3,14 @@
#include "config.h"
#include "run-command.h"
#include "strbuf.h"
+#include "dir.h"
#include "gpg-interface.h"
#include "sigchain.h"
#include "tempfile.h"
+#include "alias.h"
static char *configured_signing_key;
+static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file;
static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
struct gpg_format {
@@ -15,6 +18,14 @@
const char *program;
const char **verify_args;
const char **sigs;
+ int (*verify_signed_buffer)(struct signature_check *sigc,
+ struct gpg_format *fmt, const char *payload,
+ size_t payload_size, const char *signature,
+ size_t signature_size);
+ int (*sign_buffer)(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+ const char *(*get_default_key)(void);
+ const char *(*get_key_id)(void);
};
static const char *openpgp_verify_args[] = {
@@ -35,14 +46,59 @@
NULL
};
+static const char *ssh_verify_args[] = { NULL };
+static const char *ssh_sigs[] = {
+ "-----BEGIN SSH SIGNATURE-----",
+ NULL
+};
+
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt, const char *payload,
+ size_t payload_size, const char *signature,
+ size_t signature_size);
+static int verify_ssh_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt, const char *payload,
+ size_t payload_size, const char *signature,
+ size_t signature_size);
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key);
+
+static const char *get_default_ssh_signing_key(void);
+
+static const char *get_ssh_key_id(void);
+
static struct gpg_format gpg_format[] = {
- { .name = "openpgp", .program = "gpg",
- .verify_args = openpgp_verify_args,
- .sigs = openpgp_sigs
+ {
+ .name = "openpgp",
+ .program = "gpg",
+ .verify_args = openpgp_verify_args,
+ .sigs = openpgp_sigs,
+ .verify_signed_buffer = verify_gpg_signed_buffer,
+ .sign_buffer = sign_buffer_gpg,
+ .get_default_key = NULL,
+ .get_key_id = NULL,
},
- { .name = "x509", .program = "gpgsm",
- .verify_args = x509_verify_args,
- .sigs = x509_sigs
+ {
+ .name = "x509",
+ .program = "gpgsm",
+ .verify_args = x509_verify_args,
+ .sigs = x509_sigs,
+ .verify_signed_buffer = verify_gpg_signed_buffer,
+ .sign_buffer = sign_buffer_gpg,
+ .get_default_key = NULL,
+ .get_key_id = NULL,
+ },
+ {
+ .name = "ssh",
+ .program = "ssh-keygen",
+ .verify_args = ssh_verify_args,
+ .sigs = ssh_sigs,
+ .verify_signed_buffer = verify_ssh_signed_buffer,
+ .sign_buffer = sign_buffer_ssh,
+ .get_default_key = get_default_ssh_signing_key,
+ .get_key_id = get_ssh_key_id,
},
};
@@ -72,7 +128,7 @@
void signature_check_clear(struct signature_check *sigc)
{
FREE_AND_NULL(sigc->payload);
- FREE_AND_NULL(sigc->gpg_output);
+ FREE_AND_NULL(sigc->output);
FREE_AND_NULL(sigc->gpg_status);
FREE_AND_NULL(sigc->signer);
FREE_AND_NULL(sigc->key);
@@ -257,16 +313,16 @@
FREE_AND_NULL(sigc->key);
}
-static int verify_signed_buffer(const char *payload, size_t payload_size,
- const char *signature, size_t signature_size,
- struct strbuf *gpg_output,
- struct strbuf *gpg_status)
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt, const char *payload,
+ size_t payload_size, const char *signature,
+ size_t signature_size)
{
struct child_process gpg = CHILD_PROCESS_INIT;
- struct gpg_format *fmt;
struct tempfile *temp;
int ret;
- struct strbuf buf = STRBUF_INIT;
+ struct strbuf gpg_stdout = STRBUF_INIT;
+ struct strbuf gpg_stderr = STRBUF_INIT;
temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
if (!temp)
@@ -279,10 +335,6 @@
return -1;
}
- fmt = get_format_by_sig(signature);
- if (!fmt)
- BUG("bad signature '%s'", signature);
-
strvec_push(&gpg.args, fmt->program);
strvec_pushv(&gpg.args, fmt->verify_args);
strvec_pushl(&gpg.args,
@@ -290,18 +342,222 @@
"--verify", temp->filename.buf, "-",
NULL);
- if (!gpg_status)
- gpg_status = &buf;
-
sigchain_push(SIGPIPE, SIG_IGN);
- ret = pipe_command(&gpg, payload, payload_size,
- gpg_status, 0, gpg_output, 0);
+ ret = pipe_command(&gpg, payload, payload_size, &gpg_stdout, 0,
+ &gpg_stderr, 0);
sigchain_pop(SIGPIPE);
delete_tempfile(&temp);
- ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
- strbuf_release(&buf); /* no matter it was used or not */
+ ret |= !strstr(gpg_stdout.buf, "\n[GNUPG:] GOODSIG ");
+ sigc->payload = xmemdupz(payload, payload_size);
+ sigc->output = strbuf_detach(&gpg_stderr, NULL);
+ sigc->gpg_status = strbuf_detach(&gpg_stdout, NULL);
+
+ parse_gpg_output(sigc);
+
+ strbuf_release(&gpg_stdout);
+ strbuf_release(&gpg_stderr);
+
+ return ret;
+}
+
+static void parse_ssh_output(struct signature_check *sigc)
+{
+ const char *line, *principal, *search;
+ char *to_free;
+ char *key = NULL;
+
+ /*
+ * ssh-keygen output should be:
+ * Good "git" signature for PRINCIPAL with RSA key SHA256:FINGERPRINT
+ *
+ * or for valid but unknown keys:
+ * Good "git" signature with RSA key SHA256:FINGERPRINT
+ *
+ * Note that "PRINCIPAL" can contain whitespace, "RSA" and
+ * "SHA256" part could be a different token that names of
+ * the algorithms used, and "FINGERPRINT" is a hexadecimal
+ * string. By finding the last occurence of " with ", we can
+ * reliably parse out the PRINCIPAL.
+ */
+ sigc->result = 'B';
+ sigc->trust_level = TRUST_NEVER;
+
+ line = to_free = xmemdupz(sigc->output, strcspn(sigc->output, "\n"));
+
+ if (skip_prefix(line, "Good \"git\" signature for ", &line)) {
+ /* Search for the last "with" to get the full principal */
+ principal = line;
+ do {
+ search = strstr(line, " with ");
+ if (search)
+ line = search + 1;
+ } while (search != NULL);
+ if (line == principal)
+ goto cleanup;
+
+ /* Valid signature and known principal */
+ sigc->result = 'G';
+ sigc->trust_level = TRUST_FULLY;
+ sigc->signer = xmemdupz(principal, line - principal - 1);
+ } else if (skip_prefix(line, "Good \"git\" signature with ", &line)) {
+ /* Valid signature, but key unknown */
+ sigc->result = 'G';
+ sigc->trust_level = TRUST_UNDEFINED;
+ } else {
+ goto cleanup;
+ }
+
+ key = strstr(line, "key ");
+ if (key) {
+ sigc->fingerprint = xstrdup(strstr(line, "key ") + 4);
+ sigc->key = xstrdup(sigc->fingerprint);
+ } else {
+ /*
+ * Output did not match what we expected
+ * Treat the signature as bad
+ */
+ sigc->result = 'B';
+ }
+
+cleanup:
+ free(to_free);
+}
+
+static int verify_ssh_signed_buffer(struct signature_check *sigc,
+ struct gpg_format *fmt, const char *payload,
+ size_t payload_size, const char *signature,
+ size_t signature_size)
+{
+ struct child_process ssh_keygen = CHILD_PROCESS_INIT;
+ struct tempfile *buffer_file;
+ int ret = -1;
+ const char *line;
+ size_t trust_size;
+ char *principal;
+ struct strbuf ssh_principals_out = STRBUF_INIT;
+ struct strbuf ssh_principals_err = STRBUF_INIT;
+ struct strbuf ssh_keygen_out = STRBUF_INIT;
+ struct strbuf ssh_keygen_err = STRBUF_INIT;
+
+ if (!ssh_allowed_signers) {
+ error(_("gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification"));
+ return -1;
+ }
+
+ buffer_file = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+ if (!buffer_file)
+ return error_errno(_("could not create temporary file"));
+ if (write_in_full(buffer_file->fd, signature, signature_size) < 0 ||
+ close_tempfile_gently(buffer_file) < 0) {
+ error_errno(_("failed writing detached signature to '%s'"),
+ buffer_file->filename.buf);
+ delete_tempfile(&buffer_file);
+ return -1;
+ }
+
+ /* Find the principal from the signers */
+ strvec_pushl(&ssh_keygen.args, fmt->program,
+ "-Y", "find-principals",
+ "-f", ssh_allowed_signers,
+ "-s", buffer_file->filename.buf,
+ NULL);
+ ret = pipe_command(&ssh_keygen, NULL, 0, &ssh_principals_out, 0,
+ &ssh_principals_err, 0);
+ if (ret && strstr(ssh_principals_err.buf, "usage:")) {
+ error(_("ssh-keygen -Y find-principals/verify is needed for ssh signature verification (available in openssh version 8.2p1+)"));
+ goto out;
+ }
+ if (ret || !ssh_principals_out.len) {
+ /*
+ * We did not find a matching principal in the allowedSigners
+ * Check without validation
+ */
+ child_process_init(&ssh_keygen);
+ strvec_pushl(&ssh_keygen.args, fmt->program,
+ "-Y", "check-novalidate",
+ "-n", "git",
+ "-s", buffer_file->filename.buf,
+ NULL);
+ pipe_command(&ssh_keygen, payload, payload_size,
+ &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+
+ /*
+ * Fail on unknown keys
+ * we still call check-novalidate to display the signature info
+ */
+ ret = -1;
+ } else {
+ /* Check every principal we found (one per line) */
+ for (line = ssh_principals_out.buf; *line;
+ line = strchrnul(line + 1, '\n')) {
+ while (*line == '\n')
+ line++;
+ if (!*line)
+ break;
+
+ trust_size = strcspn(line, "\n");
+ principal = xmemdupz(line, trust_size);
+
+ child_process_init(&ssh_keygen);
+ strbuf_release(&ssh_keygen_out);
+ strbuf_release(&ssh_keygen_err);
+ strvec_push(&ssh_keygen.args, fmt->program);
+ /*
+ * We found principals
+ * Try with each until we find a match
+ */
+ strvec_pushl(&ssh_keygen.args, "-Y", "verify",
+ "-n", "git",
+ "-f", ssh_allowed_signers,
+ "-I", principal,
+ "-s", buffer_file->filename.buf,
+ NULL);
+
+ if (ssh_revocation_file) {
+ if (file_exists(ssh_revocation_file)) {
+ strvec_pushl(&ssh_keygen.args, "-r",
+ ssh_revocation_file, NULL);
+ } else {
+ warning(_("ssh signing revocation file configured but not found: %s"),
+ ssh_revocation_file);
+ }
+ }
+
+ sigchain_push(SIGPIPE, SIG_IGN);
+ ret = pipe_command(&ssh_keygen, payload, payload_size,
+ &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+ sigchain_pop(SIGPIPE);
+
+ FREE_AND_NULL(principal);
+
+ if (!ret)
+ ret = !starts_with(ssh_keygen_out.buf, "Good");
+
+ if (!ret)
+ break;
+ }
+ }
+
+ sigc->payload = xmemdupz(payload, payload_size);
+ strbuf_stripspace(&ssh_keygen_out, 0);
+ strbuf_stripspace(&ssh_keygen_err, 0);
+ /* Add stderr outputs to show the user actual ssh-keygen errors */
+ strbuf_add(&ssh_keygen_out, ssh_principals_err.buf, ssh_principals_err.len);
+ strbuf_add(&ssh_keygen_out, ssh_keygen_err.buf, ssh_keygen_err.len);
+ sigc->output = strbuf_detach(&ssh_keygen_out, NULL);
+ sigc->gpg_status = xstrdup(sigc->output);
+
+ parse_ssh_output(sigc);
+
+out:
+ if (buffer_file)
+ delete_tempfile(&buffer_file);
+ strbuf_release(&ssh_principals_out);
+ strbuf_release(&ssh_principals_err);
+ strbuf_release(&ssh_keygen_out);
+ strbuf_release(&ssh_keygen_err);
return ret;
}
@@ -309,35 +565,32 @@
int check_signature(const char *payload, size_t plen, const char *signature,
size_t slen, struct signature_check *sigc)
{
- struct strbuf gpg_output = STRBUF_INIT;
- struct strbuf gpg_status = STRBUF_INIT;
+ struct gpg_format *fmt;
int status;
sigc->result = 'N';
sigc->trust_level = -1;
- status = verify_signed_buffer(payload, plen, signature, slen,
- &gpg_output, &gpg_status);
- if (status && !gpg_output.len)
- goto out;
- sigc->payload = xmemdupz(payload, plen);
- sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
- sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
- parse_gpg_output(sigc);
+ fmt = get_format_by_sig(signature);
+ if (!fmt)
+ die(_("bad/incompatible signature '%s'"), signature);
+
+ status = fmt->verify_signed_buffer(sigc, fmt, payload, plen, signature,
+ slen);
+
+ if (status && !sigc->output)
+ return !!status;
+
status |= sigc->result != 'G';
status |= sigc->trust_level < configured_min_trust_level;
- out:
- strbuf_release(&gpg_status);
- strbuf_release(&gpg_output);
-
return !!status;
}
void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
{
- const char *output = flags & GPG_VERIFY_RAW ?
- sigc->gpg_status : sigc->gpg_output;
+ const char *output = flags & GPG_VERIFY_RAW ? sigc->gpg_status :
+ sigc->output;
if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
fputs(sigc->payload, stdout);
@@ -419,12 +672,33 @@
return 0;
}
+ if (!strcmp(var, "gpg.ssh.defaultkeycommand")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_string(&ssh_default_key_command, var, value);
+ }
+
+ if (!strcmp(var, "gpg.ssh.allowedsignersfile")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_pathname(&ssh_allowed_signers, var, value);
+ }
+
+ if (!strcmp(var, "gpg.ssh.revocationfile")) {
+ if (!value)
+ return config_error_nonbool(var);
+ return git_config_pathname(&ssh_revocation_file, var, value);
+ }
+
if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
fmtname = "openpgp";
if (!strcmp(var, "gpg.x509.program"))
fmtname = "x509";
+ if (!strcmp(var, "gpg.ssh.program"))
+ fmtname = "ssh";
+
if (fmtname) {
fmt = get_format_by_name(fmtname);
return git_config_string(&fmt->program, var, value);
@@ -433,18 +707,148 @@
return 0;
}
+static char *get_ssh_key_fingerprint(const char *signing_key)
+{
+ struct child_process ssh_keygen = CHILD_PROCESS_INIT;
+ int ret = -1;
+ struct strbuf fingerprint_stdout = STRBUF_INIT;
+ struct strbuf **fingerprint;
+ char *fingerprint_ret;
+
+ /*
+ * With SSH Signing this can contain a filename or a public key
+ * For textual representation we usually want a fingerprint
+ */
+ if (starts_with(signing_key, "ssh-")) {
+ strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", "-", NULL);
+ ret = pipe_command(&ssh_keygen, signing_key,
+ strlen(signing_key), &fingerprint_stdout, 0,
+ NULL, 0);
+ } else {
+ strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf",
+ configured_signing_key, NULL);
+ ret = pipe_command(&ssh_keygen, NULL, 0, &fingerprint_stdout, 0,
+ NULL, 0);
+ }
+
+ if (!!ret)
+ die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+ signing_key);
+
+ fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3);
+ if (!fingerprint[1])
+ die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+ signing_key);
+
+ fingerprint_ret = strbuf_detach(fingerprint[1], NULL);
+ strbuf_list_free(fingerprint);
+ strbuf_release(&fingerprint_stdout);
+ return fingerprint_ret;
+}
+
+/* Returns the first public key from an ssh-agent to use for signing */
+static const char *get_default_ssh_signing_key(void)
+{
+ struct child_process ssh_default_key = CHILD_PROCESS_INIT;
+ int ret = -1;
+ struct strbuf key_stdout = STRBUF_INIT, key_stderr = STRBUF_INIT;
+ struct strbuf **keys;
+ char *key_command = NULL;
+ const char **argv;
+ int n;
+ char *default_key = NULL;
+
+ if (!ssh_default_key_command)
+ die(_("either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"));
+
+ key_command = xstrdup(ssh_default_key_command);
+ n = split_cmdline(key_command, &argv);
+
+ if (n < 0)
+ die("malformed build-time gpg.ssh.defaultKeyCommand: %s",
+ split_cmdline_strerror(n));
+
+ strvec_pushv(&ssh_default_key.args, argv);
+ ret = pipe_command(&ssh_default_key, NULL, 0, &key_stdout, 0,
+ &key_stderr, 0);
+
+ if (!ret) {
+ keys = strbuf_split_max(&key_stdout, '\n', 2);
+ if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
+ default_key = strbuf_detach(keys[0], NULL);
+ } else {
+ warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
+ key_stderr.buf, key_stdout.buf);
+ }
+
+ strbuf_list_free(keys);
+ } else {
+ warning(_("gpg.ssh.defaultKeyCommand failed: %s %s"),
+ key_stderr.buf, key_stdout.buf);
+ }
+
+ free(key_command);
+ free(argv);
+ strbuf_release(&key_stdout);
+
+ return default_key;
+}
+
+static const char *get_ssh_key_id(void) {
+ return get_ssh_key_fingerprint(get_signing_key());
+}
+
+/* Returns a textual but unique representation of the signing key */
+const char *get_signing_key_id(void)
+{
+ if (use_format->get_key_id) {
+ return use_format->get_key_id();
+ }
+
+ /* GPG/GPGSM only store a key id on this variable */
+ return get_signing_key();
+}
+
const char *get_signing_key(void)
{
if (configured_signing_key)
return configured_signing_key;
- return git_committer_info(IDENT_STRICT|IDENT_NO_DATE);
+ if (use_format->get_default_key) {
+ return use_format->get_default_key();
+ }
+
+ return git_committer_info(IDENT_STRICT | IDENT_NO_DATE);
}
int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
{
+ return use_format->sign_buffer(buffer, signature, signing_key);
+}
+
+/*
+ * Strip CR from the line endings, in case we are on Windows.
+ * NEEDSWORK: make it trim only CRs before LFs and rename
+ */
+static void remove_cr_after(struct strbuf *buffer, size_t offset)
+{
+ size_t i, j;
+
+ for (i = j = offset; i < buffer->len; i++) {
+ if (buffer->buf[i] != '\r') {
+ if (i != j)
+ buffer->buf[j] = buffer->buf[i];
+ j++;
+ }
+ }
+ strbuf_setlen(buffer, j);
+}
+
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key)
+{
struct child_process gpg = CHILD_PROCESS_INIT;
int ret;
- size_t i, j, bottom;
+ size_t bottom;
struct strbuf gpg_status = STRBUF_INIT;
strvec_pushl(&gpg.args,
@@ -470,13 +874,98 @@
return error(_("gpg failed to sign the data"));
/* Strip CR from the line endings, in case we are on Windows. */
- for (i = j = bottom; i < signature->len; i++)
- if (signature->buf[i] != '\r') {
- if (i != j)
- signature->buf[j] = signature->buf[i];
- j++;
- }
- strbuf_setlen(signature, j);
+ remove_cr_after(signature, bottom);
return 0;
}
+
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+ const char *signing_key)
+{
+ struct child_process signer = CHILD_PROCESS_INIT;
+ int ret = -1;
+ size_t bottom, keylen;
+ struct strbuf signer_stderr = STRBUF_INIT;
+ struct tempfile *key_file = NULL, *buffer_file = NULL;
+ char *ssh_signing_key_file = NULL;
+ struct strbuf ssh_signature_filename = STRBUF_INIT;
+
+ if (!signing_key || signing_key[0] == '\0')
+ return error(
+ _("user.signingkey needs to be set for ssh signing"));
+
+ if (starts_with(signing_key, "ssh-")) {
+ /* A literal ssh key */
+ key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX");
+ if (!key_file)
+ return error_errno(
+ _("could not create temporary file"));
+ keylen = strlen(signing_key);
+ if (write_in_full(key_file->fd, signing_key, keylen) < 0 ||
+ close_tempfile_gently(key_file) < 0) {
+ error_errno(_("failed writing ssh signing key to '%s'"),
+ key_file->filename.buf);
+ goto out;
+ }
+ ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL);
+ } else {
+ /* We assume a file */
+ ssh_signing_key_file = expand_user_path(signing_key, 1);
+ }
+
+ buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX");
+ if (!buffer_file) {
+ error_errno(_("could not create temporary file"));
+ goto out;
+ }
+
+ if (write_in_full(buffer_file->fd, buffer->buf, buffer->len) < 0 ||
+ close_tempfile_gently(buffer_file) < 0) {
+ error_errno(_("failed writing ssh signing key buffer to '%s'"),
+ buffer_file->filename.buf);
+ goto out;
+ }
+
+ strvec_pushl(&signer.args, use_format->program,
+ "-Y", "sign",
+ "-n", "git",
+ "-f", ssh_signing_key_file,
+ buffer_file->filename.buf,
+ NULL);
+
+ sigchain_push(SIGPIPE, SIG_IGN);
+ ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0);
+ sigchain_pop(SIGPIPE);
+
+ if (ret) {
+ if (strstr(signer_stderr.buf, "usage:"))
+ error(_("ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)"));
+
+ error("%s", signer_stderr.buf);
+ goto out;
+ }
+
+ bottom = signature->len;
+
+ strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename);
+ strbuf_addstr(&ssh_signature_filename, ".sig");
+ if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) {
+ error_errno(
+ _("failed reading ssh signing data buffer from '%s'"),
+ ssh_signature_filename.buf);
+ }
+ unlink_or_warn(ssh_signature_filename.buf);
+
+ /* Strip CR from the line endings, in case we are on Windows. */
+ remove_cr_after(signature, bottom);
+
+out:
+ if (key_file)
+ delete_tempfile(&key_file);
+ if (buffer_file)
+ delete_tempfile(&buffer_file);
+ strbuf_release(&signer_stderr);
+ strbuf_release(&ssh_signature_filename);
+ FREE_AND_NULL(ssh_signing_key_file);
+ return ret;
+}
diff --git a/gpg-interface.h b/gpg-interface.h
index 80567e4..beefacb 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -17,7 +17,7 @@
struct signature_check {
char *payload;
- char *gpg_output;
+ char *output;
char *gpg_status;
/*
@@ -64,6 +64,12 @@
int git_gpg_config(const char *, const char *, void *);
void set_signing_key(const char *);
const char *get_signing_key(void);
+
+/*
+ * Returns a textual unique representation of the signing key in use
+ * Either a GPG KeyID or a SSH Key Fingerprint
+ */
+const char *get_signing_key_id(void);
int check_signature(const char *payload, size_t plen,
const char *signature, size_t slen,
struct signature_check *sigc);
diff --git a/grep.c b/grep.c
index 424a395..fe847a0 100644
--- a/grep.c
+++ b/grep.c
@@ -867,7 +867,7 @@
free_pattern_expr(opt->pattern_expression);
}
-static char *end_of_line(char *cp, unsigned long *left)
+static const char *end_of_line(const char *cp, unsigned long *left)
{
unsigned long l = *left;
while (l && *cp != '\n') {
@@ -908,7 +908,8 @@
opt->output(opt, opt->null_following_name ? "\0" : "\n", 1);
}
-static int patmatch(struct grep_pat *p, char *line, char *eol,
+static int patmatch(struct grep_pat *p,
+ const char *line, const char *eol,
regmatch_t *match, int eflags)
{
int hit;
@@ -922,20 +923,16 @@
return hit;
}
-static int strip_timestamp(char *bol, char **eol_p)
+static void strip_timestamp(const char *bol, const char **eol_p)
{
- char *eol = *eol_p;
- int ch;
+ const char *eol = *eol_p;
while (bol < --eol) {
if (*eol != '>')
continue;
*eol_p = ++eol;
- ch = *eol;
- *eol = '\0';
- return ch;
+ break;
}
- return 0;
}
static struct {
@@ -947,37 +944,18 @@
{ "reflog ", 7 },
};
-static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
- enum grep_context ctx,
- regmatch_t *pmatch, int eflags)
+static int headerless_match_one_pattern(struct grep_pat *p,
+ const char *bol, const char *eol,
+ enum grep_context ctx,
+ regmatch_t *pmatch, int eflags)
{
int hit = 0;
- int saved_ch = 0;
const char *start = bol;
if ((p->token != GREP_PATTERN) &&
((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD)))
return 0;
- if (p->token == GREP_PATTERN_HEAD) {
- const char *field;
- size_t len;
- assert(p->field < ARRAY_SIZE(header_field));
- field = header_field[p->field].field;
- len = header_field[p->field].len;
- if (strncmp(bol, field, len))
- return 0;
- bol += len;
- switch (p->field) {
- case GREP_HEADER_AUTHOR:
- case GREP_HEADER_COMMITTER:
- saved_ch = strip_timestamp(bol, &eol);
- break;
- default:
- break;
- }
- }
-
again:
hit = patmatch(p, bol, eol, pmatch, eflags);
@@ -1021,8 +999,6 @@
goto again;
}
}
- if (p->token == GREP_PATTERN_HEAD && saved_ch)
- *eol = saved_ch;
if (hit) {
pmatch[0].rm_so += bol - start;
pmatch[0].rm_eo += bol - start;
@@ -1030,8 +1006,39 @@
return hit;
}
-static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x, char *bol,
- char *eol, enum grep_context ctx, ssize_t *col,
+static int match_one_pattern(struct grep_pat *p,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ int eflags)
+{
+ const char *field;
+ size_t len;
+
+ if (p->token == GREP_PATTERN_HEAD) {
+ assert(p->field < ARRAY_SIZE(header_field));
+ field = header_field[p->field].field;
+ len = header_field[p->field].len;
+ if (strncmp(bol, field, len))
+ return 0;
+ bol += len;
+
+ switch (p->field) {
+ case GREP_HEADER_AUTHOR:
+ case GREP_HEADER_COMMITTER:
+ strip_timestamp(bol, &eol);
+ break;
+ default:
+ break;
+ }
+ }
+
+ return headerless_match_one_pattern(p, bol, eol, ctx, pmatch, eflags);
+}
+
+
+static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x,
+ const char *bol, const char *eol,
+ enum grep_context ctx, ssize_t *col,
ssize_t *icol, int collect_hits)
{
int h = 0;
@@ -1098,7 +1105,8 @@
return h;
}
-static int match_expr(struct grep_opt *opt, char *bol, char *eol,
+static int match_expr(struct grep_opt *opt,
+ const char *bol, const char *eol,
enum grep_context ctx, ssize_t *col,
ssize_t *icol, int collect_hits)
{
@@ -1106,7 +1114,8 @@
return match_expr_eval(opt, x, bol, eol, ctx, col, icol, collect_hits);
}
-static int match_line(struct grep_opt *opt, char *bol, char *eol,
+static int match_line(struct grep_opt *opt,
+ const char *bol, const char *eol,
ssize_t *col, ssize_t *icol,
enum grep_context ctx, int collect_hits)
{
@@ -1138,13 +1147,14 @@
return hit;
}
-static int match_next_pattern(struct grep_pat *p, char *bol, char *eol,
+static int match_next_pattern(struct grep_pat *p,
+ const char *bol, const char *eol,
enum grep_context ctx,
regmatch_t *pmatch, int eflags)
{
regmatch_t match;
- if (!match_one_pattern(p, bol, eol, ctx, &match, eflags))
+ if (!headerless_match_one_pattern(p, bol, eol, ctx, &match, eflags))
return 0;
if (match.rm_so < 0 || match.rm_eo < 0)
return 0;
@@ -1159,18 +1169,26 @@
return 1;
}
-static int next_match(struct grep_opt *opt, char *bol, char *eol,
- enum grep_context ctx, regmatch_t *pmatch, int eflags)
+int grep_next_match(struct grep_opt *opt,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ enum grep_header_field field, int eflags)
{
struct grep_pat *p;
int hit = 0;
pmatch->rm_so = pmatch->rm_eo = -1;
if (bol < eol) {
- for (p = opt->pattern_list; p; p = p->next) {
+ for (p = ((ctx == GREP_CONTEXT_HEAD)
+ ? opt->header_list : opt->pattern_list);
+ p; p = p->next) {
switch (p->token) {
- case GREP_PATTERN: /* atom */
case GREP_PATTERN_HEAD:
+ if ((field != GREP_HEADER_FIELD_MAX) &&
+ (p->field != field))
+ continue;
+ /* fall thru */
+ case GREP_PATTERN: /* atom */
case GREP_PATTERN_BODY:
hit |= match_next_pattern(p, bol, eol, ctx,
pmatch, eflags);
@@ -1215,7 +1233,8 @@
}
}
-static void show_line(struct grep_opt *opt, char *bol, char *eol,
+static void show_line(struct grep_opt *opt,
+ const char *bol, const char *eol,
const char *name, unsigned lno, ssize_t cno, char sign)
{
int rest = eol - bol;
@@ -1246,7 +1265,6 @@
if (opt->color || opt->only_matching) {
regmatch_t match;
enum grep_context ctx = GREP_CONTEXT_BODY;
- int ch = *eol;
int eflags = 0;
if (opt->color) {
@@ -1261,8 +1279,8 @@
else if (sign == '=')
line_color = opt->colors[GREP_COLOR_FUNCTION];
}
- *eol = '\0';
- while (next_match(opt, bol, eol, ctx, &match, eflags)) {
+ while (grep_next_match(opt, bol, eol, ctx, &match,
+ GREP_HEADER_FIELD_MAX, eflags)) {
if (match.rm_so == match.rm_eo)
break;
@@ -1279,7 +1297,6 @@
rest -= match.rm_eo;
eflags = REG_NOTBOL;
}
- *eol = ch;
}
if (!opt->only_matching) {
output_color(opt, bol, rest, line_color);
@@ -1307,7 +1324,8 @@
pthread_mutex_unlock(&grep_attr_mutex);
}
-static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
+static int match_funcname(struct grep_opt *opt, struct grep_source *gs,
+ const char *bol, const char *eol)
{
xdemitconf_t *xecfg = opt->priv;
if (xecfg && !xecfg->find_func) {
@@ -1334,10 +1352,10 @@
}
static void show_funcname_line(struct grep_opt *opt, struct grep_source *gs,
- char *bol, unsigned lno)
+ const char *bol, unsigned lno)
{
while (bol > gs->buf) {
- char *eol = --bol;
+ const char *eol = --bol;
while (bol > gs->buf && bol[-1] != '\n')
bol--;
@@ -1356,7 +1374,7 @@
static int is_empty_line(const char *bol, const char *eol);
static void show_pre_context(struct grep_opt *opt, struct grep_source *gs,
- char *bol, char *end, unsigned lno)
+ const char *bol, const char *end, unsigned lno)
{
unsigned cur = lno, from = 1, funcname_lno = 0, orig_from;
int funcname_needed = !!opt->funcname, comment_needed = 0;
@@ -1376,8 +1394,8 @@
/* Rewind. */
while (bol > gs->buf && cur > from) {
- char *next_bol = bol;
- char *eol = --bol;
+ const char *next_bol = bol;
+ const char *eol = --bol;
while (bol > gs->buf && bol[-1] != '\n')
bol--;
@@ -1408,7 +1426,7 @@
/* Back forward. */
while (cur < lno) {
- char *eol = bol, sign = (cur == funcname_lno) ? '=' : '-';
+ const char *eol = bol, sign = (cur == funcname_lno) ? '=' : '-';
while (*eol != '\n')
eol++;
@@ -1436,12 +1454,12 @@
static int look_ahead(struct grep_opt *opt,
unsigned long *left_p,
unsigned *lno_p,
- char **bol_p)
+ const char **bol_p)
{
unsigned lno = *lno_p;
- char *bol = *bol_p;
+ const char *bol = *bol_p;
struct grep_pat *p;
- char *sp, *last_bol;
+ const char *sp, *last_bol;
regoff_t earliest = -1;
for (p = opt->pattern_list; p; p = p->next) {
@@ -1543,8 +1561,8 @@
static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int collect_hits)
{
- char *bol;
- char *peek_bol = NULL;
+ const char *bol;
+ const char *peek_bol = NULL;
unsigned long left;
unsigned lno = 1;
unsigned last_hit = 0;
@@ -1626,7 +1644,7 @@
bol = gs->buf;
left = gs->size;
while (left) {
- char *eol, ch;
+ const char *eol;
int hit;
ssize_t cno;
ssize_t col = -1, icol = -1;
@@ -1647,14 +1665,11 @@
&& look_ahead(opt, &left, &lno, &bol))
break;
eol = end_of_line(bol, &left);
- ch = *eol;
- *eol = 0;
if ((ctx == GREP_CONTEXT_HEAD) && (eol == bol))
ctx = GREP_CONTEXT_BODY;
hit = match_line(opt, bol, eol, &col, &icol, ctx, collect_hits);
- *eol = ch;
if (collect_hits)
goto next_line;
@@ -1713,7 +1728,7 @@
}
if (show_function && (!peek_bol || peek_bol < bol)) {
unsigned long peek_left = left;
- char *peek_eol = eol;
+ const char *peek_eol = eol;
/*
* Trailing empty lines are not interesting.
@@ -1825,14 +1840,25 @@
return grep_source_1(opt, gs, 0);
}
-int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size)
+static void grep_source_init_buf(struct grep_source *gs,
+ const char *buf,
+ unsigned long size)
+{
+ gs->type = GREP_SOURCE_BUF;
+ gs->name = NULL;
+ gs->path = NULL;
+ gs->buf = buf;
+ gs->size = size;
+ gs->driver = NULL;
+ gs->identifier = NULL;
+}
+
+int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size)
{
struct grep_source gs;
int r;
- grep_source_init(&gs, GREP_SOURCE_BUF, NULL, NULL, NULL);
- gs.buf = buf;
- gs.size = size;
+ grep_source_init_buf(&gs, buf, size);
r = grep_source(opt, &gs);
@@ -1840,28 +1866,30 @@
return r;
}
-void grep_source_init(struct grep_source *gs, enum grep_source_type type,
- const char *name, const char *path,
- const void *identifier)
+void grep_source_init_file(struct grep_source *gs, const char *name,
+ const char *path)
{
- gs->type = type;
+ gs->type = GREP_SOURCE_FILE;
gs->name = xstrdup_or_null(name);
gs->path = xstrdup_or_null(path);
gs->buf = NULL;
gs->size = 0;
gs->driver = NULL;
+ gs->identifier = xstrdup(path);
+}
- switch (type) {
- case GREP_SOURCE_FILE:
- gs->identifier = xstrdup(identifier);
- break;
- case GREP_SOURCE_OID:
- gs->identifier = oiddup(identifier);
- break;
- case GREP_SOURCE_BUF:
- gs->identifier = NULL;
- break;
- }
+void grep_source_init_oid(struct grep_source *gs, const char *name,
+ const char *path, const struct object_id *oid,
+ struct repository *repo)
+{
+ gs->type = GREP_SOURCE_OID;
+ gs->name = xstrdup_or_null(name);
+ gs->path = xstrdup_or_null(path);
+ gs->buf = NULL;
+ gs->size = 0;
+ gs->driver = NULL;
+ gs->identifier = oiddup(oid);
+ gs->repo = repo;
}
void grep_source_clear(struct grep_source *gs)
@@ -1877,7 +1905,9 @@
switch (gs->type) {
case GREP_SOURCE_FILE:
case GREP_SOURCE_OID:
- FREE_AND_NULL(gs->buf);
+ /* these types own the buffer */
+ free((char *)gs->buf);
+ gs->buf = NULL;
gs->size = 0;
break;
case GREP_SOURCE_BUF:
@@ -1890,7 +1920,8 @@
{
enum object_type type;
- gs->buf = read_object_file(gs->identifier, &type, &gs->size);
+ gs->buf = repo_read_object_file(gs->repo, gs->identifier, &type,
+ &gs->size);
if (!gs->buf)
return error(_("'%s': unable to read %s"),
gs->name,
diff --git a/grep.h b/grep.h
index 72f82b1..3e8815c 100644
--- a/grep.h
+++ b/grep.h
@@ -120,7 +120,20 @@
struct grep_pat *header_list;
struct grep_pat **header_tail;
struct grep_expr *pattern_expression;
+
+ /*
+ * NEEDSWORK: See if we can remove this field, because the repository
+ * should probably be per-source. That is, grep.c functions using this
+ * field should probably start using "repo" in "struct grep_source"
+ * instead.
+ *
+ * This is potentially the cause of at least one bug - "git grep"
+ * using the textconv attributes from the superproject on the
+ * submodules. See the failing "git grep --textconv" tests in
+ * t7814-grep-recurse-submodules.sh for more information.
+ */
struct repository *repo;
+
const char *prefix;
int prefix_length;
regex_t regexp;
@@ -176,7 +189,16 @@
void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
void compile_grep_patterns(struct grep_opt *opt);
void free_grep_patterns(struct grep_opt *opt);
-int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
+int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size);
+
+/* The field parameter is only used to filter header patterns
+ * (where appropriate). If filtering isn't desirable
+ * GREP_HEADER_FIELD_MAX should be supplied.
+ */
+int grep_next_match(struct grep_opt *opt,
+ const char *bol, const char *eol,
+ enum grep_context ctx, regmatch_t *pmatch,
+ enum grep_header_field field, int eflags);
struct grep_source {
char *name;
@@ -187,17 +209,20 @@
GREP_SOURCE_BUF,
} type;
void *identifier;
+ struct repository *repo; /* if GREP_SOURCE_OID */
- char *buf;
+ const char *buf;
unsigned long size;
char *path; /* for attribute lookups */
struct userdiff_driver *driver;
};
-void grep_source_init(struct grep_source *gs, enum grep_source_type type,
- const char *name, const char *path,
- const void *identifier);
+void grep_source_init_file(struct grep_source *gs, const char *name,
+ const char *path);
+void grep_source_init_oid(struct grep_source *gs, const char *name,
+ const char *path, const struct object_id *oid,
+ struct repository *repo);
void grep_source_clear_data(struct grep_source *gs);
void grep_source_clear(struct grep_source *gs);
void grep_source_load_driver(struct grep_source *gs,
@@ -207,7 +232,6 @@
int grep_source(struct grep_opt *opt, struct grep_source *gs);
struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
-int grep_threads_ok(const struct grep_opt *opt);
/*
* Mutex used around access to the attributes machinery if
diff --git a/help.c b/help.c
index 3c3bdec..973e47c 100644
--- a/help.c
+++ b/help.c
@@ -11,6 +11,7 @@
#include "version.h"
#include "refs.h"
#include "parse-options.h"
+#include "prompt.h"
struct category_description {
uint32_t category;
@@ -292,9 +293,21 @@
exclude_cmds(other_cmds, main_cmds);
}
-void list_commands(unsigned int colopts,
- struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+static int get_colopts(const char *var, const char *value, void *data)
{
+ unsigned int *colopts = data;
+
+ if (starts_with(var, "column."))
+ return git_column_config(var, value, "help", colopts);
+
+ return 0;
+}
+
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+{
+ unsigned int colopts = 0;
+ git_config(get_colopts, &colopts);
+
if (main_cmds->cnt) {
const char *exec_path = git_exec_path();
printf_ln(_("available git commands in '%s'"), exec_path);
@@ -472,6 +485,7 @@
static int autocorrect;
static struct cmdnames aliases;
+#define AUTOCORRECT_PROMPT (-3)
#define AUTOCORRECT_NEVER (-2)
#define AUTOCORRECT_IMMEDIATELY (-1)
@@ -486,6 +500,8 @@
autocorrect = AUTOCORRECT_NEVER;
} else if (!strcmp(value, "immediate")) {
autocorrect = AUTOCORRECT_IMMEDIATELY;
+ } else if (!strcmp(value, "prompt")) {
+ autocorrect = AUTOCORRECT_PROMPT;
} else {
int v = git_config_int(var, value);
autocorrect = (v < 0)
@@ -539,6 +555,12 @@
read_early_config(git_unknown_cmd_config, NULL);
+ /*
+ * Disable autocorrection prompt in a non-interactive session
+ */
+ if ((autocorrect == AUTOCORRECT_PROMPT) && (!isatty(0) || !isatty(2)))
+ autocorrect = AUTOCORRECT_NEVER;
+
if (autocorrect == AUTOCORRECT_NEVER) {
fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
exit(1);
@@ -618,7 +640,16 @@
_("Continuing under the assumption that "
"you meant '%s'."),
assumed);
- else {
+ else if (autocorrect == AUTOCORRECT_PROMPT) {
+ char *answer;
+ struct strbuf msg = STRBUF_INIT;
+ strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
+ answer = git_prompt(msg.buf, PROMPT_ECHO);
+ strbuf_release(&msg);
+ if (!(starts_with(answer, "y") ||
+ starts_with(answer, "Y")))
+ exit(1);
+ } else {
fprintf_ln(stderr,
_("Continuing in %0.1f seconds, "
"assuming that you meant '%s'."),
diff --git a/help.h b/help.h
index 5871e93..9d383f1 100644
--- a/help.h
+++ b/help.h
@@ -37,7 +37,7 @@
/* Here we require that excludes is a sorted list. */
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
int is_in_cmdlist(struct cmdnames *cmds, const char *name);
-void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds);
void get_version_info(struct strbuf *buf, int show_build_options);
/*
diff --git a/hook.c b/hook.c
new file mode 100644
index 0000000..55e1145
--- /dev/null
+++ b/hook.c
@@ -0,0 +1,42 @@
+#include "cache.h"
+#include "hook.h"
+#include "run-command.h"
+
+const char *find_hook(const char *name)
+{
+ static struct strbuf path = STRBUF_INIT;
+
+ strbuf_reset(&path);
+ strbuf_git_path(&path, "hooks/%s", name);
+ if (access(path.buf, X_OK) < 0) {
+ int err = errno;
+
+#ifdef STRIP_EXTENSION
+ strbuf_addstr(&path, STRIP_EXTENSION);
+ if (access(path.buf, X_OK) >= 0)
+ return path.buf;
+ if (errno == EACCES)
+ err = errno;
+#endif
+
+ if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
+ static struct string_list advise_given = STRING_LIST_INIT_DUP;
+
+ if (!string_list_lookup(&advise_given, name)) {
+ string_list_insert(&advise_given, name);
+ advise(_("The '%s' hook was ignored because "
+ "it's not set as executable.\n"
+ "You can disable this warning with "
+ "`git config advice.ignoredHook false`."),
+ path.buf);
+ }
+ }
+ return NULL;
+ }
+ return path.buf;
+}
+
+int hook_exists(const char *name)
+{
+ return !!find_hook(name);
+}
diff --git a/hook.h b/hook.h
new file mode 100644
index 0000000..6aa36fc
--- /dev/null
+++ b/hook.h
@@ -0,0 +1,16 @@
+#ifndef HOOK_H
+#define HOOK_H
+
+/*
+ * Returns the path to the hook file, or NULL if the hook is missing
+ * or disabled. Note that this points to static storage that will be
+ * overwritten by further calls to find_hook and run_hook_*.
+ */
+const char *find_hook(const char *name);
+
+/**
+ * A boolean version of find_hook()
+ */
+int hook_exists(const char *hookname);
+
+#endif
diff --git a/http-backend.c b/http-backend.c
index b329bf6..3d6e2ff 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -466,9 +466,7 @@
struct child_process cld = CHILD_PROCESS_INIT;
ssize_t req_len = get_content_length();
- if (encoding && !strcmp(encoding, "gzip"))
- gzipped_request = 1;
- else if (encoding && !strcmp(encoding, "x-gzip"))
+ if (encoding && (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")))
gzipped_request = 1;
if (!user || !*user)
@@ -534,7 +532,7 @@
if (service_name) {
const char *argv[] = {NULL /* service name */,
- "--stateless-rpc", "--advertise-refs",
+ "--http-backend-info-refs",
".", NULL};
struct rpc_service *svc = select_service(hdr, service_name);
@@ -739,6 +737,7 @@
int cmd_main(int argc, const char **argv)
{
char *method = getenv("REQUEST_METHOD");
+ const char *proto_header;
char *dir;
struct service_cmd *cmd = NULL;
char *cmd_arg = NULL;
@@ -789,6 +788,9 @@
http_config();
max_request_buffer = git_env_ulong("GIT_HTTP_MAX_REQUEST_BUFFER",
max_request_buffer);
+ proto_header = getenv("HTTP_GIT_PROTOCOL");
+ if (proto_header)
+ setenv(GIT_PROTOCOL_ENVIRONMENT, proto_header, 0);
cmd->imp(&hdr, cmd_arg);
return 0;
diff --git a/http-push.c b/http-push.c
index d7cb167..3309aaf 100644
--- a/http-push.c
+++ b/http-push.c
@@ -203,10 +203,8 @@
curl_easy_setopt(curl, CURLOPT_INFILE, buffer);
curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len);
curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
-#ifndef NO_CURL_IOCTL
curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
-#endif
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
@@ -249,8 +247,6 @@
finish_request(request);
}
-#ifdef USE_CURL_MULTI
-
static void start_fetch_loose(struct transfer_request *request)
{
struct active_request_slot *slot;
@@ -299,7 +295,6 @@
FREE_AND_NULL(request->url);
}
}
-#endif
static void start_fetch_packed(struct transfer_request *request)
{
@@ -605,7 +600,6 @@
}
}
-#ifdef USE_CURL_MULTI
static int is_running_queue;
static int fill_active_slot(void *unused)
{
@@ -629,7 +623,6 @@
}
return 0;
}
-#endif
static void get_remote_object_list(unsigned char parent);
@@ -658,10 +651,8 @@
request->next = request_queue_head;
request_queue_head = request;
-#ifdef USE_CURL_MULTI
fill_active_slots();
step_active_slots();
-#endif
}
static int add_send_request(struct object *obj, struct remote_lock *lock)
@@ -696,10 +687,8 @@
request->next = request_queue_head;
request_queue_head = request;
-#ifdef USE_CURL_MULTI
fill_active_slots();
step_active_slots();
-#endif
return 1;
}
@@ -894,7 +883,7 @@
slot->results = &results;
curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
CALLOC_ARRAY(lock, 1);
lock->timeout = -1;
@@ -1153,7 +1142,7 @@
curl_setup_http(slot->curl, url, DAV_PROPFIND,
&out_buffer, fwrite_buffer);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
if (start_active_slot(slot)) {
run_active_slot(slot);
@@ -1227,7 +1216,7 @@
curl_setup_http(slot->curl, repo->url, DAV_PROPFIND,
&out_buffer, fwrite_buffer);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
if (start_active_slot(slot)) {
run_active_slot(slot);
@@ -1682,21 +1671,15 @@
static void run_request_queue(void)
{
-#ifdef USE_CURL_MULTI
is_running_queue = 1;
fill_active_slots();
add_fill_function(NULL, fill_active_slot);
-#endif
do {
finish_all_active_slots();
-#ifdef USE_CURL_MULTI
fill_active_slots();
-#endif
} while (request_queue_head && !aborted);
-#ifdef USE_CURL_MULTI
is_running_queue = 0;
-#endif
}
int cmd_main(int argc, const char **argv)
@@ -1770,10 +1753,6 @@
break;
}
-#ifndef USE_CURL_MULTI
- die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
-#endif
-
if (!repo->url)
usage(http_push_usage);
@@ -1786,9 +1765,7 @@
http_init(NULL, repo->url, 1);
-#ifdef USE_CURL_MULTI
is_running_queue = 0;
-#endif
/* Verify DAV compliance/lock support */
if (!locking_available()) {
diff --git a/http-walker.c b/http-walker.c
index 90d8ecb..910fae5 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -127,7 +127,6 @@
free(obj_req);
}
-#ifdef USE_CURL_MULTI
static int fill_active_slot(struct walker *walker)
{
struct object_request *obj_req;
@@ -146,7 +145,6 @@
}
return 0;
}
-#endif
static void prefetch(struct walker *walker, unsigned char *sha1)
{
@@ -163,10 +161,8 @@
http_is_verbose = walker->get_verbosely;
list_add_tail(&newreq->node, &object_queue_head);
-#ifdef USE_CURL_MULTI
fill_active_slots();
step_active_slots();
-#endif
}
static int is_alternate_allowed(const char *url)
@@ -357,11 +353,9 @@
* wait for them to arrive and return to processing this request's
* curl message
*/
-#ifdef USE_CURL_MULTI
while (cdata->got_alternates == 0) {
step_active_slots();
}
-#endif
/* Nothing to do if they've already been fetched */
if (cdata->got_alternates == 1)
@@ -384,7 +378,7 @@
alt_req.walker = walker;
slot->callback_data = &alt_req;
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buffer);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
curl_easy_setopt(slot->curl, CURLOPT_URL, url.buf);
@@ -505,12 +499,8 @@
return 0;
}
-#ifdef USE_CURL_MULTI
while (obj_req->state == WAITING)
step_active_slots();
-#else
- start_object_request(walker, obj_req);
-#endif
/*
* obj_req->req might change when fetching alternates in the callback
@@ -623,9 +613,7 @@
walker->cleanup = cleanup;
walker->data = data;
-#ifdef USE_CURL_MULTI
add_fill_function(walker, (int (*)(void *)) fill_active_slot);
-#endif
return walker;
}
diff --git a/http.c b/http.c
index fdb6e22..f92859f 100644
--- a/http.c
+++ b/http.c
@@ -1,4 +1,5 @@
#include "git-compat-util.h"
+#include "git-curl-compat.h"
#include "http.h"
#include "config.h"
#include "pack.h"
@@ -19,28 +20,16 @@
static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
static int trace_curl_data = 1;
static int trace_curl_redact = 1;
-#if LIBCURL_VERSION_NUM >= 0x070a08
long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
-#else
-long int git_curl_ipresolve;
-#endif
int active_requests;
int http_is_verbose;
ssize_t http_post_buffer = 16 * LARGE_PACKET_MAX;
-#if LIBCURL_VERSION_NUM >= 0x070a06
-#define LIBCURL_CAN_HANDLE_AUTH_ANY
-#endif
-
static int min_curl_sessions = 1;
static int curl_session_count;
-#ifdef USE_CURL_MULTI
static int max_requests = -1;
static CURLM *curlm;
-#endif
-#ifndef NO_CURL_EASY_DUPHANDLE
static CURL *curl_default;
-#endif
#define PREV_BUF_SIZE 4096
@@ -59,25 +48,19 @@
{ "sslv2", CURL_SSLVERSION_SSLv2 },
{ "sslv3", CURL_SSLVERSION_SSLv3 },
{ "tlsv1", CURL_SSLVERSION_TLSv1 },
-#if LIBCURL_VERSION_NUM >= 0x072200
+#ifdef GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_0
{ "tlsv1.0", CURL_SSLVERSION_TLSv1_0 },
{ "tlsv1.1", CURL_SSLVERSION_TLSv1_1 },
{ "tlsv1.2", CURL_SSLVERSION_TLSv1_2 },
#endif
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_3
{ "tlsv1.3", CURL_SSLVERSION_TLSv1_3 },
#endif
};
-#if LIBCURL_VERSION_NUM >= 0x070903
static const char *ssl_key;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
static const char *ssl_capath;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071304
static const char *curl_no_proxy;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
static const char *ssl_pinnedkey;
#endif
static const char *ssl_cainfo;
@@ -101,9 +84,7 @@
{ "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
@@ -133,27 +114,15 @@
enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL;
-#if LIBCURL_VERSION_NUM >= 0x071700
-/* Use CURLOPT_KEYPASSWD as is */
-#elif LIBCURL_VERSION_NUM >= 0x070903
-#define CURLOPT_KEYPASSWD CURLOPT_SSLKEYPASSWD
-#else
-#define CURLOPT_KEYPASSWD CURLOPT_SSLCERTPASSWD
-#endif
-
static struct credential cert_auth = CREDENTIAL_INIT;
static int ssl_cert_password_required;
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
static unsigned long http_auth_methods = CURLAUTH_ANY;
static int http_auth_methods_restricted;
/* Modes for which empty_auth cannot actually help us. */
static unsigned long empty_auth_useless =
CURLAUTH_BASIC
-#ifdef CURLAUTH_DIGEST_IE
| CURLAUTH_DIGEST_IE
-#endif
| CURLAUTH_DIGEST;
-#endif
static struct curl_slist *pragma_header;
static struct curl_slist *no_pragma_header;
@@ -186,7 +155,6 @@
return size / eltsize;
}
-#ifndef NO_CURL_IOCTL
curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
{
struct buffer *buffer = clientp;
@@ -203,7 +171,6 @@
return CURLIOE_UNKNOWNCMD;
}
}
-#endif
size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
{
@@ -237,12 +204,8 @@
if (slot->results != NULL) {
slot->results->curl_result = slot->curl_result;
slot->results->http_code = slot->http_code;
-#if LIBCURL_VERSION_NUM >= 0x070a08
curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
&slot->results->auth_avail);
-#else
- slot->results->auth_avail = 0;
-#endif
curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CONNECTCODE,
&slot->results->http_connectcode);
@@ -255,12 +218,9 @@
static void xmulti_remove_handle(struct active_request_slot *slot)
{
-#ifdef USE_CURL_MULTI
curl_multi_remove_handle(curlm, slot->curl);
-#endif
}
-#ifdef USE_CURL_MULTI
static void process_curl_messages(void)
{
int num_messages;
@@ -288,7 +248,6 @@
curl_message = curl_multi_info_read(curlm, &num_messages);
}
}
-#endif
static int http_options(const char *var, const char *value, void *cb)
{
@@ -305,14 +264,10 @@
return git_config_string(&ssl_version, var, value);
if (!strcmp("http.sslcert", var))
return git_config_pathname(&ssl_cert, var, value);
-#if LIBCURL_VERSION_NUM >= 0x070903
if (!strcmp("http.sslkey", var))
return git_config_pathname(&ssl_key, var, value);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var))
return git_config_pathname(&ssl_capath, var, value);
-#endif
if (!strcmp("http.sslcainfo", var))
return git_config_pathname(&ssl_cainfo, var, value);
if (!strcmp("http.sslcertpasswordprotected", var)) {
@@ -341,18 +296,14 @@
if (!strcmp("http.minsessions", var)) {
min_curl_sessions = git_config_int(var, value);
-#ifndef USE_CURL_MULTI
if (min_curl_sessions > 1)
min_curl_sessions = 1;
-#endif
return 0;
}
-#ifdef USE_CURL_MULTI
if (!strcmp("http.maxrequests", var)) {
max_requests = git_config_int(var, value);
return 0;
}
-#endif
if (!strcmp("http.lowspeedlimit", var)) {
curl_low_speed_limit = (long)git_config_int(var, value);
return 0;
@@ -423,10 +374,10 @@
}
if (!strcmp("http.pinnedpubkey", var)) {
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
return git_config_pathname(&ssl_pinnedkey, var, value);
#else
- warning(_("Public key pinning not supported with cURL < 7.44.0"));
+ warning(_("Public key pinning not supported with cURL < 7.39.0"));
return 0;
#endif
}
@@ -461,12 +412,6 @@
if (curl_empty_auth >= 0)
return curl_empty_auth;
-#ifndef LIBCURL_CAN_HANDLE_AUTH_ANY
- /*
- * Our libcurl is too old to do AUTH_ANY in the first place;
- * just default to turning the feature off.
- */
-#else
/*
* In the automatic case, kick in the empty-auth
* hack as long as we would potentially try some
@@ -479,7 +424,6 @@
if (http_auth_methods_restricted &&
(http_auth_methods & ~empty_auth_useless))
return 1;
-#endif
return 0;
}
@@ -493,24 +437,8 @@
credential_fill(&http_auth);
-#if LIBCURL_VERSION_NUM >= 0x071301
curl_easy_setopt(result, CURLOPT_USERNAME, http_auth.username);
curl_easy_setopt(result, CURLOPT_PASSWORD, http_auth.password);
-#else
- {
- static struct strbuf up = STRBUF_INIT;
- /*
- * Note that we assume we only ever have a single set of
- * credentials in a given program run, so we do not have
- * to worry about updating this buffer, only setting its
- * initial value.
- */
- if (!up.len)
- strbuf_addf(&up, "%s:%s",
- http_auth.username, http_auth.password);
- curl_easy_setopt(result, CURLOPT_USERPWD, up.buf);
- }
-#endif
}
/* *var must be free-able */
@@ -524,22 +452,10 @@
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,
- is_rfc3986_unreserved);
- strbuf_addch(&s, ':');
- strbuf_addstr_urlencode(&s, proxy_auth.password,
- is_rfc3986_unreserved);
- curl_proxyuserpwd = strbuf_detach(&s, NULL);
- curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
-#endif
}
static void init_curl_proxy_auth(CURL *result)
@@ -552,7 +468,6 @@
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++) {
@@ -570,7 +485,6 @@
}
else
curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-#endif
}
static int has_cert_password(void)
@@ -587,7 +501,7 @@
return 1;
}
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD
static int has_proxy_cert_password(void)
{
if (http_proxy_ssl_cert == NULL || proxy_ssl_cert_password_required != 1)
@@ -603,13 +517,13 @@
}
#endif
-#if LIBCURL_VERSION_NUM >= 0x071900
+#ifdef GITCURL_HAVE_CURLOPT_TCP_KEEPALIVE
static void set_curl_keepalive(CURL *c)
{
curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1);
}
-#elif LIBCURL_VERSION_NUM >= 0x071000
+#else
static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
{
int ka = 1;
@@ -623,19 +537,13 @@
if (rc < 0)
warning_errno("unable to set SO_KEEPALIVE on socket");
- return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
+ return CURL_SOCKOPT_OK;
}
static void set_curl_keepalive(CURL *c)
{
curl_easy_setopt(c, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
}
-
-#else
-static void set_curl_keepalive(CURL *c)
-{
- /* not supported on older curl versions */
-}
#endif
static void redact_sensitive_header(struct strbuf *header)
@@ -809,7 +717,6 @@
curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
}
-#ifdef CURLPROTO_HTTP
static long get_curl_allowed_protocols(int from_user)
{
long allowed_protocols = 0;
@@ -825,9 +732,8 @@
return allowed_protocols;
}
-#endif
-#if LIBCURL_VERSION_NUM >=0x072f00
+#ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
static int get_curl_http_version_opt(const char *version_string, long *opt)
{
int i;
@@ -869,7 +775,7 @@
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
}
-#if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0
+#ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
if (curl_http_version) {
long opt;
if (!get_curl_http_version_opt(curl_http_version, &opt)) {
@@ -879,12 +785,8 @@
}
#endif
-#if LIBCURL_VERSION_NUM >= 0x070907
curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
-#endif
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-#endif
#ifdef CURLGSSAPI_DELEGATION_FLAG
if (curl_deleg) {
@@ -904,7 +806,7 @@
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
!http_schannel_check_revoke) {
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
#else
warning(_("CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"));
@@ -940,28 +842,24 @@
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
if (has_cert_password())
curl_easy_setopt(result, CURLOPT_KEYPASSWD, cert_auth.password);
-#if LIBCURL_VERSION_NUM >= 0x070903
if (ssl_key != NULL)
curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
if (ssl_capath != NULL)
curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
if (ssl_pinnedkey != NULL)
curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
#endif
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
!http_schannel_use_ssl_cainfo) {
curl_easy_setopt(result, CURLOPT_CAINFO, NULL);
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL);
#endif
} else if (ssl_cainfo != NULL || http_proxy_ssl_ca_info != NULL) {
if (ssl_cainfo != NULL)
curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
if (http_proxy_ssl_ca_info != NULL)
curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info);
#endif
@@ -975,19 +873,11 @@
}
curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);
-#if LIBCURL_VERSION_NUM >= 0x071301
curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
-#elif LIBCURL_VERSION_NUM >= 0x071101
- curl_easy_setopt(result, CURLOPT_POST301, 1);
-#endif
-#ifdef CURLPROTO_HTTP
curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
get_curl_allowed_protocols(0));
curl_easy_setopt(result, CURLOPT_PROTOCOLS,
get_curl_allowed_protocols(-1));
-#else
- warning(_("Protocol restrictions not supported with cURL < 7.19.4"));
-#endif
if (getenv("GIT_CURL_VERBOSE"))
http_trace_curl_no_data();
setup_curl_trace(result);
@@ -1002,10 +892,8 @@
if (curl_ftp_no_epsv)
curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
-#ifdef CURLOPT_USE_SSL
if (curl_ssl_try)
curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
-#endif
/*
* CURL also examines these variables as a fallback; but we need to query
@@ -1040,7 +928,6 @@
*/
curl_easy_setopt(result, CURLOPT_PROXY, "");
} else if (curl_http_proxy) {
-#if LIBCURL_VERSION_NUM >= 0x071800
if (starts_with(curl_http_proxy, "socks5h"))
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
@@ -1053,8 +940,7 @@
else if (starts_with(curl_http_proxy, "socks"))
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD
else if (starts_with(curl_http_proxy, "https")) {
curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
@@ -1081,11 +967,9 @@
die("Invalid proxy URL '%s'", curl_http_proxy);
curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
-#if LIBCURL_VERSION_NUM >= 0x071304
var_override(&curl_no_proxy, getenv("NO_PROXY"));
var_override(&curl_no_proxy, getenv("no_proxy"));
curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
-#endif
}
init_curl_proxy_auth(result);
@@ -1106,7 +990,7 @@
char *low_speed_limit;
char *low_speed_time;
char *normalized_url;
- struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+ struct urlmatch_config config = URLMATCH_CONFIG_INIT;
config.section = "http";
config.key = NULL;
@@ -1121,7 +1005,7 @@
free(normalized_url);
string_list_clear(&config.vars, 1);
-#if LIBCURL_VERSION_NUM >= 0x073800
+#ifdef GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
if (http_ssl_backend) {
const curl_ssl_backend **backends;
struct strbuf buf = STRBUF_INIT;
@@ -1164,7 +1048,6 @@
no_pragma_header = curl_slist_append(http_copy_default_headers(),
"Pragma:");
-#ifdef USE_CURL_MULTI
{
char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
if (http_max_requests != NULL)
@@ -1174,18 +1057,13 @@
curlm = curl_multi_init();
if (!curlm)
die("curl_multi_init failed");
-#endif
if (getenv("GIT_SSL_NO_VERIFY"))
curl_ssl_verify = 0;
set_from_env(&ssl_cert, "GIT_SSL_CERT");
-#if LIBCURL_VERSION_NUM >= 0x070903
set_from_env(&ssl_key, "GIT_SSL_KEY");
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
-#endif
set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
@@ -1201,10 +1079,8 @@
curl_ssl_verify = 1;
curl_session_count = 0;
-#ifdef USE_CURL_MULTI
if (max_requests < 1)
max_requests = DEFAULT_MAX_REQUESTS;
-#endif
set_from_env(&http_proxy_ssl_cert, "GIT_PROXY_SSL_CERT");
set_from_env(&http_proxy_ssl_key, "GIT_PROXY_SSL_KEY");
@@ -1224,9 +1100,7 @@
ssl_cert_password_required = 1;
}
-#ifndef NO_CURL_EASY_DUPHANDLE
curl_default = get_curl_handle();
-#endif
}
void http_cleanup(void)
@@ -1244,13 +1118,9 @@
}
active_queue_head = NULL;
-#ifndef NO_CURL_EASY_DUPHANDLE
curl_easy_cleanup(curl_default);
-#endif
-#ifdef USE_CURL_MULTI
curl_multi_cleanup(curlm);
-#endif
curl_global_cleanup();
string_list_clear(&extra_http_headers, 0);
@@ -1297,7 +1167,6 @@
struct active_request_slot *slot = active_queue_head;
struct active_request_slot *newslot;
-#ifdef USE_CURL_MULTI
int num_transfers;
/* Wait for a slot to open up if the queue is full */
@@ -1306,7 +1175,6 @@
if (num_transfers < active_requests)
process_curl_messages();
}
-#endif
while (slot != NULL && slot->in_use)
slot = slot->next;
@@ -1329,11 +1197,7 @@
}
if (slot->curl == NULL) {
-#ifdef NO_CURL_EASY_DUPHANDLE
- slot->curl = get_curl_handle();
-#else
slot->curl = curl_easy_duphandle(curl_default);
-#endif
curl_session_count++;
}
@@ -1367,12 +1231,8 @@
else
curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 0);
-#if LIBCURL_VERSION_NUM >= 0x070a08
curl_easy_setopt(slot->curl, CURLOPT_IPRESOLVE, git_curl_ipresolve);
-#endif
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, http_auth_methods);
-#endif
if (http_auth.password || curl_empty_auth_enabled())
init_curl_http_auth(slot->curl);
@@ -1381,7 +1241,6 @@
int start_active_slot(struct active_request_slot *slot)
{
-#ifdef USE_CURL_MULTI
CURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);
int num_transfers;
@@ -1399,11 +1258,9 @@
* something.
*/
curl_multi_perform(curlm, &num_transfers);
-#endif
return 1;
}
-#ifdef USE_CURL_MULTI
struct fill_chain {
void *data;
int (*fill)(void *);
@@ -1462,11 +1319,9 @@
fill_active_slots();
}
}
-#endif
void run_active_slot(struct active_request_slot *slot)
{
-#ifdef USE_CURL_MULTI
fd_set readfds;
fd_set writefds;
fd_set excfds;
@@ -1479,7 +1334,6 @@
step_active_slots();
if (slot->in_use) {
-#if LIBCURL_VERSION_NUM >= 0x070f04
long curl_timeout;
curl_multi_timeout(curlm, &curl_timeout);
if (curl_timeout == 0) {
@@ -1491,10 +1345,6 @@
select_timeout.tv_sec = curl_timeout / 1000;
select_timeout.tv_usec = (curl_timeout % 1000) * 1000;
}
-#else
- select_timeout.tv_sec = 0;
- select_timeout.tv_usec = 50000;
-#endif
max_fd = -1;
FD_ZERO(&readfds);
@@ -1517,12 +1367,6 @@
select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout);
}
}
-#else
- while (slot->in_use) {
- slot->curl_result = curl_easy_perform(slot->curl);
- finish_active_slot(slot);
- }
-#endif
}
static void release_active_slot(struct active_request_slot *slot)
@@ -1536,9 +1380,7 @@
curl_session_count--;
}
}
-#ifdef USE_CURL_MULTI
fill_active_slots();
-#endif
}
void finish_all_active_slots(void)
@@ -1647,6 +1489,10 @@
*/
credential_reject(&cert_auth);
return HTTP_NOAUTH;
+#ifdef GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH
+ } else if (results->curl_result == CURLE_SSL_PINNEDPUBKEYNOTMATCH) {
+ return HTTP_NOMATCHPUBLICKEY;
+#endif
} else if (missing_target(results))
return HTTP_MISSING_TARGET;
else if (results->http_code == 401) {
@@ -1654,24 +1500,20 @@
credential_reject(&http_auth);
return HTTP_NOAUTH;
} else {
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
if (results->auth_avail) {
http_auth_methods &= results->auth_avail;
http_auth_methods_restricted = 1;
}
-#endif
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,
curl_easy_strerror(results->curl_result),
sizeof(curl_errorstr));
-#endif
return HTTP_ERROR;
}
}
@@ -1930,7 +1772,7 @@
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
} else {
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
- curl_easy_setopt(slot->curl, CURLOPT_FILE, result);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, result);
if (target == HTTP_REQUEST_FILE) {
off_t posn = ftello(result);
@@ -2347,7 +2189,7 @@
}
preq->slot = get_active_slot();
- curl_easy_setopt(preq->slot->curl, CURLOPT_FILE, preq->packfile);
+ curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEDATA, preq->packfile);
curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
curl_easy_setopt(preq->slot->curl, CURLOPT_URL, preq->url);
curl_easy_setopt(preq->slot->curl, CURLOPT_HTTPHEADER,
@@ -2518,7 +2360,7 @@
freq->slot = get_active_slot();
- curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
+ curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEDATA, freq);
curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
diff --git a/http.h b/http.h
index bf3d127..df1590e 100644
--- a/http.h
+++ b/http.h
@@ -10,49 +10,7 @@
#include "remote.h"
#include "url.h"
-/*
- * We detect based on the cURL version if multi-transfer is
- * usable in this implementation and define this symbol accordingly.
- * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).
- */
-#undef USE_CURL_MULTI
-
-#if LIBCURL_VERSION_NUM >= 0x071000
-#define USE_CURL_MULTI
#define DEFAULT_MAX_REQUESTS 5
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070704
-#define curl_global_cleanup() do { /* nothing */ } while (0)
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070800
-#define curl_global_init(a) do { /* nothing */ } while (0)
-#elif LIBCURL_VERSION_NUM >= 0x070c00
-#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
- xrealloc, xstrdup, xcalloc)
-#endif
-
-#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
-#define NO_CURL_EASY_DUPHANDLE
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070a03
-#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070c03
-#define NO_CURL_IOCTL
-#endif
-
-/*
- * CURLOPT_USE_SSL was known as CURLOPT_FTP_SSL up to 7.16.4,
- * and the constants were known as CURLFTPSSL_*
-*/
-#if !defined(CURLOPT_USE_SSL) && defined(CURLOPT_FTP_SSL)
-#define CURLOPT_USE_SSL CURLOPT_FTP_SSL
-#define CURLUSESSL_TRY CURLFTPSSL_TRY
-#endif
struct slot_results {
CURLcode curl_result;
@@ -82,9 +40,7 @@
size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-#ifndef NO_CURL_IOCTL
curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
-#endif
/* Slot lifecycle functions */
struct active_request_slot *get_active_slot(void);
@@ -101,11 +57,9 @@
int run_one_slot(struct active_request_slot *slot,
struct slot_results *results);
-#ifdef USE_CURL_MULTI
void fill_active_slots(void);
void add_fill_function(void *data, int (*fill)(void *));
void step_active_slots(void);
-#endif
void http_init(struct remote *remote, const char *url,
int proactive_auth);
@@ -200,6 +154,7 @@
#define HTTP_START_FAILED 3
#define HTTP_REAUTH 4
#define HTTP_NOAUTH 5
+#define HTTP_NOMATCHPUBLICKEY 6
/*
* Requests a URL and stores the result in a strbuf.
diff --git a/imap-send.c b/imap-send.c
index a0540ba..e6090a0 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1441,7 +1441,7 @@
curl_easy_setopt(curl, CURLOPT_PORT, server.port);
if (server.auth_method) {
-#if LIBCURL_VERSION_NUM < 0x072200
+#ifndef GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS
warning("No LOGIN_OPTIONS support in this cURL version");
#else
struct strbuf auth = STRBUF_INIT;
@@ -1517,11 +1517,7 @@
if (cred.username) {
if (res == CURLE_OK)
credential_approve(&cred);
-#if LIBCURL_VERSION_NUM >= 0x070d01
else if (res == CURLE_LOGIN_DENIED)
-#else
- else
-#endif
credential_reject(&cred);
}
diff --git a/list-objects.c b/list-objects.c
index 473a332..2f623f8 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -337,8 +337,8 @@
add_pending_object(revs, &tree->object, "");
}
-static void traverse_trees_and_blobs(struct traversal_context *ctx,
- struct strbuf *base)
+static void traverse_non_commits(struct traversal_context *ctx,
+ struct strbuf *base)
{
int i;
@@ -410,9 +410,9 @@
* needs a reallocation for each commit. Can we pass the
* tree directory without allocation churn?
*/
- traverse_trees_and_blobs(ctx, &csp);
+ traverse_non_commits(ctx, &csp);
}
- traverse_trees_and_blobs(ctx, &csp);
+ traverse_non_commits(ctx, &csp);
strbuf_release(&csp);
}
diff --git a/list.h b/list.h
index eb60119..362a4cd 100644
--- a/list.h
+++ b/list.h
@@ -46,7 +46,10 @@
#define INIT_LIST_HEAD(ptr) \
(ptr)->next = (ptr)->prev = (ptr)
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
+#define LIST_HEAD_INIT(name) { \
+ .next = &(name), \
+ .prev = &(name), \
+}
/* Add new element at the head of the list. */
static inline void list_add(struct list_head *newp, struct list_head *head)
diff --git a/lockfile.h b/lockfile.h
index db93e6b..90af4e6 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -121,7 +121,7 @@
struct tempfile *tempfile;
};
-#define LOCK_INIT { NULL }
+#define LOCK_INIT { 0 }
/* String appended to a filename to derive the lockfile name: */
#define LOCK_SUFFIX ".lock"
diff --git a/log-tree.c b/log-tree.c
index 6dc4412..644893f 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -515,10 +515,10 @@
status = check_signature(payload.buf, payload.len, signature.buf,
signature.len, &sigc);
- if (status && !sigc.gpg_output)
+ if (status && !sigc.output)
show_sig_lines(opt, status, "No signature\n");
else
- show_sig_lines(opt, status, sigc.gpg_output);
+ show_sig_lines(opt, status, sigc.output);
signature_check_clear(&sigc);
out:
@@ -585,8 +585,8 @@
/* could have a good signature */
status = check_signature(payload.buf, payload.len,
signature.buf, signature.len, &sigc);
- if (sigc.gpg_output)
- strbuf_addstr(&verify_message, sigc.gpg_output);
+ if (sigc.output)
+ strbuf_addstr(&verify_message, sigc.output);
else
strbuf_addstr(&verify_message, "No signature\n");
signature_check_clear(&sigc);
diff --git a/log-tree.h b/log-tree.h
index 1e8c91d..e7e4641 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -14,10 +14,8 @@
};
int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
-void init_log_tree_opt(struct rev_info *);
int log_tree_diff_flush(struct rev_info *);
int log_tree_commit(struct rev_info *, struct commit *);
-int log_tree_opt_parse(struct rev_info *, const char **, int);
void show_log(struct rev_info *opt);
void format_decorations_extended(struct strbuf *sb, const struct commit *commit,
int use_color,
diff --git a/ls-refs.c b/ls-refs.c
index 88f6c3f..5407832 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -41,6 +41,12 @@
}
/*
+ * If we see this many or more "ref-prefix" lines from the client, we consider
+ * it "too many" and will avoid using the prefix feature entirely.
+ */
+#define TOO_MANY_PREFIXES 65536
+
+/*
* Check if one of the prefixes is a prefix of the ref.
* If no prefixes were provided, all refs match.
*/
@@ -65,6 +71,7 @@
unsigned peel;
unsigned symrefs;
struct strvec prefixes;
+ struct strbuf buf;
unsigned unborn : 1;
};
@@ -73,7 +80,8 @@
{
struct ls_refs_data *data = cb_data;
const char *refname_nons = strip_namespace(refname);
- struct strbuf refline = STRBUF_INIT;
+
+ strbuf_reset(&data->buf);
if (ref_is_hidden(refname_nons, refname))
return 0;
@@ -82,9 +90,9 @@
return 0;
if (oid)
- strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
+ strbuf_addf(&data->buf, "%s %s", oid_to_hex(oid), refname_nons);
else
- strbuf_addf(&refline, "unborn %s", refname_nons);
+ strbuf_addf(&data->buf, "unborn %s", refname_nons);
if (data->symrefs && flag & REF_ISSYMREF) {
struct object_id unused;
const char *symref_target = resolve_ref_unsafe(refname, 0,
@@ -94,20 +102,19 @@
if (!symref_target)
die("'%s' is a symref but it is not?", refname);
- strbuf_addf(&refline, " symref-target:%s",
+ strbuf_addf(&data->buf, " symref-target:%s",
strip_namespace(symref_target));
}
if (data->peel && oid) {
struct object_id peeled;
if (!peel_iterated_oid(oid, &peeled))
- strbuf_addf(&refline, " peeled:%s", oid_to_hex(&peeled));
+ strbuf_addf(&data->buf, " peeled:%s", oid_to_hex(&peeled));
}
- strbuf_addch(&refline, '\n');
- packet_write(1, refline.buf, refline.len);
+ strbuf_addch(&data->buf, '\n');
+ packet_fwrite(stdout, data->buf.buf, data->buf.len);
- strbuf_release(&refline);
return 0;
}
@@ -138,13 +145,13 @@
return parse_hide_refs_config(var, value, "uploadpack");
}
-int ls_refs(struct repository *r, struct strvec *keys,
- struct packet_reader *request)
+int ls_refs(struct repository *r, struct packet_reader *request)
{
struct ls_refs_data data;
memset(&data, 0, sizeof(data));
strvec_init(&data.prefixes);
+ strbuf_init(&data.buf, 0);
ensure_config_read();
git_config(ls_refs_config, NULL);
@@ -157,22 +164,35 @@
data.peel = 1;
else if (!strcmp("symrefs", arg))
data.symrefs = 1;
- else if (skip_prefix(arg, "ref-prefix ", &out))
- strvec_push(&data.prefixes, out);
+ else if (skip_prefix(arg, "ref-prefix ", &out)) {
+ if (data.prefixes.nr < TOO_MANY_PREFIXES)
+ strvec_push(&data.prefixes, out);
+ }
else if (!strcmp("unborn", arg))
data.unborn = allow_unborn;
+ else
+ die(_("unexpected line: '%s'"), arg);
}
if (request->status != PACKET_READ_FLUSH)
die(_("expected flush after ls-refs arguments"));
+ /*
+ * If we saw too many prefixes, we must avoid using them at all; as
+ * soon as we have any prefix, they are meant to form a comprehensive
+ * list.
+ */
+ if (data.prefixes.nr >= TOO_MANY_PREFIXES)
+ strvec_clear(&data.prefixes);
+
send_possibly_unborn_head(&data);
if (!data.prefixes.nr)
strvec_push(&data.prefixes, "");
for_each_fullref_in_prefixes(get_git_namespace(), data.prefixes.v,
- send_ref, &data, 0);
- packet_flush(1);
+ send_ref, &data);
+ packet_fflush(stdout);
strvec_clear(&data.prefixes);
+ strbuf_release(&data.buf);
return 0;
}
diff --git a/ls-refs.h b/ls-refs.h
index a99e4be..e2243a5 100644
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -2,10 +2,8 @@
#define LS_REFS_H
struct repository;
-struct strvec;
struct packet_reader;
-int ls_refs(struct repository *r, struct strvec *keys,
- struct packet_reader *request);
+int ls_refs(struct repository *r, struct packet_reader *request);
int ls_refs_advertise(struct repository *r, struct strbuf *value);
#endif /* LS_REFS_H */
diff --git a/merge-ort.c b/merge-ort.c
index b346e23..0342f10 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -32,6 +32,7 @@
#include "promisor-remote.h"
#include "revision.h"
#include "strmap.h"
+#include "submodule-config.h"
#include "submodule.h"
#include "tree.h"
#include "unpack-trees.h"
@@ -303,8 +304,6 @@
* * these keys serve to intern all the path strings, which allows
* us to do pointer comparison on directory names instead of
* strcmp; we just have to be careful to use the interned strings.
- * (Technically paths_to_free may track some strings that were
- * removed from froms paths.)
*
* The values of paths:
* * either a pointer to a merged_info, or a conflict_info struct
@@ -340,14 +339,14 @@
struct strmap conflicted;
/*
- * paths_to_free: additional list of strings to free
+ * pool: memory pool for fast allocation/deallocation
*
- * If keys are removed from "paths", they are added to paths_to_free
- * to ensure they are later freed. We avoid free'ing immediately since
- * other places (e.g. conflict_info.pathnames[]) may still be
- * referencing these paths.
+ * We allocate room for lots of filenames and auxiliary data
+ * structures in merge_options_internal, and it tends to all be
+ * freed together too. Using a memory pool for these provides a
+ * nice speedup.
*/
- struct string_list paths_to_free;
+ struct mem_pool pool;
/*
* output: special messages and conflict notices for various paths
@@ -519,64 +518,45 @@
{
struct rename_info *renames = &opti->renames;
int i;
- void (*strmap_func)(struct strmap *, int) =
+ void (*strmap_clear_func)(struct strmap *, int) =
reinitialize ? strmap_partial_clear : strmap_clear;
- void (*strintmap_func)(struct strintmap *) =
+ void (*strintmap_clear_func)(struct strintmap *) =
reinitialize ? strintmap_partial_clear : strintmap_clear;
- void (*strset_func)(struct strset *) =
+ void (*strset_clear_func)(struct strset *) =
reinitialize ? strset_partial_clear : strset_clear;
- /*
- * We marked opti->paths with strdup_strings = 0, so that we
- * wouldn't have to make another copy of the fullpath created by
- * make_traverse_path from setup_path_info(). But, now that we've
- * used it and have no other references to these strings, it is time
- * to deallocate them.
- */
- free_strmap_strings(&opti->paths);
- strmap_func(&opti->paths, 1);
+ strmap_clear_func(&opti->paths, 0);
/*
* All keys and values in opti->conflicted are a subset of those in
* opti->paths. We don't want to deallocate anything twice, so we
* don't free the keys and we pass 0 for free_values.
*/
- strmap_func(&opti->conflicted, 0);
-
- /*
- * opti->paths_to_free is similar to opti->paths; we created it with
- * strdup_strings = 0 to avoid making _another_ copy of the fullpath
- * but now that we've used it and have no other references to these
- * strings, it is time to deallocate them. We do so by temporarily
- * setting strdup_strings to 1.
- */
- opti->paths_to_free.strdup_strings = 1;
- string_list_clear(&opti->paths_to_free, 0);
- opti->paths_to_free.strdup_strings = 0;
+ strmap_clear_func(&opti->conflicted, 0);
if (opti->attr_index.cache_nr) /* true iff opt->renormalize */
discard_index(&opti->attr_index);
/* Free memory used by various renames maps */
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) {
- strintmap_func(&renames->dirs_removed[i]);
- strmap_func(&renames->dir_renames[i], 0);
- strintmap_func(&renames->relevant_sources[i]);
+ strintmap_clear_func(&renames->dirs_removed[i]);
+ strmap_clear_func(&renames->dir_renames[i], 0);
+ strintmap_clear_func(&renames->relevant_sources[i]);
if (!reinitialize)
assert(renames->cached_pairs_valid_side == 0);
if (i != renames->cached_pairs_valid_side &&
-1 != renames->cached_pairs_valid_side) {
- strset_func(&renames->cached_target_names[i]);
- strmap_func(&renames->cached_pairs[i], 1);
- strset_func(&renames->cached_irrelevant[i]);
+ strset_clear_func(&renames->cached_target_names[i]);
+ strmap_clear_func(&renames->cached_pairs[i], 1);
+ strset_clear_func(&renames->cached_irrelevant[i]);
partial_clear_dir_rename_count(&renames->dir_rename_count[i]);
if (!reinitialize)
strmap_clear(&renames->dir_rename_count[i], 1);
}
}
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) {
- strintmap_func(&renames->deferred[i].possible_trivial_merges);
- strset_func(&renames->deferred[i].target_dirs);
+ strintmap_clear_func(&renames->deferred[i].possible_trivial_merges);
+ strset_clear_func(&renames->deferred[i].target_dirs);
renames->deferred[i].trivial_merges_okay = 1; /* 1 == maybe */
}
renames->cached_pairs_valid_side = 0;
@@ -603,6 +583,8 @@
strmap_clear(&opti->output, 0);
}
+ mem_pool_discard(&opti->pool, 0);
+
/* Clean out callback_data as well. */
FREE_AND_NULL(renames->callback_data);
renames->callback_data_nr = renames->callback_data_alloc = 0;
@@ -627,6 +609,7 @@
static void format_commit(struct strbuf *sb,
int indent,
+ struct repository *repo,
struct commit *commit)
{
struct merge_remote_desc *desc;
@@ -640,7 +623,7 @@
return;
}
- format_commit_message(commit, "%h %s", sb, &ctx);
+ repo_format_commit_message(repo, commit, "%h %s", sb, &ctx);
strbuf_addch(sb, '\n');
}
@@ -665,6 +648,36 @@
strbuf_addch(sb, '\n');
}
+static struct diff_filespec *pool_alloc_filespec(struct mem_pool *pool,
+ const char *path)
+{
+ /* Similar to alloc_filespec(), but allocate from pool and reuse path */
+ struct diff_filespec *spec;
+
+ spec = mem_pool_calloc(pool, 1, sizeof(*spec));
+ spec->path = (char*)path; /* spec won't modify it */
+
+ spec->count = 1;
+ spec->is_binary = -1;
+ return spec;
+}
+
+static struct diff_filepair *pool_diff_queue(struct mem_pool *pool,
+ struct diff_queue_struct *queue,
+ struct diff_filespec *one,
+ struct diff_filespec *two)
+{
+ /* Same code as diff_queue(), except allocate from pool */
+ struct diff_filepair *dp;
+
+ dp = mem_pool_calloc(pool, 1, sizeof(*dp));
+ dp->one = one;
+ dp->two = two;
+ if (queue)
+ diff_q(queue, dp);
+ return dp;
+}
+
/* add a string to a strbuf, but converting "/" to "_" */
static void add_flattened_path(struct strbuf *out, const char *s)
{
@@ -793,8 +806,9 @@
assert(!df_conflict || !resolved); /* df_conflict implies !resolved */
assert(resolved == (merged_version != NULL));
- mi = xcalloc(1, resolved ? sizeof(struct merged_info) :
- sizeof(struct conflict_info));
+ mi = mem_pool_calloc(&opt->priv->pool, 1,
+ resolved ? sizeof(struct merged_info) :
+ sizeof(struct conflict_info));
mi->directory_name = current_dir_name;
mi->basename_offset = current_dir_name_len;
mi->clean = !!resolved;
@@ -891,11 +905,11 @@
return;
}
- one = alloc_filespec(pathname);
- two = alloc_filespec(pathname);
+ one = pool_alloc_filespec(&opt->priv->pool, pathname);
+ two = pool_alloc_filespec(&opt->priv->pool, pathname);
fill_filespec(is_add ? two : one,
&names[names_idx].oid, 1, names[names_idx].mode);
- diff_queue(&renames->pairs[side], one, two);
+ pool_diff_queue(&opt->priv->pool, &renames->pairs[side], one, two);
}
static void collect_rename_info(struct merge_options *opt,
@@ -1086,7 +1100,7 @@
len = traverse_path_len(info, p->pathlen);
/* +1 in both of the following lines to include the NUL byte */
- fullpath = xmalloc(len + 1);
+ fullpath = mem_pool_alloc(&opt->priv->pool, len + 1);
make_traverse_path(fullpath, len + 1, info, p->path, p->pathlen);
/*
@@ -1341,7 +1355,7 @@
copy = renames->deferred[side].possible_trivial_merges;
strintmap_init_with_options(&renames->deferred[side].possible_trivial_merges,
0,
- NULL,
+ &opt->priv->pool,
0);
strintmap_for_each_entry(©, &iter, entry) {
const char *path = entry->key;
@@ -1499,7 +1513,6 @@
xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
oid_to_hex(&a->object.oid));
repo_init_revisions(repo, &revs, NULL);
- rev_opts.submodule = path;
/* FIXME: can't handle linked worktrees in submodules yet */
revs.single_worktree = path != NULL;
setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
@@ -1509,7 +1522,7 @@
die("revision walk setup failed");
while ((commit = get_revision(&revs)) != NULL) {
struct object *o = &(commit->object);
- if (in_merge_bases(b, commit))
+ if (repo_in_merge_bases(repo, b, commit))
add_object_array(o, NULL, &merges);
}
reset_revision_walk();
@@ -1524,7 +1537,7 @@
contains_another = 0;
for (j = 0; j < merges.nr; j++) {
struct commit *m2 = (struct commit *) merges.objects[j].item;
- if (i != j && in_merge_bases(m2, m1)) {
+ if (i != j && repo_in_merge_bases(repo, m2, m1)) {
contains_another = 1;
break;
}
@@ -1545,10 +1558,12 @@
const struct object_id *b,
struct object_id *result)
{
+ struct repository subrepo;
+ struct strbuf sb = STRBUF_INIT;
+ int ret = 0;
struct commit *commit_o, *commit_a, *commit_b;
int parent_count;
struct object_array merges;
- struct strbuf sb = STRBUF_INIT;
int i;
int search = !opt->priv->call_depth;
@@ -1564,46 +1579,48 @@
if (is_null_oid(b))
return 0;
- if (add_submodule_odb(path)) {
+ if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
path_msg(opt, path, 0,
- _("Failed to merge submodule %s (not checked out)"),
- path);
+ _("Failed to merge submodule %s (not checked out)"),
+ path);
return 0;
}
- if (!(commit_o = lookup_commit_reference(opt->repo, o)) ||
- !(commit_a = lookup_commit_reference(opt->repo, a)) ||
- !(commit_b = lookup_commit_reference(opt->repo, b))) {
+ if (!(commit_o = lookup_commit_reference(&subrepo, o)) ||
+ !(commit_a = lookup_commit_reference(&subrepo, a)) ||
+ !(commit_b = lookup_commit_reference(&subrepo, b))) {
path_msg(opt, path, 0,
_("Failed to merge submodule %s (commits not present)"),
path);
- return 0;
+ goto cleanup;
}
/* check whether both changes are forward */
- if (!in_merge_bases(commit_o, commit_a) ||
- !in_merge_bases(commit_o, commit_b)) {
+ if (!repo_in_merge_bases(&subrepo, commit_o, commit_a) ||
+ !repo_in_merge_bases(&subrepo, commit_o, commit_b)) {
path_msg(opt, path, 0,
_("Failed to merge submodule %s "
"(commits don't follow merge-base)"),
path);
- return 0;
+ goto cleanup;
}
/* Case #1: a is contained in b or vice versa */
- if (in_merge_bases(commit_a, commit_b)) {
+ if (repo_in_merge_bases(&subrepo, commit_a, commit_b)) {
oidcpy(result, b);
path_msg(opt, path, 1,
_("Note: Fast-forwarding submodule %s to %s"),
path, oid_to_hex(b));
- return 1;
+ ret = 1;
+ goto cleanup;
}
- if (in_merge_bases(commit_b, commit_a)) {
+ if (repo_in_merge_bases(&subrepo, commit_b, commit_a)) {
oidcpy(result, a);
path_msg(opt, path, 1,
_("Note: Fast-forwarding submodule %s to %s"),
path, oid_to_hex(a));
- return 1;
+ ret = 1;
+ goto cleanup;
}
/*
@@ -1615,10 +1632,10 @@
/* Skip the search if makes no sense to the calling context. */
if (!search)
- return 0;
+ goto cleanup;
/* find commit which merges them */
- parent_count = find_first_merges(opt->repo, path, commit_a, commit_b,
+ parent_count = find_first_merges(&subrepo, path, commit_a, commit_b,
&merges);
switch (parent_count) {
case 0:
@@ -1626,7 +1643,7 @@
break;
case 1:
- format_commit(&sb, 4,
+ format_commit(&sb, 4, &subrepo,
(struct commit *)merges.objects[0].item);
path_msg(opt, path, 0,
_("Failed to merge submodule %s, but a possible merge "
@@ -1643,7 +1660,7 @@
break;
default:
for (i = 0; i < merges.nr; i++)
- format_commit(&sb, 4,
+ format_commit(&sb, 4, &subrepo,
(struct commit *)merges.objects[i].item);
path_msg(opt, path, 0,
_("Failed to merge submodule %s, but multiple "
@@ -1652,7 +1669,9 @@
}
object_array_clear(&merges);
- return 0;
+cleanup:
+ repo_clear(&subrepo);
+ return ret;
}
static void initialize_attr_index(struct merge_options *opt)
@@ -2293,12 +2312,17 @@
VERIFY_CI(ci);
/* Find parent directories missing from opt->priv->paths */
- cur_path = new_path;
+ cur_path = mem_pool_strdup(&opt->priv->pool, new_path);
+ free((char*)new_path);
+ new_path = (char *)cur_path;
+
while (1) {
/* Find the parent directory of cur_path */
char *last_slash = strrchr(cur_path, '/');
if (last_slash) {
- parent_name = xstrndup(cur_path, last_slash - cur_path);
+ parent_name = mem_pool_strndup(&opt->priv->pool,
+ cur_path,
+ last_slash - cur_path);
} else {
parent_name = opt->priv->toplevel_dir;
break;
@@ -2307,7 +2331,6 @@
/* Look it up in opt->priv->paths */
entry = strmap_get_entry(&opt->priv->paths, parent_name);
if (entry) {
- free((char*)parent_name);
parent_name = entry->key; /* reuse known pointer */
break;
}
@@ -2334,13 +2357,6 @@
parent_name = cur_dir;
}
- /*
- * We are removing old_path from opt->priv->paths. old_path also will
- * eventually need to be freed, but it may still be used by e.g.
- * ci->pathnames. So, store it in another string-list for now.
- */
- string_list_append(&opt->priv->paths_to_free, old_path);
-
assert(ci->filemask == 2 || ci->filemask == 4);
assert(ci->dirmask == 0);
strmap_remove(&opt->priv->paths, old_path, 0);
@@ -2374,7 +2390,6 @@
new_ci->stages[index].mode = ci->stages[index].mode;
oidcpy(&new_ci->stages[index].oid, &ci->stages[index].oid);
- free(ci);
ci = new_ci;
}
@@ -2802,10 +2817,23 @@
if (!new_name)
new_name = old_name;
+ /*
+ * cached_pairs has *copies* of old_name and new_name,
+ * because it has to persist across merges. Since
+ * pool_alloc_filespec() will just re-use the existing
+ * filenames, which will also get re-used by
+ * opt->priv->paths if they become renames, and then
+ * get freed at the end of the merge, that would leave
+ * the copy in cached_pairs dangling. Avoid this by
+ * making a copy here.
+ */
+ old_name = mem_pool_strdup(&opt->priv->pool, old_name);
+ new_name = mem_pool_strdup(&opt->priv->pool, new_name);
+
/* We don't care about oid/mode, only filenames and status */
- one = alloc_filespec(old_name);
- two = alloc_filespec(new_name);
- diff_queue(pairs, one, two);
+ one = pool_alloc_filespec(&opt->priv->pool, old_name);
+ two = pool_alloc_filespec(&opt->priv->pool, new_name);
+ pool_diff_queue(&opt->priv->pool, pairs, one, two);
pairs->queue[pairs->nr-1]->status = entry->value ? 'R' : 'D';
}
}
@@ -2913,6 +2941,7 @@
diff_queued_diff = renames->pairs[side_index];
trace2_region_enter("diff", "diffcore_rename", opt->repo);
diffcore_rename_extended(&diff_opts,
+ &opt->priv->pool,
&renames->relevant_sources[side_index],
&renames->dirs_removed[side_index],
&renames->dir_rename_count[side_index],
@@ -2963,7 +2992,7 @@
if (p->status != 'A' && p->status != 'R') {
possibly_cache_new_pair(renames, p, side_index, NULL);
- diff_free_filepair(p);
+ pool_diff_free_filepair(&opt->priv->pool, p);
continue;
}
@@ -2976,7 +3005,7 @@
possibly_cache_new_pair(renames, p, side_index, new_path);
if (p->status != 'R' && !new_path) {
- diff_free_filepair(p);
+ pool_diff_free_filepair(&opt->priv->pool, p);
continue;
}
@@ -3094,7 +3123,7 @@
side_pairs = &renames->pairs[s];
for (i = 0; i < side_pairs->nr; ++i) {
struct diff_filepair *p = side_pairs->queue[i];
- diff_free_filepair(p);
+ pool_diff_free_filepair(&opt->priv->pool, p);
}
}
@@ -3107,7 +3136,8 @@
if (combined.nr) {
int i;
for (i = 0; i < combined.nr; i++)
- diff_free_filepair(combined.queue[i]);
+ pool_diff_free_filepair(&opt->priv->pool,
+ combined.queue[i]);
free(combined.queue);
}
@@ -3581,7 +3611,8 @@
* the directory to remain here, so we need to move this
* path to some new location.
*/
- CALLOC_ARRAY(new_ci, 1);
+ new_ci = mem_pool_calloc(&opt->priv->pool, 1, sizeof(*new_ci));
+
/* We don't really want new_ci->merged.result copied, but it'll
* be overwritten below so it doesn't matter. We also don't
* want any directory mode/oid values copied, but we'll zero
@@ -3673,7 +3704,8 @@
const char *a_path = NULL, *b_path = NULL;
int rename_a = 0, rename_b = 0;
- new_ci = xmalloc(sizeof(*new_ci));
+ new_ci = mem_pool_alloc(&opt->priv->pool,
+ sizeof(*new_ci));
if (S_ISREG(a_mode))
rename_a = 1;
@@ -3742,17 +3774,8 @@
b_path = path;
strmap_put(&opt->priv->paths, b_path, new_ci);
- if (rename_a && rename_b) {
+ if (rename_a && rename_b)
strmap_remove(&opt->priv->paths, path, 0);
- /*
- * We removed path from opt->priv->paths. path
- * will also eventually need to be freed, but
- * it may still be used by e.g. ci->pathnames.
- * So, store it in another string-list for now.
- */
- string_list_append(&opt->priv->paths_to_free,
- path);
- }
/*
* Do special handling for b_path since process_entry()
@@ -4029,11 +4052,7 @@
unpack_opts.quiet = 0; /* FIXME: sequencer might want quiet? */
unpack_opts.verbose_update = (opt->verbosity > 2);
unpack_opts.fn = twoway_merge;
- if (1/* FIXME: opts->overwrite_ignore*/) {
- CALLOC_ARRAY(unpack_opts.dir, 1);
- unpack_opts.dir->flags |= DIR_SHOW_IGNORED;
- setup_standard_excludes(unpack_opts.dir);
- }
+ unpack_opts.preserve_ignored = 0; /* FIXME: !opts->overwrite_ignore */
parse_tree(prev);
init_tree_desc(&trees[0], prev->buffer, prev->size);
parse_tree(next);
@@ -4041,8 +4060,6 @@
ret = unpack_trees(2, trees, &unpack_opts);
clear_unpack_trees_porcelain(&unpack_opts);
- dir_clear(unpack_opts.dir);
- FREE_AND_NULL(unpack_opts.dir);
return ret;
}
@@ -4058,6 +4075,21 @@
if (strmap_empty(&opt->priv->conflicted))
return 0;
+ /*
+ * We are in a conflicted state. These conflicts might be inside
+ * sparse-directory entries, so check if any entries are outside
+ * of the sparse-checkout cone preemptively.
+ *
+ * We set original_cache_nr below, but that might change if
+ * index_name_pos() calls ask for paths within sparse directories.
+ */
+ strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
+ if (!path_in_sparse_checkout(e->key, index)) {
+ ensure_full_index(index);
+ break;
+ }
+ }
+
/* If any entries have skip_worktree set, we'll have to check 'em out */
state.force = 1;
state.quiet = 1;
@@ -4293,6 +4325,7 @@
{
struct rename_info *renames;
int i;
+ struct mem_pool *pool = NULL;
/* Sanity checks on opt */
trace2_region_enter("merge", "sanity checks", opt->repo);
@@ -4358,9 +4391,11 @@
/* Initialization of various renames fields */
renames = &opt->priv->renames;
+ mem_pool_init(&opt->priv->pool, 0);
+ pool = &opt->priv->pool;
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
strintmap_init_with_options(&renames->dirs_removed[i],
- NOT_RELEVANT, NULL, 0);
+ NOT_RELEVANT, pool, 0);
strmap_init_with_options(&renames->dir_rename_count[i],
NULL, 1);
strmap_init_with_options(&renames->dir_renames[i],
@@ -4374,7 +4409,7 @@
*/
strintmap_init_with_options(&renames->relevant_sources[i],
-1 /* explicitly invalid */,
- NULL, 0);
+ pool, 0);
strmap_init_with_options(&renames->cached_pairs[i],
NULL, 1);
strset_init_with_options(&renames->cached_irrelevant[i],
@@ -4384,9 +4419,9 @@
}
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
strintmap_init_with_options(&renames->deferred[i].possible_trivial_merges,
- 0, NULL, 0);
+ 0, pool, 0);
strset_init_with_options(&renames->deferred[i].target_dirs,
- NULL, 1);
+ pool, 1);
renames->deferred[i].trivial_merges_okay = 1; /* 1 == maybe */
}
@@ -4394,14 +4429,13 @@
* Although we initialize opt->priv->paths with strdup_strings=0,
* that's just to avoid making yet another copy of an allocated
* string. Putting the entry into paths means we are taking
- * ownership, so we will later free it. paths_to_free is similar.
+ * ownership, so we will later free it.
*
* In contrast, conflicted just has a subset of keys from paths, so
* we don't want to free those (it'd be a duplicate free).
*/
- strmap_init_with_options(&opt->priv->paths, NULL, 0);
- strmap_init_with_options(&opt->priv->conflicted, NULL, 0);
- string_list_init_nodup(&opt->priv->paths_to_free);
+ strmap_init_with_options(&opt->priv->paths, pool, 0);
+ strmap_init_with_options(&opt->priv->conflicted, pool, 0);
/*
* keys & strbufs in output will sometimes need to outlive "paths",
diff --git a/merge-recursive.c b/merge-recursive.c
index 3355d50..d945779 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -24,6 +24,7 @@
#include "repository.h"
#include "revision.h"
#include "string-list.h"
+#include "submodule-config.h"
#include "submodule.h"
#include "tag.h"
#include "tree-walk.h"
@@ -55,10 +56,7 @@
a = container_of(eptr, const struct path_hashmap_entry, e);
b = container_of(entry_or_key, const struct path_hashmap_entry, e);
- if (ignore_case)
- return strcasecmp(a->path, key ? key : b->path);
- else
- return strcmp(a->path, key ? key : b->path);
+ return fspathcmp(a->path, key ? key : b->path);
}
/*
@@ -336,7 +334,9 @@
flush_output(opt);
}
-static void output_commit_title(struct merge_options *opt, struct commit *commit)
+static void repo_output_commit_title(struct merge_options *opt,
+ struct repository *repo,
+ struct commit *commit)
{
struct merge_remote_desc *desc;
@@ -345,23 +345,29 @@
if (desc)
strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
else {
- strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
- DEFAULT_ABBREV);
+ strbuf_repo_add_unique_abbrev(&opt->obuf, repo,
+ &commit->object.oid,
+ DEFAULT_ABBREV);
strbuf_addch(&opt->obuf, ' ');
- if (parse_commit(commit) != 0)
+ if (repo_parse_commit(repo, commit) != 0)
strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
else {
const char *title;
- const char *msg = get_commit_buffer(commit, NULL);
+ const char *msg = repo_get_commit_buffer(repo, commit, NULL);
int len = find_commit_subject(msg, &title);
if (len)
strbuf_addf(&opt->obuf, "%.*s\n", len, title);
- unuse_commit_buffer(commit, msg);
+ repo_unuse_commit_buffer(repo, commit, msg);
}
}
flush_output(opt);
}
+static void output_commit_title(struct merge_options *opt, struct commit *commit)
+{
+ repo_output_commit_title(opt, the_repository, commit);
+}
+
static int add_cacheinfo(struct merge_options *opt,
const struct diff_filespec *blob,
const char *path, int stage, int refresh, int options)
@@ -411,8 +417,11 @@
memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts));
if (opt->priv->call_depth)
opt->priv->unpack_opts.index_only = 1;
- else
+ else {
opt->priv->unpack_opts.update = 1;
+ /* FIXME: should only do this if !overwrite_ignore */
+ opt->priv->unpack_opts.preserve_ignored = 0;
+ }
opt->priv->unpack_opts.merge = 1;
opt->priv->unpack_opts.head_idx = 2;
opt->priv->unpack_opts.fn = threeway_merge;
@@ -1113,7 +1122,6 @@
xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
oid_to_hex(&a->object.oid));
repo_init_revisions(repo, &revs, NULL);
- rev_opts.submodule = path;
/* FIXME: can't handle linked worktrees in submodules yet */
revs.single_worktree = path != NULL;
setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
@@ -1123,7 +1131,7 @@
die("revision walk setup failed");
while ((commit = get_revision(&revs)) != NULL) {
struct object *o = &(commit->object);
- if (in_merge_bases(b, commit))
+ if (repo_in_merge_bases(repo, b, commit))
add_object_array(o, NULL, &merges);
}
reset_revision_walk();
@@ -1138,7 +1146,7 @@
contains_another = 0;
for (j = 0; j < merges.nr; j++) {
struct commit *m2 = (struct commit *) merges.objects[j].item;
- if (i != j && in_merge_bases(m2, m1)) {
+ if (i != j && repo_in_merge_bases(repo, m2, m1)) {
contains_another = 1;
break;
}
@@ -1152,14 +1160,14 @@
return result->nr;
}
-static void print_commit(struct commit *commit)
+static void print_commit(struct repository *repo, struct commit *commit)
{
struct strbuf sb = STRBUF_INIT;
struct pretty_print_context ctx = {0};
ctx.date_mode.type = DATE_NORMAL;
/* FIXME: Merge this with output_commit_title() */
assert(!merge_remote_util(commit));
- format_commit_message(commit, " %h: %m %s", &sb, &ctx);
+ repo_format_commit_message(repo, commit, " %h: %m %s", &sb, &ctx);
fprintf(stderr, "%s\n", sb.buf);
strbuf_release(&sb);
}
@@ -1174,6 +1182,8 @@
const struct object_id *base, const struct object_id *a,
const struct object_id *b)
{
+ struct repository subrepo;
+ int ret = 0;
struct commit *commit_base, *commit_a, *commit_b;
int parent_count;
struct object_array merges;
@@ -1197,49 +1207,51 @@
if (is_null_oid(b))
return 0;
- if (add_submodule_odb(path)) {
+ if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
return 0;
}
- if (!(commit_base = lookup_commit_reference(opt->repo, base)) ||
- !(commit_a = lookup_commit_reference(opt->repo, a)) ||
- !(commit_b = lookup_commit_reference(opt->repo, b))) {
+ if (!(commit_base = lookup_commit_reference(&subrepo, base)) ||
+ !(commit_a = lookup_commit_reference(&subrepo, a)) ||
+ !(commit_b = lookup_commit_reference(&subrepo, b))) {
output(opt, 1, _("Failed to merge submodule %s (commits not present)"), path);
- return 0;
+ goto cleanup;
}
/* check whether both changes are forward */
- if (!in_merge_bases(commit_base, commit_a) ||
- !in_merge_bases(commit_base, commit_b)) {
+ if (!repo_in_merge_bases(&subrepo, commit_base, commit_a) ||
+ !repo_in_merge_bases(&subrepo, commit_base, commit_b)) {
output(opt, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
- return 0;
+ goto cleanup;
}
/* Case #1: a is contained in b or vice versa */
- if (in_merge_bases(commit_a, commit_b)) {
+ if (repo_in_merge_bases(&subrepo, commit_a, commit_b)) {
oidcpy(result, b);
if (show(opt, 3)) {
output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(opt, commit_b);
+ repo_output_commit_title(opt, &subrepo, commit_b);
} else if (show(opt, 2))
output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
; /* no output */
- return 1;
+ ret = 1;
+ goto cleanup;
}
- if (in_merge_bases(commit_b, commit_a)) {
+ if (repo_in_merge_bases(&subrepo, commit_b, commit_a)) {
oidcpy(result, a);
if (show(opt, 3)) {
output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(opt, commit_a);
+ repo_output_commit_title(opt, &subrepo, commit_a);
} else if (show(opt, 2))
output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
; /* no output */
- return 1;
+ ret = 1;
+ goto cleanup;
}
/*
@@ -1251,10 +1263,10 @@
/* Skip the search if makes no sense to the calling context. */
if (!search)
- return 0;
+ goto cleanup;
/* find commit which merges them */
- parent_count = find_first_merges(opt->repo, &merges, path,
+ parent_count = find_first_merges(&subrepo, &merges, path,
commit_a, commit_b);
switch (parent_count) {
case 0:
@@ -1264,7 +1276,7 @@
case 1:
output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
- print_commit((struct commit *) merges.objects[0].item);
+ print_commit(&subrepo, (struct commit *) merges.objects[0].item);
output(opt, 2, _(
"If this is correct simply add it to the index "
"for example\n"
@@ -1277,11 +1289,13 @@
default:
output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
for (i = 0; i < merges.nr; i++)
- print_commit((struct commit *) merges.objects[i].item);
+ print_commit(&subrepo, (struct commit *) merges.objects[i].item);
}
object_array_clear(&merges);
- return 0;
+cleanup:
+ repo_clear(&subrepo);
+ return ret;
}
static int merge_mode_and_contents(struct merge_options *opt,
@@ -3750,6 +3764,9 @@
assert(opt->ancestor == NULL ||
!strcmp(opt->ancestor, "constructed merge base"));
+ prepare_repo_settings(opt->repo);
+ opt->repo->settings.command_requires_full_index = 1;
+
if (merge_start(opt, repo_get_commit_tree(opt->repo, h1)))
return -1;
clean = merge_recursive_internal(opt, h1, h2, merge_bases, result);
diff --git a/merge.c b/merge.c
index 6e73688..2382ff6 100644
--- a/merge.c
+++ b/merge.c
@@ -53,7 +53,6 @@
struct unpack_trees_options opts;
struct tree_desc t[MAX_UNPACK_TREES];
int i, nr_trees = 0;
- struct dir_struct dir = DIR_INIT;
struct lock_file lock_file = LOCK_INIT;
refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -80,11 +79,7 @@
}
memset(&opts, 0, sizeof(opts));
- if (overwrite_ignore) {
- dir.flags |= DIR_SHOW_IGNORED;
- setup_standard_excludes(&dir);
- opts.dir = &dir;
- }
+ opts.preserve_ignored = !overwrite_ignore;
opts.head_idx = 1;
opts.src_index = r->index;
@@ -101,7 +96,6 @@
clear_unpack_trees_porcelain(&opts);
return -1;
}
- dir_clear(&dir);
clear_unpack_trees_porcelain(&opts);
if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
diff --git a/mergesort.c b/mergesort.c
index e5fdf2e..6216835 100644
--- a/mergesort.c
+++ b/mergesort.c
@@ -1,73 +1,84 @@
#include "cache.h"
#include "mergesort.h"
-struct mergesort_sublist {
- void *ptr;
- unsigned long len;
-};
-
-static void *get_nth_next(void *list, unsigned long n,
- void *(*get_next_fn)(const void *))
+/* Combine two sorted lists. Take from `list` on equality. */
+static void *llist_merge(void *list, void *other,
+ void *(*get_next_fn)(const void *),
+ void (*set_next_fn)(void *, void *),
+ int (*compare_fn)(const void *, const void *))
{
- while (n-- && list)
- list = get_next_fn(list);
- return list;
+ void *result = list, *tail;
+
+ if (compare_fn(list, other) > 0) {
+ result = other;
+ goto other;
+ }
+ for (;;) {
+ do {
+ tail = list;
+ list = get_next_fn(list);
+ if (!list) {
+ set_next_fn(tail, other);
+ return result;
+ }
+ } while (compare_fn(list, other) <= 0);
+ set_next_fn(tail, other);
+ other:
+ do {
+ tail = other;
+ other = get_next_fn(other);
+ if (!other) {
+ set_next_fn(tail, list);
+ return result;
+ }
+ } while (compare_fn(list, other) > 0);
+ set_next_fn(tail, list);
+ }
}
-static void *pop_item(struct mergesort_sublist *l,
- void *(*get_next_fn)(const void *))
-{
- void *p = l->ptr;
- l->ptr = get_next_fn(l->ptr);
- l->len = l->ptr ? (l->len - 1) : 0;
- return p;
-}
-
+/*
+ * Perform an iterative mergesort using an array of sublists.
+ *
+ * n is the number of items.
+ * ranks[i] is undefined if n & 2^i == 0, and assumed empty.
+ * ranks[i] contains a sublist of length 2^i otherwise.
+ *
+ * The number of bits in a void pointer limits the number of objects
+ * that can be created, and thus the number of array elements necessary
+ * to be able to sort any valid list.
+ *
+ * Adding an item to this array is like incrementing a binary number;
+ * positional values for set bits correspond to sublist lengths.
+ */
void *llist_mergesort(void *list,
void *(*get_next_fn)(const void *),
void (*set_next_fn)(void *, void *),
int (*compare_fn)(const void *, const void *))
{
- unsigned long l;
+ void *ranks[bitsizeof(void *)];
+ size_t n = 0;
+ int i;
- if (!list)
- return NULL;
- for (l = 1; ; l *= 2) {
- void *curr;
- struct mergesort_sublist p, q;
+ while (list) {
+ void *next = get_next_fn(list);
+ if (next)
+ set_next_fn(list, NULL);
+ for (i = 0; n & (1 << i); i++)
+ list = llist_merge(ranks[i], list, get_next_fn,
+ set_next_fn, compare_fn);
+ n++;
+ ranks[i] = list;
+ list = next;
+ }
- p.ptr = list;
- q.ptr = get_nth_next(p.ptr, l, get_next_fn);
- if (!q.ptr)
- break;
- p.len = q.len = l;
-
- if (compare_fn(p.ptr, q.ptr) > 0)
- list = curr = pop_item(&q, get_next_fn);
+ for (i = 0; n; i++, n >>= 1) {
+ if (!(n & 1))
+ continue;
+ if (list)
+ list = llist_merge(ranks[i], list, get_next_fn,
+ set_next_fn, compare_fn);
else
- list = curr = pop_item(&p, get_next_fn);
-
- while (p.ptr) {
- while (p.len || q.len) {
- void *prev = curr;
-
- if (!p.len)
- curr = pop_item(&q, get_next_fn);
- else if (!q.len)
- curr = pop_item(&p, get_next_fn);
- else if (compare_fn(p.ptr, q.ptr) > 0)
- curr = pop_item(&q, get_next_fn);
- else
- curr = pop_item(&p, get_next_fn);
- set_next_fn(prev, curr);
- }
- p.ptr = q.ptr;
- p.len = l;
- q.ptr = get_nth_next(p.ptr, l, get_next_fn);
- q.len = q.ptr ? l : 0;
-
- }
- set_next_fn(curr, NULL);
+ list = ranks[i];
}
return list;
}
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index ce5b8e9..d5ce467 100644
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -3,6 +3,13 @@
-R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl+G"' \
"$LOCAL" "$REMOTE"
+
+ # xxdiff can segfault on binary files which are often uninteresting.
+ # Do not allow segfaults to stop us from continuing on to the next file.
+ if test $? = 128
+ then
+ return 1
+ fi
}
merge_cmd () {
diff --git a/midx.c b/midx.c
index 321c6fd..8433086 100644
--- a/midx.c
+++ b/midx.c
@@ -13,6 +13,10 @@
#include "repository.h"
#include "chunk-format.h"
#include "pack.h"
+#include "pack-bitmap.h"
+#include "refs.h"
+#include "revision.h"
+#include "list-objects.h"
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1
@@ -48,12 +52,12 @@
}
}
-static const unsigned char *get_midx_checksum(struct multi_pack_index *m)
+const unsigned char *get_midx_checksum(struct multi_pack_index *m)
{
return m->data + m->data_len - the_hash_algo->rawsz;
}
-static char *get_midx_filename(const char *object_dir)
+char *get_midx_filename(const char *object_dir)
{
return xstrfmt("%s/pack/multi-pack-index", object_dir);
}
@@ -195,6 +199,8 @@
if (!m)
return;
+ close_midx(m->next);
+
munmap((unsigned char *)m->data, m->data_len);
for (i = 0; i < m->num_packs; i++) {
@@ -203,6 +209,7 @@
}
FREE_AND_NULL(m->packs);
FREE_AND_NULL(m->pack_names);
+ free(m);
}
int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id)
@@ -276,14 +283,18 @@
(off_t)pos * MIDX_CHUNK_OFFSET_WIDTH);
}
-static int nth_midxed_pack_entry(struct repository *r,
- struct multi_pack_index *m,
- struct pack_entry *e,
- uint32_t pos)
+int fill_midx_entry(struct repository * r,
+ const struct object_id *oid,
+ struct pack_entry *e,
+ struct multi_pack_index *m)
{
+ uint32_t pos;
uint32_t pack_int_id;
struct packed_git *p;
+ if (!bsearch_midx(oid, m, &pos))
+ return 0;
+
if (pos >= m->num_objects)
return 0;
@@ -303,15 +314,9 @@
if (!is_pack_valid(p))
return 0;
- if (p->num_bad_objects) {
- uint32_t i;
- struct object_id oid;
- nth_midxed_object_oid(&oid, m, pos);
- for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(oid.hash,
- p->bad_object_sha1 + the_hash_algo->rawsz * i))
- return 0;
- }
+ if (oidset_size(&p->bad_objects) &&
+ oidset_contains(&p->bad_objects, oid))
+ return 0;
e->offset = nth_midxed_offset(m, pos);
e->p = p;
@@ -319,19 +324,6 @@
return 1;
}
-int fill_midx_entry(struct repository * r,
- const struct object_id *oid,
- struct pack_entry *e,
- struct multi_pack_index *m)
-{
- uint32_t pos;
-
- if (!bsearch_midx(oid, m, &pos))
- return 0;
-
- return nth_midxed_pack_entry(r, m, e, pos);
-}
-
/* Match "foo.idx" against either "foo.pack" _or_ "foo.idx". */
static int cmp_idx_or_pack_name(const char *idx_or_pack_name,
const char *idx_name)
@@ -468,6 +460,8 @@
uint32_t num_large_offsets;
int preferred_pack_idx;
+
+ struct string_list *to_include;
};
static void add_pack_to_midx(const char *full_path, size_t full_path_len,
@@ -477,8 +471,26 @@
if (ends_with(file_name, ".idx")) {
display_progress(ctx->progress, ++ctx->pack_paths_checked);
+ /*
+ * Note that at most one of ctx->m and ctx->to_include are set,
+ * so we are testing midx_contains_pack() and
+ * string_list_has_string() independently (guarded by the
+ * appropriate NULL checks).
+ *
+ * We could support passing to_include while reusing an existing
+ * MIDX, but don't currently since the reuse process drags
+ * forward all packs from an existing MIDX (without checking
+ * whether or not they appear in the to_include list).
+ *
+ * If we added support for that, these next two conditional
+ * should be performed independently (likely checking
+ * to_include before the existing MIDX).
+ */
if (ctx->m && midx_contains_pack(ctx->m, file_name))
return;
+ else if (ctx->to_include &&
+ !string_list_has_string(ctx->to_include, file_name))
+ return;
ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc);
@@ -882,7 +894,7 @@
strbuf_release(&buf);
}
-static void clear_midx_files_ext(struct repository *r, const char *ext,
+static void clear_midx_files_ext(const char *object_dir, const char *ext,
unsigned char *keep_hash);
static int midx_checksum_valid(struct multi_pack_index *m)
@@ -890,9 +902,232 @@
return hashfile_checksum_valid(m->data, m->data_len);
}
-static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
+static void prepare_midx_packing_data(struct packing_data *pdata,
+ struct write_midx_context *ctx)
+{
+ uint32_t i;
+
+ memset(pdata, 0, sizeof(struct packing_data));
+ prepare_packing_data(the_repository, pdata);
+
+ for (i = 0; i < ctx->entries_nr; i++) {
+ struct pack_midx_entry *from = &ctx->entries[ctx->pack_order[i]];
+ struct object_entry *to = packlist_alloc(pdata, &from->oid);
+
+ oe_set_in_pack(pdata, to,
+ ctx->info[ctx->pack_perm[from->pack_int_id]].p);
+ }
+}
+
+static int add_ref_to_pending(const char *refname,
+ const struct object_id *oid,
+ int flag, void *cb_data)
+{
+ struct rev_info *revs = (struct rev_info*)cb_data;
+ struct object *object;
+
+ if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) {
+ warning("symbolic ref is dangling: %s", refname);
+ return 0;
+ }
+
+ object = parse_object_or_die(oid, refname);
+ if (object->type != OBJ_COMMIT)
+ return 0;
+
+ add_pending_object(revs, object, "");
+ if (bitmap_is_preferred_refname(revs->repo, refname))
+ object->flags |= NEEDS_BITMAP;
+ return 0;
+}
+
+struct bitmap_commit_cb {
+ struct commit **commits;
+ size_t commits_nr, commits_alloc;
+
+ struct write_midx_context *ctx;
+};
+
+static const struct object_id *bitmap_oid_access(size_t index,
+ const void *_entries)
+{
+ const struct pack_midx_entry *entries = _entries;
+ return &entries[index].oid;
+}
+
+static void bitmap_show_commit(struct commit *commit, void *_data)
+{
+ struct bitmap_commit_cb *data = _data;
+ int pos = oid_pos(&commit->object.oid, data->ctx->entries,
+ data->ctx->entries_nr,
+ bitmap_oid_access);
+ if (pos < 0)
+ return;
+
+ ALLOC_GROW(data->commits, data->commits_nr + 1, data->commits_alloc);
+ data->commits[data->commits_nr++] = commit;
+}
+
+static int read_refs_snapshot(const char *refs_snapshot,
+ struct rev_info *revs)
+{
+ struct strbuf buf = STRBUF_INIT;
+ struct object_id oid;
+ FILE *f = xfopen(refs_snapshot, "r");
+
+ while (strbuf_getline(&buf, f) != EOF) {
+ struct object *object;
+ int preferred = 0;
+ char *hex = buf.buf;
+ const char *end = NULL;
+
+ if (buf.len && *buf.buf == '+') {
+ preferred = 1;
+ hex = &buf.buf[1];
+ }
+
+ if (parse_oid_hex(hex, &oid, &end) < 0)
+ die(_("could not parse line: %s"), buf.buf);
+ if (*end)
+ die(_("malformed line: %s"), buf.buf);
+
+ object = parse_object_or_die(&oid, NULL);
+ if (preferred)
+ object->flags |= NEEDS_BITMAP;
+
+ add_pending_object(revs, object, "");
+ }
+
+ fclose(f);
+ strbuf_release(&buf);
+ return 0;
+}
+
+static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr_p,
+ const char *refs_snapshot,
+ struct write_midx_context *ctx)
+{
+ struct rev_info revs;
+ struct bitmap_commit_cb cb = {0};
+
+ cb.ctx = ctx;
+
+ repo_init_revisions(the_repository, &revs, NULL);
+ if (refs_snapshot) {
+ read_refs_snapshot(refs_snapshot, &revs);
+ } else {
+ setup_revisions(0, NULL, &revs, NULL);
+ for_each_ref(add_ref_to_pending, &revs);
+ }
+
+ /*
+ * Skipping promisor objects here is intentional, since it only excludes
+ * them from the list of reachable commits that we want to select from
+ * when computing the selection of MIDX'd commits to receive bitmaps.
+ *
+ * Reachability bitmaps do require that their objects be closed under
+ * reachability, but fetching any objects missing from promisors at this
+ * point is too late. But, if one of those objects can be reached from
+ * an another object that is included in the bitmap, then we will
+ * complain later that we don't have reachability closure (and fail
+ * appropriately).
+ */
+ fetch_if_missing = 0;
+ revs.exclude_promisor_objects = 1;
+
+ if (prepare_revision_walk(&revs))
+ die(_("revision walk setup failed"));
+
+ traverse_commit_list(&revs, bitmap_show_commit, NULL, &cb);
+ if (indexed_commits_nr_p)
+ *indexed_commits_nr_p = cb.commits_nr;
+
+ return cb.commits;
+}
+
+static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
+ struct write_midx_context *ctx,
+ const char *refs_snapshot,
+ unsigned flags)
+{
+ struct packing_data pdata;
+ struct pack_idx_entry **index;
+ struct commit **commits = NULL;
+ uint32_t i, commits_nr;
+ uint16_t options = 0;
+ char *bitmap_name = xstrfmt("%s-%s.bitmap", midx_name, hash_to_hex(midx_hash));
+ int ret;
+
+ if (flags & MIDX_WRITE_BITMAP_HASH_CACHE)
+ options |= BITMAP_OPT_HASH_CACHE;
+
+ prepare_midx_packing_data(&pdata, ctx);
+
+ commits = find_commits_for_midx_bitmap(&commits_nr, refs_snapshot, ctx);
+
+ /*
+ * Build the MIDX-order index based on pdata.objects (which is already
+ * in MIDX order; c.f., 'midx_pack_order_cmp()' for the definition of
+ * this order).
+ */
+ ALLOC_ARRAY(index, pdata.nr_objects);
+ for (i = 0; i < pdata.nr_objects; i++)
+ index[i] = &pdata.objects[i].idx;
+
+ bitmap_writer_show_progress(flags & MIDX_PROGRESS);
+ bitmap_writer_build_type_index(&pdata, index, pdata.nr_objects);
+
+ /*
+ * bitmap_writer_finish expects objects in lex order, but pack_order
+ * gives us exactly that. use it directly instead of re-sorting the
+ * array.
+ *
+ * This changes the order of objects in 'index' between
+ * bitmap_writer_build_type_index and bitmap_writer_finish.
+ *
+ * The same re-ordering takes place in the single-pack bitmap code via
+ * write_idx_file(), which is called by finish_tmp_packfile(), which
+ * happens between bitmap_writer_build_type_index() and
+ * bitmap_writer_finish().
+ */
+ for (i = 0; i < pdata.nr_objects; i++)
+ index[ctx->pack_order[i]] = &pdata.objects[i].idx;
+
+ bitmap_writer_select_commits(commits, commits_nr, -1);
+ ret = bitmap_writer_build(&pdata);
+ if (ret < 0)
+ goto cleanup;
+
+ bitmap_writer_set_checksum(midx_hash);
+ bitmap_writer_finish(index, pdata.nr_objects, bitmap_name, options);
+
+cleanup:
+ free(index);
+ free(bitmap_name);
+ return ret;
+}
+
+static struct multi_pack_index *lookup_multi_pack_index(struct repository *r,
+ const char *object_dir)
+{
+ struct multi_pack_index *cur;
+
+ /* Ensure the given object_dir is local, or a known alternate. */
+ find_odb(r, object_dir);
+
+ for (cur = get_multi_pack_index(r); cur; cur = cur->next) {
+ if (!strcmp(object_dir, cur->object_dir))
+ return cur;
+ }
+
+ return NULL;
+}
+
+static int write_midx_internal(const char *object_dir,
+ struct string_list *packs_to_include,
struct string_list *packs_to_drop,
const char *preferred_pack_name,
+ const char *refs_snapshot,
unsigned flags)
{
char *midx_name;
@@ -911,10 +1146,14 @@
die_errno(_("unable to create leading directories of %s"),
midx_name);
- if (m)
- ctx.m = m;
- else
- ctx.m = load_multi_pack_index(object_dir, 1);
+ if (!packs_to_include) {
+ /*
+ * Only reference an existing MIDX when not filtering which
+ * packs to include, since all packs and objects are copied
+ * blindly from an existing MIDX if one is present.
+ */
+ ctx.m = lookup_multi_pack_index(the_repository, object_dir);
+ }
if (ctx.m && !midx_checksum_valid(ctx.m)) {
warning(_("ignoring existing multi-pack-index; checksum mismatch"));
@@ -932,8 +1171,27 @@
ctx.info[ctx.nr].orig_pack_int_id = i;
ctx.info[ctx.nr].pack_name = xstrdup(ctx.m->pack_names[i]);
- ctx.info[ctx.nr].p = NULL;
+ ctx.info[ctx.nr].p = ctx.m->packs[i];
ctx.info[ctx.nr].expired = 0;
+
+ if (flags & MIDX_WRITE_REV_INDEX) {
+ /*
+ * If generating a reverse index, need to have
+ * packed_git's loaded to compare their
+ * mtimes and object count.
+ */
+ if (prepare_midx_pack(the_repository, ctx.m, i)) {
+ error(_("could not load pack"));
+ result = 1;
+ goto cleanup;
+ }
+
+ if (open_pack_index(ctx.m->packs[i]))
+ die(_("could not open index for %s"),
+ ctx.m->packs[i]->pack_name);
+ ctx.info[ctx.nr].p = ctx.m->packs[i];
+ }
+
ctx.nr++;
}
}
@@ -944,21 +1202,95 @@
else
ctx.progress = NULL;
+ ctx.to_include = packs_to_include;
+
for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx);
stop_progress(&ctx.progress);
- if (ctx.m && ctx.nr == ctx.m->num_packs && !packs_to_drop)
- goto cleanup;
+ if ((ctx.m && ctx.nr == ctx.m->num_packs) &&
+ !(packs_to_include || packs_to_drop)) {
+ struct bitmap_index *bitmap_git;
+ int bitmap_exists;
+ int want_bitmap = flags & MIDX_WRITE_BITMAP;
- ctx.preferred_pack_idx = -1;
+ bitmap_git = prepare_midx_bitmap_git(ctx.m);
+ bitmap_exists = bitmap_git && bitmap_is_midx(bitmap_git);
+ free_bitmap_index(bitmap_git);
+
+ if (bitmap_exists || !want_bitmap) {
+ /*
+ * The correct MIDX already exists, and so does a
+ * corresponding bitmap (or one wasn't requested).
+ */
+ if (!want_bitmap)
+ clear_midx_files_ext(object_dir, ".bitmap",
+ NULL);
+ goto cleanup;
+ }
+ }
+
if (preferred_pack_name) {
+ int found = 0;
for (i = 0; i < ctx.nr; i++) {
if (!cmp_idx_or_pack_name(preferred_pack_name,
ctx.info[i].pack_name)) {
ctx.preferred_pack_idx = i;
+ found = 1;
break;
}
}
+
+ if (!found)
+ warning(_("unknown preferred pack: '%s'"),
+ preferred_pack_name);
+ } else if (ctx.nr &&
+ (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP))) {
+ struct packed_git *oldest = ctx.info[ctx.preferred_pack_idx].p;
+ ctx.preferred_pack_idx = 0;
+
+ if (packs_to_drop && packs_to_drop->nr)
+ BUG("cannot write a MIDX bitmap during expiration");
+
+ /*
+ * set a preferred pack when writing a bitmap to ensure that
+ * the pack from which the first object is selected in pseudo
+ * pack-order has all of its objects selected from that pack
+ * (and not another pack containing a duplicate)
+ */
+ for (i = 1; i < ctx.nr; i++) {
+ struct packed_git *p = ctx.info[i].p;
+
+ if (!oldest->num_objects || p->mtime < oldest->mtime) {
+ oldest = p;
+ ctx.preferred_pack_idx = i;
+ }
+ }
+
+ if (!oldest->num_objects) {
+ /*
+ * If all packs are empty; unset the preferred index.
+ * This is acceptable since there will be no duplicate
+ * objects to resolve, so the preferred value doesn't
+ * matter.
+ */
+ ctx.preferred_pack_idx = -1;
+ }
+ } else {
+ /*
+ * otherwise don't mark any pack as preferred to avoid
+ * interfering with expiration logic below
+ */
+ ctx.preferred_pack_idx = -1;
+ }
+
+ if (ctx.preferred_pack_idx > -1) {
+ struct packed_git *preferred = ctx.info[ctx.preferred_pack_idx].p;
+ if (!preferred->num_objects) {
+ error(_("cannot select preferred pack %s with no objects"),
+ preferred->pack_name);
+ result = 1;
+ goto cleanup;
+ }
}
ctx.entries = get_sorted_entries(ctx.m, ctx.info, ctx.nr, &ctx.entries_nr,
@@ -1029,11 +1361,7 @@
ctx.info, ctx.nr,
sizeof(*ctx.info),
idx_or_pack_name_cmp);
-
- if (!preferred)
- warning(_("unknown preferred pack: '%s'"),
- preferred_pack_name);
- else {
+ if (preferred) {
uint32_t perm = ctx.pack_perm[preferred->orig_pack_int_id];
if (perm == PACK_EXPIRED)
warning(_("preferred pack '%s' is expired"),
@@ -1048,9 +1376,6 @@
hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk));
- if (ctx.m)
- close_midx(ctx.m);
-
if (ctx.nr - dropped_packs == 0) {
error(_("no pack files to index."));
result = 1;
@@ -1081,14 +1406,28 @@
finalize_hashfile(f, midx_hash, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
free_chunkfile(cf);
- if (flags & MIDX_WRITE_REV_INDEX)
+ if (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP))
ctx.pack_order = midx_pack_order(&ctx);
if (flags & MIDX_WRITE_REV_INDEX)
write_midx_reverse_index(midx_name, midx_hash, &ctx);
- clear_midx_files_ext(the_repository, ".rev", midx_hash);
+ if (flags & MIDX_WRITE_BITMAP) {
+ if (write_midx_bitmap(midx_name, midx_hash, &ctx,
+ refs_snapshot, flags) < 0) {
+ error(_("could not write multi-pack bitmap"));
+ result = 1;
+ goto cleanup;
+ }
+ }
- commit_lock_file(&lk);
+ if (ctx.m)
+ close_object_store(the_repository->objects);
+
+ if (commit_lock_file(&lk) < 0)
+ die_errno(_("could not write multi-pack-index"));
+
+ clear_midx_files_ext(object_dir, ".bitmap", midx_hash);
+ clear_midx_files_ext(object_dir, ".rev", midx_hash);
cleanup:
for (i = 0; i < ctx.nr; i++) {
@@ -1104,15 +1443,27 @@
free(ctx.pack_perm);
free(ctx.pack_order);
free(midx_name);
+
return result;
}
int write_midx_file(const char *object_dir,
const char *preferred_pack_name,
+ const char *refs_snapshot,
unsigned flags)
{
return write_midx_internal(object_dir, NULL, NULL, preferred_pack_name,
- flags);
+ refs_snapshot, flags);
+}
+
+int write_midx_file_only(const char *object_dir,
+ struct string_list *packs_to_include,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags)
+{
+ return write_midx_internal(object_dir, packs_to_include, NULL,
+ preferred_pack_name, refs_snapshot, flags);
}
struct clear_midx_data {
@@ -1135,7 +1486,7 @@
die_errno(_("failed to remove %s"), full_path);
}
-static void clear_midx_files_ext(struct repository *r, const char *ext,
+static void clear_midx_files_ext(const char *object_dir, const char *ext,
unsigned char *keep_hash)
{
struct clear_midx_data data;
@@ -1146,7 +1497,7 @@
hash_to_hex(keep_hash), ext);
data.ext = ext;
- for_each_file_in_pack_dir(r->objects->odb->path,
+ for_each_file_in_pack_dir(object_dir,
clear_midx_file_ext,
&data);
@@ -1165,7 +1516,8 @@
if (remove_path(midx))
die(_("failed to clear multi-pack-index at %s"), midx);
- clear_midx_files_ext(r, ".rev", NULL);
+ clear_midx_files_ext(r->objects->odb->path, ".bitmap", NULL);
+ clear_midx_files_ext(r->objects->odb->path, ".rev", NULL);
free(midx);
}
@@ -1345,7 +1697,7 @@
{
uint32_t i, *count, result = 0;
struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
- struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+ struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
struct progress *progress = NULL;
if (!m)
@@ -1391,9 +1743,10 @@
free(count);
if (packs_to_drop.nr)
- result = write_midx_internal(object_dir, m, &packs_to_drop, NULL, flags);
+ result = write_midx_internal(object_dir, NULL, &packs_to_drop, NULL, NULL, flags);
string_list_clear(&packs_to_drop, 0);
+
return result;
}
@@ -1509,7 +1862,7 @@
struct child_process cmd = CHILD_PROCESS_INIT;
FILE *cmd_in;
struct strbuf base_name = STRBUF_INIT;
- struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+ struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
/*
* When updating the default for these configuration
@@ -1580,12 +1933,9 @@
goto cleanup;
}
- result = write_midx_internal(object_dir, m, NULL, NULL, flags);
- m = NULL;
+ result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags);
cleanup:
- if (m)
- close_midx(m);
free(include_pack);
return result;
}
diff --git a/midx.h b/midx.h
index 8684cf0..6e32297 100644
--- a/midx.h
+++ b/midx.h
@@ -2,12 +2,15 @@
#define MIDX_H
#include "repository.h"
+#include "string-list.h"
struct object_id;
struct pack_entry;
struct repository;
#define GIT_TEST_MULTI_PACK_INDEX "GIT_TEST_MULTI_PACK_INDEX"
+#define GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP \
+ "GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP"
struct multi_pack_index {
struct multi_pack_index *next;
@@ -41,7 +44,11 @@
#define MIDX_PROGRESS (1 << 0)
#define MIDX_WRITE_REV_INDEX (1 << 1)
+#define MIDX_WRITE_BITMAP (1 << 2)
+#define MIDX_WRITE_BITMAP_HASH_CACHE (1 << 3)
+const unsigned char *get_midx_checksum(struct multi_pack_index *m);
+char *get_midx_filename(const char *object_dir);
char *get_midx_rev_filename(struct multi_pack_index *m);
struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
@@ -56,7 +63,19 @@
int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
-int write_midx_file(const char *object_dir, const char *preferred_pack_name, unsigned flags);
+/*
+ * Variant of write_midx_file which writes a MIDX containing only the packs
+ * specified in packs_to_include.
+ */
+int write_midx_file(const char *object_dir,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags);
+int write_midx_file_only(const char *object_dir,
+ struct string_list *packs_to_include,
+ const char *preferred_pack_name,
+ const char *refs_snapshot,
+ unsigned flags);
void clear_midx_file(struct repository *r);
int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags);
int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags);
diff --git a/notes-merge.c b/notes-merge.c
index 46c1f7c..b4a3a90 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -273,7 +273,7 @@
*/
if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
!is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
- if (advice_resolve_conflict)
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
die(_("You have not concluded your previous "
"notes merge (%s exists).\nPlease, use "
"'git notes merge --commit' or 'git notes "
diff --git a/object-file.c b/object-file.c
index a8be899..c3d866a 100644
--- a/object-file.c
+++ b/object-file.c
@@ -32,6 +32,7 @@
#include "packfile.h"
#include "object-store.h"
#include "promisor-remote.h"
+#include "submodule.h"
/* The maximum size for an object header. */
#define MAX_HEADER_LEN 32
@@ -414,74 +415,6 @@
return result;
}
-int raceproof_create_file(const char *path, create_file_fn fn, void *cb)
-{
- /*
- * The number of times we will try to remove empty directories
- * in the way of path. This is only 1 because if another
- * process is racily creating directories that conflict with
- * us, we don't want to fight against them.
- */
- int remove_directories_remaining = 1;
-
- /*
- * The number of times that we will try to create the
- * directories containing path. We are willing to attempt this
- * more than once, because another process could be trying to
- * clean up empty directories at the same time as we are
- * trying to create them.
- */
- int create_directories_remaining = 3;
-
- /* A scratch copy of path, filled lazily if we need it: */
- struct strbuf path_copy = STRBUF_INIT;
-
- int ret, save_errno;
-
- /* Sanity check: */
- assert(*path);
-
-retry_fn:
- ret = fn(path, cb);
- save_errno = errno;
- if (!ret)
- goto out;
-
- if (errno == EISDIR && remove_directories_remaining-- > 0) {
- /*
- * A directory is in the way. Maybe it is empty; try
- * to remove it:
- */
- if (!path_copy.len)
- strbuf_addstr(&path_copy, path);
-
- if (!remove_dir_recursively(&path_copy, REMOVE_DIR_EMPTY_ONLY))
- goto retry_fn;
- } else if (errno == ENOENT && create_directories_remaining-- > 0) {
- /*
- * Maybe the containing directory didn't exist, or
- * maybe it was just deleted by a process that is
- * racing with us to clean up empty directories. Try
- * to create it:
- */
- enum scld_error scld_result;
-
- if (!path_copy.len)
- strbuf_addstr(&path_copy, path);
-
- do {
- scld_result = safe_create_leading_directories(path_copy.buf);
- if (scld_result == SCLD_OK)
- goto retry_fn;
- } while (scld_result == SCLD_VANISHED && create_directories_remaining-- > 0);
- }
-
-out:
- strbuf_release(&path_copy);
- errno = save_errno;
- return ret;
-}
-
static void fill_loose_path(struct strbuf *buf, const struct object_id *oid)
{
int i;
@@ -820,6 +753,27 @@
return ref_git;
}
+struct object_directory *find_odb(struct repository *r, const char *obj_dir)
+{
+ struct object_directory *odb;
+ char *obj_dir_real = real_pathdup(obj_dir, 1);
+ struct strbuf odb_path_real = STRBUF_INIT;
+
+ prepare_alt_odb(r);
+ for (odb = r->objects->odb; odb; odb = odb->next) {
+ strbuf_realpath(&odb_path_real, odb->path, 1);
+ if (!strcmp(obj_dir_real, odb_path_real.buf))
+ break;
+ }
+
+ free(obj_dir_real);
+ strbuf_release(&odb_path_real);
+
+ if (!odb)
+ die(_("could not find object directory matching %s"), obj_dir);
+ return odb;
+}
+
static void fill_alternate_refs_command(struct child_process *cmd,
const char *repo_path)
{
@@ -1062,9 +1016,11 @@
* the streaming interface and rehash it to do the same.
*/
int check_object_signature(struct repository *r, const struct object_id *oid,
- void *map, unsigned long size, const char *type)
+ void *map, unsigned long size, const char *type,
+ struct object_id *real_oidp)
{
- struct object_id real_oid;
+ struct object_id tmp;
+ struct object_id *real_oid = real_oidp ? real_oidp : &tmp;
enum object_type obj_type;
struct git_istream *st;
git_hash_ctx c;
@@ -1072,8 +1028,8 @@
int hdrlen;
if (map) {
- hash_object_file(r->hash_algo, map, size, type, &real_oid);
- return !oideq(oid, &real_oid) ? -1 : 0;
+ hash_object_file(r->hash_algo, map, size, type, real_oid);
+ return !oideq(oid, real_oid) ? -1 : 0;
}
st = open_istream(r, oid, &obj_type, &size, NULL);
@@ -1098,9 +1054,9 @@
break;
r->hash_algo->update_fn(&c, buf, readlen);
}
- r->hash_algo->final_oid_fn(&real_oid, &c);
+ r->hash_algo->final_oid_fn(real_oid, &c);
close_istream(st);
- return !oideq(oid, &real_oid) ? -1 : 0;
+ return !oideq(oid, real_oid) ? -1 : 0;
}
int git_open_cloexec(const char *name, int flags)
@@ -1233,11 +1189,14 @@
return map_loose_object_1(r, NULL, oid, size);
}
-static int unpack_loose_short_header(git_zstream *stream,
- unsigned char *map, unsigned long mapsize,
- void *buffer, unsigned long bufsiz)
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+ unsigned char *map,
+ unsigned long mapsize,
+ void *buffer,
+ unsigned long bufsiz,
+ struct strbuf *header)
{
- int ret;
+ int status;
/* Get the data stream */
memset(stream, 0, sizeof(*stream));
@@ -1248,43 +1207,24 @@
git_inflate_init(stream);
obj_read_unlock();
- ret = git_inflate(stream, 0);
+ status = git_inflate(stream, 0);
obj_read_lock();
-
- return ret;
-}
-
-int unpack_loose_header(git_zstream *stream,
- unsigned char *map, unsigned long mapsize,
- void *buffer, unsigned long bufsiz)
-{
- int status = unpack_loose_short_header(stream, map, mapsize,
- buffer, bufsiz);
-
if (status < Z_OK)
- return status;
-
- /* Make sure we have the terminating NUL */
- if (!memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
- return -1;
- return 0;
-}
-
-static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map,
- unsigned long mapsize, void *buffer,
- unsigned long bufsiz, struct strbuf *header)
-{
- int status;
-
- status = unpack_loose_short_header(stream, map, mapsize, buffer, bufsiz);
- if (status < Z_OK)
- return -1;
+ return ULHR_BAD;
/*
* Check if entire header is unpacked in the first iteration.
*/
if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
- return 0;
+ return ULHR_OK;
+
+ /*
+ * We have a header longer than MAX_HEADER_LEN. The "header"
+ * here is only non-NULL when we run "cat-file
+ * --allow-unknown-type".
+ */
+ if (!header)
+ return ULHR_TOO_LONG;
/*
* buffer[0..bufsiz] was not large enough. Copy the partial
@@ -1305,7 +1245,7 @@
stream->next_out = buffer;
stream->avail_out = bufsiz;
} while (status != Z_STREAM_END);
- return -1;
+ return ULHR_TOO_LONG;
}
static void *unpack_loose_rest(git_zstream *stream,
@@ -1363,8 +1303,7 @@
* too permissive for what we want to check. So do an anal
* object header parse by hand.
*/
-static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
- unsigned int flags)
+int parse_loose_header(const char *hdr, struct object_info *oi)
{
const char *type_buf = hdr;
unsigned long size;
@@ -1386,15 +1325,6 @@
type = type_from_string_gently(type_buf, type_len, 1);
if (oi->type_name)
strbuf_add(oi->type_name, type_buf, type_len);
- /*
- * Set type to 0 if its an unknown object and
- * we're obtaining the type using '--allow-unknown-type'
- * option.
- */
- if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE) && (type < 0))
- type = 0;
- else if (type < 0)
- die(_("invalid object type"));
if (oi->typep)
*oi->typep = type;
@@ -1421,15 +1351,14 @@
/*
* The length must be followed by a zero byte
*/
- return *hdr ? -1 : type;
-}
+ if (*hdr)
+ return -1;
-int parse_loose_header(const char *hdr, unsigned long *sizep)
-{
- struct object_info oi = OBJECT_INFO_INIT;
-
- oi.sizep = sizep;
- return parse_loose_header_extended(hdr, &oi, 0);
+ /*
+ * The format is valid, but the type may still be bogus. The
+ * Caller needs to check its oi->typep.
+ */
+ return 0;
}
static int loose_object_info(struct repository *r,
@@ -1443,6 +1372,8 @@
char hdr[MAX_HEADER_LEN];
struct strbuf hdrbuf = STRBUF_INIT;
unsigned long size_scratch;
+ enum object_type type_scratch;
+ int allow_unknown = flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
if (oi->delta_base_oid)
oidclr(oi->delta_base_oid);
@@ -1473,43 +1404,48 @@
if (!oi->sizep)
oi->sizep = &size_scratch;
+ if (!oi->typep)
+ oi->typep = &type_scratch;
if (oi->disk_sizep)
*oi->disk_sizep = mapsize;
- if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE)) {
- if (unpack_loose_header_to_strbuf(&stream, map, mapsize, hdr, sizeof(hdr), &hdrbuf) < 0)
- status = error(_("unable to unpack %s header with --allow-unknown-type"),
- oid_to_hex(oid));
- } else if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
+
+ switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+ allow_unknown ? &hdrbuf : NULL)) {
+ case ULHR_OK:
+ if (parse_loose_header(hdrbuf.len ? hdrbuf.buf : hdr, oi) < 0)
+ status = error(_("unable to parse %s header"), oid_to_hex(oid));
+ else if (!allow_unknown && *oi->typep < 0)
+ die(_("invalid object type"));
+
+ if (!oi->contentp)
+ break;
+ *oi->contentp = unpack_loose_rest(&stream, hdr, *oi->sizep, oid);
+ if (*oi->contentp)
+ goto cleanup;
+
+ status = -1;
+ break;
+ case ULHR_BAD:
status = error(_("unable to unpack %s header"),
oid_to_hex(oid));
- if (status < 0)
- ; /* Do nothing */
- else if (hdrbuf.len) {
- if ((status = parse_loose_header_extended(hdrbuf.buf, oi, flags)) < 0)
- status = error(_("unable to parse %s header with --allow-unknown-type"),
- oid_to_hex(oid));
- } else if ((status = parse_loose_header_extended(hdr, oi, flags)) < 0)
- status = error(_("unable to parse %s header"), oid_to_hex(oid));
+ break;
+ case ULHR_TOO_LONG:
+ status = error(_("header for %s too long, exceeds %d bytes"),
+ oid_to_hex(oid), MAX_HEADER_LEN);
+ break;
+ }
- if (status >= 0 && oi->contentp) {
- *oi->contentp = unpack_loose_rest(&stream, hdr,
- *oi->sizep, oid);
- if (!*oi->contentp) {
- git_inflate_end(&stream);
- status = -1;
- }
- } else
- git_inflate_end(&stream);
-
+ git_inflate_end(&stream);
+cleanup:
munmap(map, mapsize);
- if (status && oi->typep)
- *oi->typep = status;
if (oi->sizep == &size_scratch)
oi->sizep = NULL;
strbuf_release(&hdrbuf);
+ if (oi->typep == &type_scratch)
+ oi->typep = NULL;
oi->whence = OI_LOOSE;
- return (status < 0) ? status : 0;
+ return status;
}
int obj_read_use_lock = 0;
@@ -1592,6 +1528,17 @@
break;
}
+ /*
+ * If r is the_repository, this might be an attempt at
+ * accessing a submodule object as if it were in the_repository
+ * (having called add_submodule_odb() on that submodule's ODB).
+ * If any such ODBs exist, register them and try again.
+ */
+ if (r == the_repository &&
+ register_all_submodule_odb_as_alternates())
+ /* We added some alternates; retry */
+ continue;
+
/* Check if it is a missing object */
if (fetch_if_missing && repo_has_promisor_remote(r) &&
!already_retried &&
@@ -1616,7 +1563,7 @@
return 0;
rtype = packed_object_info(r, e.p, e.offset, oi);
if (rtype < 0) {
- mark_bad_packed_object(e.p, real->hash);
+ mark_bad_packed_object(e.p, real);
return do_oid_object_info_extended(r, real, oi, 0);
} else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset;
@@ -1725,7 +1672,7 @@
die(_("loose object %s (stored in %s) is corrupt"),
oid_to_hex(repl), path);
- if ((p = has_packed_and_bad(r, repl->hash)) != NULL)
+ if ((p = has_packed_and_bad(r, repl)) != NULL)
die(_("packed object %s (stored in %s) is corrupt"),
oid_to_hex(repl), p->pack_name);
obj_read_unlock();
@@ -1915,7 +1862,7 @@
static int write_loose_object(const struct object_id *oid, char *hdr,
int hdrlen, const void *buf, unsigned long len,
- time_t mtime)
+ time_t mtime, unsigned flags)
{
int fd, ret;
unsigned char compressed[4096];
@@ -1929,7 +1876,9 @@
fd = create_tmpfile(&tmp_file, filename.buf);
if (fd < 0) {
- if (errno == EACCES)
+ if (flags & HASH_SILENT)
+ return -1;
+ else if (errno == EACCES)
return error(_("insufficient permission for adding an object to repository database %s"), get_object_directory());
else
return error_errno(_("unable to create temporary file"));
@@ -1979,7 +1928,8 @@
struct utimbuf utb;
utb.actime = mtime;
utb.modtime = mtime;
- if (utime(tmp_file.buf, &utb) < 0)
+ if (utime(tmp_file.buf, &utb) < 0 &&
+ !(flags & HASH_SILENT))
warning_errno(_("failed utime() on %s"), tmp_file.buf);
}
@@ -2004,8 +1954,9 @@
return 1;
}
-int write_object_file(const void *buf, unsigned long len, const char *type,
- struct object_id *oid)
+int write_object_file_flags(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid,
+ unsigned flags)
{
char hdr[MAX_HEADER_LEN];
int hdrlen = sizeof(hdr);
@@ -2017,7 +1968,7 @@
&hdrlen);
if (freshen_packed_object(oid) || freshen_loose_object(oid))
return 0;
- return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
+ return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
}
int hash_object_file_literally(const void *buf, unsigned long len,
@@ -2037,7 +1988,7 @@
goto cleanup;
if (freshen_packed_object(oid) || freshen_loose_object(oid))
goto cleanup;
- status = write_loose_object(oid, header, hdrlen, buf, len, 0);
+ status = write_loose_object(oid, header, hdrlen, buf, len, 0, 0);
cleanup:
free(header);
@@ -2059,7 +2010,7 @@
if (!buf)
return error(_("cannot read object for %s"), oid_to_hex(oid));
hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
- ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
+ ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime, 0);
free(buf);
return ret;
@@ -2566,17 +2517,16 @@
int read_loose_object(const char *path,
const struct object_id *expected_oid,
- enum object_type *type,
- unsigned long *size,
- void **contents)
+ struct object_id *real_oid,
+ void **contents,
+ struct object_info *oi)
{
int ret = -1;
void *map = NULL;
unsigned long mapsize;
git_zstream stream;
char hdr[MAX_HEADER_LEN];
-
- *contents = NULL;
+ unsigned long *size = oi->sizep;
map = map_loose_object_1(the_repository, path, NULL, &mapsize);
if (!map) {
@@ -2584,19 +2534,19 @@
goto out;
}
- if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) {
+ if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+ NULL) < 0) {
error(_("unable to unpack header of %s"), path);
goto out;
}
- *type = parse_loose_header(hdr, size);
- if (*type < 0) {
+ if (parse_loose_header(hdr, oi) < 0) {
error(_("unable to parse header of %s"), path);
git_inflate_end(&stream);
goto out;
}
- if (*type == OBJ_BLOB && *size > big_file_threshold) {
+ if (*oi->typep == OBJ_BLOB && *size > big_file_threshold) {
if (check_stream_oid(&stream, hdr, *size, path, expected_oid) < 0)
goto out;
} else {
@@ -2608,12 +2558,8 @@
}
if (check_object_signature(the_repository, expected_oid,
*contents, *size,
- type_name(*type))) {
- error(_("hash mismatch for %s (expected %s)"), path,
- oid_to_hex(expected_oid));
- free(*contents);
+ oi->type_name->buf, real_oid))
goto out;
- }
}
ret = 0; /* everything checks out */
diff --git a/object-name.c b/object-name.c
index 3263c19..fdff460 100644
--- a/object-name.c
+++ b/object-name.c
@@ -806,7 +806,7 @@
refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);
if (refs_found > 0) {
warning(warn_msg, len, str);
- if (advice_object_name_warning)
+ if (advice_enabled(ADVICE_OBJECT_NAME_WARNING))
fprintf(stderr, "%s\n", _(object_name_msg));
}
free(real_ref);
diff --git a/object-store.h b/object-store.h
index d24915c..952efb6 100644
--- a/object-store.h
+++ b/object-store.h
@@ -10,6 +10,7 @@
#include "khash.h"
#include "dir.h"
#include "oidtree.h"
+#include "oidset.h"
struct object_directory {
struct object_directory *next;
@@ -38,6 +39,7 @@
void prepare_alt_odb(struct repository *r);
char *compute_alternate_path(const char *path, struct strbuf *err);
+struct object_directory *find_odb(struct repository *r, const char *obj_dir);
typedef int alt_odb_fn(struct object_directory *, void *);
int foreach_alt_odb(alt_odb_fn, void*);
typedef void alternate_ref_fn(const struct object_id *oid, void *);
@@ -75,9 +77,8 @@
const void *index_data;
size_t index_size;
uint32_t num_objects;
- uint32_t num_bad_objects;
uint32_t crc_offset;
- unsigned char *bad_object_sha1;
+ struct oidset bad_objects;
int index_version;
time_t mtime;
int pack_fd;
@@ -222,8 +223,14 @@
unsigned long len, const char *type,
struct object_id *oid);
-int write_object_file(const void *buf, unsigned long len,
- const char *type, struct object_id *oid);
+int write_object_file_flags(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid,
+ unsigned flags);
+static inline int write_object_file(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid)
+{
+ return write_object_file_flags(buf, len, type, oid, 0);
+}
int hash_object_file_literally(const void *buf, unsigned long len,
const char *type, struct object_id *oid,
@@ -244,6 +251,7 @@
/*
* Open the loose object at path, check its hash, and return the contents,
+ * use the "oi" argument to assert things about the object, or e.g. populate its
* type, and size. If the object is a blob, then "contents" may return NULL,
* to allow streaming of large blobs.
*
@@ -251,9 +259,9 @@
*/
int read_loose_object(const char *path,
const struct object_id *expected_oid,
- enum object_type *type,
- unsigned long *size,
- void **contents);
+ struct object_id *real_oid,
+ void **contents,
+ struct object_info *oi);
/* Retry packed storage after checking packed and loose storage */
#define HAS_OBJECT_RECHECK_PACKED 1
@@ -370,7 +378,7 @@
* Initializer for a "struct object_info" that wants no items. You may
* also memset() the memory to all-zeroes.
*/
-#define OBJECT_INFO_INIT {NULL}
+#define OBJECT_INFO_INIT { 0 }
/* Invoke lookup_replace_object() on the given hash */
#define OBJECT_INFO_LOOKUP_REPLACE 1
@@ -455,6 +463,12 @@
* Visit objects within a pack in packfile order rather than .idx order
*/
FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
+
+ /* Only iterate over packs that are not marked as kept in-core. */
+ FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
+
+ /* Only iterate over packs that do not have .keep files. */
+ FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
};
/*
diff --git a/object.c b/object.c
index 4e85955..23a24e6 100644
--- a/object.c
+++ b/object.c
@@ -279,7 +279,7 @@
if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
(!obj && repo_has_object_file(r, oid) &&
oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
- if (check_object_signature(r, repl, NULL, 0, NULL) < 0) {
+ if (check_object_signature(r, repl, NULL, 0, NULL, NULL) < 0) {
error(_("hash mismatch %s"), oid_to_hex(oid));
return NULL;
}
@@ -290,7 +290,7 @@
buffer = repo_read_object_file(r, oid, &type, &size);
if (buffer) {
if (check_object_signature(r, repl, buffer, size,
- type_name(type)) < 0) {
+ type_name(type), NULL) < 0) {
free(buffer);
error(_("hash mismatch %s"), oid_to_hex(repl));
return NULL;
diff --git a/object.h b/object.h
index 3b38c9c..cb556ab 100644
--- a/object.h
+++ b/object.h
@@ -55,7 +55,7 @@
} *objects;
};
-#define OBJECT_ARRAY_INIT { 0, 0, NULL }
+#define OBJECT_ARRAY_INIT { 0 }
/*
* object flag allocation:
@@ -75,7 +75,6 @@
* builtin/fsck.c: 0--3
* builtin/gc.c: 0
* builtin/index-pack.c: 2021
- * builtin/pack-objects.c: 20
* builtin/reflog.c: 10--12
* builtin/show-branch.c: 0-------------------------------------------26
* builtin/unpack-objects.c: 2021
diff --git a/oid-array.h b/oid-array.h
index 72bca78..f60f9af 100644
--- a/oid-array.h
+++ b/oid-array.h
@@ -56,7 +56,7 @@
int sorted;
};
-#define OID_ARRAY_INIT { NULL, 0, 0, 0 }
+#define OID_ARRAY_INIT { 0 }
/**
* Add an item to the set. The object ID will be placed at the end of the array
diff --git a/oidset.c b/oidset.c
index 5aac633..b36a2ba 100644
--- a/oidset.c
+++ b/oidset.c
@@ -36,11 +36,6 @@
oidset_init(set, 0);
}
-int oidset_size(struct oidset *set)
-{
- return kh_size(&set->set);
-}
-
void oidset_parse_file(struct oidset *set, const char *path)
{
oidset_parse_file_carefully(set, path, NULL, NULL);
diff --git a/oidset.h b/oidset.h
index 01f6560..ba4a5a2 100644
--- a/oidset.h
+++ b/oidset.h
@@ -57,7 +57,10 @@
/**
* Returns the number of oids in the set.
*/
-int oidset_size(struct oidset *set);
+static inline int oidset_size(const struct oidset *set)
+{
+ return kh_size(&set->set);
+}
/**
* Remove all entries from the oidset, freeing any resources associated with
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 88d9e69..9c55c15 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -48,7 +48,7 @@
}
/**
- * Build the initial type index for the packfile
+ * Build the initial type index for the packfile or multi-pack-index
*/
void bitmap_writer_build_type_index(struct packing_data *to_pack,
struct pack_idx_entry **index,
@@ -125,15 +125,20 @@
writer.selected_nr++;
}
-static uint32_t find_object_pos(const struct object_id *oid)
+static uint32_t find_object_pos(const struct object_id *oid, int *found)
{
struct object_entry *entry = packlist_find(writer.to_pack, oid);
if (!entry) {
- die("Failed to write bitmap index. Packfile doesn't have full closure "
+ if (found)
+ *found = 0;
+ warning("Failed to write bitmap index. Packfile doesn't have full closure "
"(object %s is missing)", oid_to_hex(oid));
+ return 0;
}
+ if (found)
+ *found = 1;
return oe_in_pack_pos(writer.to_pack, entry);
}
@@ -331,9 +336,10 @@
bb->commits_nr = bb->commits_alloc = 0;
}
-static void fill_bitmap_tree(struct bitmap *bitmap,
- struct tree *tree)
+static int fill_bitmap_tree(struct bitmap *bitmap,
+ struct tree *tree)
{
+ int found;
uint32_t pos;
struct tree_desc desc;
struct name_entry entry;
@@ -342,9 +348,11 @@
* If our bit is already set, then there is nothing to do. Both this
* tree and all of its children will be set.
*/
- pos = find_object_pos(&tree->object.oid);
+ pos = find_object_pos(&tree->object.oid, &found);
+ if (!found)
+ return -1;
if (bitmap_get(bitmap, pos))
- return;
+ return 0;
bitmap_set(bitmap, pos);
if (parse_tree(tree) < 0)
@@ -355,11 +363,15 @@
while (tree_entry(&desc, &entry)) {
switch (object_type(entry.mode)) {
case OBJ_TREE:
- fill_bitmap_tree(bitmap,
- lookup_tree(the_repository, &entry.oid));
+ if (fill_bitmap_tree(bitmap,
+ lookup_tree(the_repository, &entry.oid)) < 0)
+ return -1;
break;
case OBJ_BLOB:
- bitmap_set(bitmap, find_object_pos(&entry.oid));
+ pos = find_object_pos(&entry.oid, &found);
+ if (!found)
+ return -1;
+ bitmap_set(bitmap, pos);
break;
default:
/* Gitlink, etc; not reachable */
@@ -368,15 +380,18 @@
}
free_tree_buffer(tree);
+ return 0;
}
-static void fill_bitmap_commit(struct bb_commit *ent,
- struct commit *commit,
- struct prio_queue *queue,
- struct prio_queue *tree_queue,
- struct bitmap_index *old_bitmap,
- const uint32_t *mapping)
+static int fill_bitmap_commit(struct bb_commit *ent,
+ struct commit *commit,
+ struct prio_queue *queue,
+ struct prio_queue *tree_queue,
+ struct bitmap_index *old_bitmap,
+ const uint32_t *mapping)
{
+ int found;
+ uint32_t pos;
if (!ent->bitmap)
ent->bitmap = bitmap_new();
@@ -401,11 +416,16 @@
* Mark ourselves and queue our tree. The commit
* walk ensures we cover all parents.
*/
- bitmap_set(ent->bitmap, find_object_pos(&c->object.oid));
+ pos = find_object_pos(&c->object.oid, &found);
+ if (!found)
+ return -1;
+ bitmap_set(ent->bitmap, pos);
prio_queue_put(tree_queue, get_commit_tree(c));
for (p = c->parents; p; p = p->next) {
- int pos = find_object_pos(&p->item->object.oid);
+ pos = find_object_pos(&p->item->object.oid, &found);
+ if (!found)
+ return -1;
if (!bitmap_get(ent->bitmap, pos)) {
bitmap_set(ent->bitmap, pos);
prio_queue_put(queue, p->item);
@@ -413,8 +433,12 @@
}
}
- while (tree_queue->nr)
- fill_bitmap_tree(ent->bitmap, prio_queue_get(tree_queue));
+ while (tree_queue->nr) {
+ if (fill_bitmap_tree(ent->bitmap,
+ prio_queue_get(tree_queue)) < 0)
+ return -1;
+ }
+ return 0;
}
static void store_selected(struct bb_commit *ent, struct commit *commit)
@@ -432,7 +456,7 @@
kh_value(writer.bitmaps, hash_pos) = stored;
}
-void bitmap_writer_build(struct packing_data *to_pack)
+int bitmap_writer_build(struct packing_data *to_pack)
{
struct bitmap_builder bb;
size_t i;
@@ -441,6 +465,7 @@
struct prio_queue tree_queue = { NULL };
struct bitmap_index *old_bitmap;
uint32_t *mapping;
+ int closed = 1; /* until proven otherwise */
writer.bitmaps = kh_init_oid_map();
writer.to_pack = to_pack;
@@ -463,8 +488,11 @@
struct commit *child;
int reused = 0;
- fill_bitmap_commit(ent, commit, &queue, &tree_queue,
- old_bitmap, mapping);
+ if (fill_bitmap_commit(ent, commit, &queue, &tree_queue,
+ old_bitmap, mapping) < 0) {
+ closed = 0;
+ break;
+ }
if (ent->selected) {
store_selected(ent, commit);
@@ -492,6 +520,7 @@
clear_prio_queue(&queue);
clear_prio_queue(&tree_queue);
bitmap_builder_clear(&bb);
+ free_bitmap_index(old_bitmap);
free(mapping);
trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",
@@ -499,7 +528,9 @@
stop_progress(&writer.progress);
- compute_xor_offsets();
+ if (closed)
+ compute_xor_offsets();
+ return closed ? 0 : -1;
}
/**
diff --git a/pack-bitmap.c b/pack-bitmap.c
index d999616..f47a0a7 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -13,6 +13,7 @@
#include "repository.h"
#include "object-store.h"
#include "list-objects-filter-options.h"
+#include "midx.h"
#include "config.h"
/*
@@ -35,8 +36,15 @@
* the active bitmap index is the largest one.
*/
struct bitmap_index {
- /* Packfile to which this bitmap index belongs to */
+ /*
+ * The pack or multi-pack index (MIDX) that this bitmap index belongs
+ * to.
+ *
+ * Exactly one of these must be non-NULL; this specifies the object
+ * order used to interpret this bitmap.
+ */
struct packed_git *pack;
+ struct multi_pack_index *midx;
/*
* Mark the first `reuse_objects` in the packfile as reused:
@@ -71,6 +79,9 @@
/* If not NULL, this is a name-hash cache pointing into map. */
uint32_t *hashes;
+ /* The checksum of the packfile or MIDX; points into map. */
+ const unsigned char *checksum;
+
/*
* Extended index.
*
@@ -136,6 +147,13 @@
return b;
}
+static uint32_t bitmap_num_objects(struct bitmap_index *index)
+{
+ if (index->midx)
+ return index->midx->num_objects;
+ return index->pack->num_objects;
+}
+
static int load_bitmap_header(struct bitmap_index *index)
{
struct bitmap_disk_header *header = (void *)index->map;
@@ -154,7 +172,7 @@
/* Parse known bitmap format options */
{
uint32_t flags = ntohs(header->options);
- size_t cache_size = st_mult(index->pack->num_objects, sizeof(uint32_t));
+ size_t cache_size = st_mult(bitmap_num_objects(index), sizeof(uint32_t));
unsigned char *index_end = index->map + index->map_size - the_hash_algo->rawsz;
if ((flags & BITMAP_OPT_FULL_DAG) == 0)
@@ -170,6 +188,7 @@
}
index->entry_count = ntohl(header->entry_count);
+ index->checksum = header->checksum;
index->map_pos += header_size;
return 0;
}
@@ -218,6 +237,15 @@
#define MAX_XOR_OFFSET 160
+static int nth_bitmap_object_oid(struct bitmap_index *index,
+ struct object_id *oid,
+ uint32_t n)
+{
+ if (index->midx)
+ return nth_midxed_object_oid(oid, index->midx, n) ? 0 : -1;
+ return nth_packed_object_id(oid, index->pack, n);
+}
+
static int load_bitmap_entries_v1(struct bitmap_index *index)
{
uint32_t i;
@@ -237,7 +265,7 @@
xor_offset = read_u8(index->map, &index->map_pos);
flags = read_u8(index->map, &index->map_pos);
- if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0)
+ if (nth_bitmap_object_oid(index, &oid, commit_idx_pos) < 0)
return error("corrupt ewah bitmap: commit index %u out of range",
(unsigned)commit_idx_pos);
@@ -262,7 +290,14 @@
return 0;
}
-static char *pack_bitmap_filename(struct packed_git *p)
+char *midx_bitmap_filename(struct multi_pack_index *midx)
+{
+ return xstrfmt("%s-%s.bitmap",
+ get_midx_filename(midx->object_dir),
+ hash_to_hex(get_midx_checksum(midx)));
+}
+
+char *pack_bitmap_filename(struct packed_git *p)
{
size_t len;
@@ -271,6 +306,57 @@
return xstrfmt("%.*s.bitmap", (int)len, p->pack_name);
}
+static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
+ struct multi_pack_index *midx)
+{
+ struct stat st;
+ char *idx_name = midx_bitmap_filename(midx);
+ int fd = git_open(idx_name);
+
+ free(idx_name);
+
+ if (fd < 0)
+ return -1;
+
+ if (fstat(fd, &st)) {
+ close(fd);
+ return -1;
+ }
+
+ if (bitmap_git->pack || bitmap_git->midx) {
+ /* ignore extra bitmap file; we can only handle one */
+ warning("ignoring extra bitmap file: %s",
+ get_midx_filename(midx->object_dir));
+ close(fd);
+ return -1;
+ }
+
+ bitmap_git->midx = midx;
+ bitmap_git->map_size = xsize_t(st.st_size);
+ bitmap_git->map_pos = 0;
+ bitmap_git->map = xmmap(NULL, bitmap_git->map_size, PROT_READ,
+ MAP_PRIVATE, fd, 0);
+ close(fd);
+
+ if (load_bitmap_header(bitmap_git) < 0)
+ goto cleanup;
+
+ if (!hasheq(get_midx_checksum(bitmap_git->midx), bitmap_git->checksum))
+ goto cleanup;
+
+ if (load_midx_revindex(bitmap_git->midx) < 0) {
+ warning(_("multi-pack bitmap is missing required reverse index"));
+ goto cleanup;
+ }
+ return 0;
+
+cleanup:
+ munmap(bitmap_git->map, bitmap_git->map_size);
+ bitmap_git->map_size = 0;
+ bitmap_git->map = NULL;
+ return -1;
+}
+
static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git *packfile)
{
int fd;
@@ -292,7 +378,8 @@
return -1;
}
- if (bitmap_git->pack) {
+ if (bitmap_git->pack || bitmap_git->midx) {
+ /* ignore extra bitmap file; we can only handle one */
warning("ignoring extra bitmap file: %s", packfile->pack_name);
close(fd);
return -1;
@@ -319,13 +406,39 @@
return 0;
}
-static int load_pack_bitmap(struct bitmap_index *bitmap_git)
+static int load_reverse_index(struct bitmap_index *bitmap_git)
+{
+ if (bitmap_is_midx(bitmap_git)) {
+ uint32_t i;
+ int ret;
+
+ /*
+ * The multi-pack-index's .rev file is already loaded via
+ * open_pack_bitmap_1().
+ *
+ * But we still need to open the individual pack .rev files,
+ * since we will need to make use of them in pack-objects.
+ */
+ for (i = 0; i < bitmap_git->midx->num_packs; i++) {
+ if (prepare_midx_pack(the_repository, bitmap_git->midx, i))
+ die(_("load_reverse_index: could not open pack"));
+ ret = load_pack_revindex(bitmap_git->midx->packs[i]);
+ if (ret)
+ return ret;
+ }
+ return 0;
+ }
+ return load_pack_revindex(bitmap_git->pack);
+}
+
+static int load_bitmap(struct bitmap_index *bitmap_git)
{
assert(bitmap_git->map);
bitmap_git->bitmaps = kh_init_oid_map();
bitmap_git->ext_index.positions = kh_init_oid_pos();
- if (load_pack_revindex(bitmap_git->pack))
+
+ if (load_reverse_index(bitmap_git))
goto failed;
if (!(bitmap_git->commits = read_bitmap_1(bitmap_git)) ||
@@ -369,11 +482,46 @@
return ret;
}
+static int open_midx_bitmap(struct repository *r,
+ struct bitmap_index *bitmap_git)
+{
+ struct multi_pack_index *midx;
+
+ assert(!bitmap_git->map);
+
+ for (midx = get_multi_pack_index(r); midx; midx = midx->next) {
+ if (!open_midx_bitmap_1(bitmap_git, midx))
+ return 0;
+ }
+ return -1;
+}
+
+static int open_bitmap(struct repository *r,
+ struct bitmap_index *bitmap_git)
+{
+ assert(!bitmap_git->map);
+
+ if (!open_midx_bitmap(r, bitmap_git))
+ return 0;
+ return open_pack_bitmap(r, bitmap_git);
+}
+
struct bitmap_index *prepare_bitmap_git(struct repository *r)
{
struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
- if (!open_pack_bitmap(r, bitmap_git) && !load_pack_bitmap(bitmap_git))
+ if (!open_bitmap(r, bitmap_git) && !load_bitmap(bitmap_git))
+ return bitmap_git;
+
+ free_bitmap_index(bitmap_git);
+ return NULL;
+}
+
+struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx)
+{
+ struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
+
+ if (!open_midx_bitmap_1(bitmap_git, midx) && !load_bitmap(bitmap_git))
return bitmap_git;
free_bitmap_index(bitmap_git);
@@ -404,7 +552,7 @@
if (pos < kh_end(positions)) {
int bitmap_pos = kh_value(positions, pos);
- return bitmap_pos + bitmap_git->pack->num_objects;
+ return bitmap_pos + bitmap_num_objects(bitmap_git);
}
return -1;
@@ -423,10 +571,26 @@
return pos;
}
+static int bitmap_position_midx(struct bitmap_index *bitmap_git,
+ const struct object_id *oid)
+{
+ uint32_t want, got;
+ if (!bsearch_midx(oid, bitmap_git->midx, &want))
+ return -1;
+
+ if (midx_to_pack_pos(bitmap_git->midx, want, &got) < 0)
+ return -1;
+ return got;
+}
+
static int bitmap_position(struct bitmap_index *bitmap_git,
const struct object_id *oid)
{
- int pos = bitmap_position_packfile(bitmap_git, oid);
+ int pos;
+ if (bitmap_is_midx(bitmap_git))
+ pos = bitmap_position_midx(bitmap_git, oid);
+ else
+ pos = bitmap_position_packfile(bitmap_git, oid);
return (pos >= 0) ? pos : bitmap_position_extended(bitmap_git, oid);
}
@@ -456,7 +620,7 @@
bitmap_pos = kh_value(eindex->positions, hash_pos);
}
- return bitmap_pos + bitmap_git->pack->num_objects;
+ return bitmap_pos + bitmap_num_objects(bitmap_git);
}
struct bitmap_show_data {
@@ -673,7 +837,7 @@
for (i = 0; i < eindex->count; ++i) {
struct object *obj;
- if (!bitmap_get(objects, bitmap_git->pack->num_objects + i))
+ if (!bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
continue;
obj = eindex->objects[i];
@@ -737,6 +901,7 @@
continue;
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+ struct packed_git *pack;
struct object_id oid;
uint32_t hash = 0, index_pos;
off_t ofs;
@@ -746,14 +911,28 @@
offset += ewah_bit_ctz64(word >> offset);
- index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
- ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);
- nth_packed_object_id(&oid, bitmap_git->pack, index_pos);
+ if (bitmap_is_midx(bitmap_git)) {
+ struct multi_pack_index *m = bitmap_git->midx;
+ uint32_t pack_id;
+
+ index_pos = pack_pos_to_midx(m, pos + offset);
+ ofs = nth_midxed_offset(m, index_pos);
+ nth_midxed_object_oid(&oid, m, index_pos);
+
+ pack_id = nth_midxed_pack_int_id(m, index_pos);
+ pack = bitmap_git->midx->packs[pack_id];
+ } else {
+ index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
+ ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);
+ nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
+
+ pack = bitmap_git->pack;
+ }
if (bitmap_git->hashes)
hash = get_be32(bitmap_git->hashes + index_pos);
- show_reach(&oid, object_type, 0, hash, bitmap_git->pack, ofs);
+ show_reach(&oid, object_type, 0, hash, pack, ofs);
}
}
}
@@ -765,8 +944,13 @@
struct object *object = roots->item;
roots = roots->next;
- if (find_pack_entry_one(object->oid.hash, bitmap_git->pack) > 0)
- return 1;
+ if (bitmap_is_midx(bitmap_git)) {
+ if (bsearch_midx(&object->oid, bitmap_git->midx, NULL))
+ return 1;
+ } else {
+ if (find_pack_entry_one(object->oid.hash, bitmap_git->pack) > 0)
+ return 1;
+ }
}
return 0;
@@ -832,7 +1016,7 @@
* them individually.
*/
for (i = 0; i < eindex->count; i++) {
- uint32_t pos = i + bitmap_git->pack->num_objects;
+ uint32_t pos = i + bitmap_num_objects(bitmap_git);
if (eindex->objects[i]->type == type &&
bitmap_get(to_filter, pos) &&
!bitmap_get(tips, pos))
@@ -853,23 +1037,35 @@
static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
uint32_t pos)
{
- struct packed_git *pack = bitmap_git->pack;
unsigned long size;
struct object_info oi = OBJECT_INFO_INIT;
oi.sizep = &size;
- if (pos < pack->num_objects) {
- off_t ofs = pack_pos_to_offset(pack, pos);
+ if (pos < bitmap_num_objects(bitmap_git)) {
+ struct packed_git *pack;
+ off_t ofs;
+
+ if (bitmap_is_midx(bitmap_git)) {
+ uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, pos);
+ uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos);
+
+ pack = bitmap_git->midx->packs[pack_id];
+ ofs = nth_midxed_offset(bitmap_git->midx, midx_pos);
+ } else {
+ pack = bitmap_git->pack;
+ ofs = pack_pos_to_offset(pack, pos);
+ }
+
if (packed_object_info(the_repository, pack, ofs, &oi) < 0) {
struct object_id oid;
- nth_packed_object_id(&oid, pack,
- pack_pos_to_index(pack, pos));
+ nth_bitmap_object_oid(bitmap_git, &oid,
+ pack_pos_to_index(pack, pos));
die(_("unable to get size of %s"), oid_to_hex(&oid));
}
} else {
struct eindex *eindex = &bitmap_git->ext_index;
- struct object *obj = eindex->objects[pos - pack->num_objects];
+ struct object *obj = eindex->objects[pos - bitmap_num_objects(bitmap_git)];
if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
}
@@ -911,7 +1107,7 @@
}
for (i = 0; i < eindex->count; i++) {
- uint32_t pos = i + bitmap_git->pack->num_objects;
+ uint32_t pos = i + bitmap_num_objects(bitmap_git);
if (eindex->objects[i]->type == OBJ_BLOB &&
bitmap_get(to_filter, pos) &&
!bitmap_get(tips, pos) &&
@@ -1041,7 +1237,7 @@
/* try to open a bitmapped pack, but don't parse it yet
* because we may not need to use it */
CALLOC_ARRAY(bitmap_git, 1);
- if (open_pack_bitmap(revs->repo, bitmap_git) < 0)
+ if (open_bitmap(revs->repo, bitmap_git) < 0)
goto cleanup;
for (i = 0; i < revs->pending.nr; ++i) {
@@ -1085,7 +1281,7 @@
* from disk. this is the point of no return; after this the rev_list
* becomes invalidated and we must perform the revwalk through bitmaps
*/
- if (load_pack_bitmap(bitmap_git) < 0)
+ if (load_bitmap(bitmap_git) < 0)
goto cleanup;
object_array_clear(&revs->pending);
@@ -1128,22 +1324,49 @@
return NULL;
}
-static void try_partial_reuse(struct bitmap_index *bitmap_git,
- size_t pos,
- struct bitmap *reuse,
- struct pack_window **w_curs)
+/*
+ * -1 means "stop trying further objects"; 0 means we may or may not have
+ * reused, but you can keep feeding bits.
+ */
+static int try_partial_reuse(struct packed_git *pack,
+ size_t pos,
+ struct bitmap *reuse,
+ struct pack_window **w_curs)
{
- off_t offset, header;
+ off_t offset, delta_obj_offset;
enum object_type type;
unsigned long size;
- if (pos >= bitmap_git->pack->num_objects)
- return; /* not actually in the pack */
+ /*
+ * try_partial_reuse() is called either on (a) objects in the
+ * bitmapped pack (in the case of a single-pack bitmap) or (b)
+ * objects in the preferred pack of a multi-pack bitmap.
+ * Importantly, the latter can pretend as if only a single pack
+ * exists because:
+ *
+ * - The first pack->num_objects bits of a MIDX bitmap are
+ * reserved for the preferred pack, and
+ *
+ * - Ties due to duplicate objects are always resolved in
+ * favor of the preferred pack.
+ *
+ * Therefore we do not need to ever ask the MIDX for its copy of
+ * an object by OID, since it will always select it from the
+ * preferred pack. Likewise, the selected copy of the base
+ * object for any deltas will reside in the same pack.
+ *
+ * This means that we can reuse pos when looking up the bit in
+ * the reuse bitmap, too, since bits corresponding to the
+ * preferred pack precede all bits from other packs.
+ */
- offset = header = pack_pos_to_offset(bitmap_git->pack, pos);
- type = unpack_object_header(bitmap_git->pack, w_curs, &offset, &size);
+ if (pos >= pack->num_objects)
+ return -1; /* not actually in the pack or MIDX preferred pack */
+
+ offset = delta_obj_offset = pack_pos_to_offset(pack, pos);
+ type = unpack_object_header(pack, w_curs, &offset, &size);
if (type < 0)
- return; /* broken packfile, punt */
+ return -1; /* broken packfile, punt */
if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) {
off_t base_offset;
@@ -1157,12 +1380,12 @@
* and the normal slow path will complain about it in
* more detail.
*/
- base_offset = get_delta_base(bitmap_git->pack, w_curs,
- &offset, type, header);
+ base_offset = get_delta_base(pack, w_curs, &offset, type,
+ delta_obj_offset);
if (!base_offset)
- return;
- if (offset_to_pack_pos(bitmap_git->pack, base_offset, &base_pos) < 0)
- return;
+ return 0;
+ if (offset_to_pack_pos(pack, base_offset, &base_pos) < 0)
+ return 0;
/*
* We assume delta dependencies always point backwards. This
@@ -1174,7 +1397,7 @@
* odd parameters.
*/
if (base_pos >= pos)
- return;
+ return 0;
/*
* And finally, if we're not sending the base as part of our
@@ -1185,13 +1408,22 @@
* object_entry code path handle it.
*/
if (!bitmap_get(reuse, base_pos))
- return;
+ return 0;
}
/*
* If we got here, then the object is OK to reuse. Mark it.
*/
bitmap_set(reuse, pos);
+ return 0;
+}
+
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git)
+{
+ struct multi_pack_index *m = bitmap_git->midx;
+ if (!m)
+ BUG("midx_preferred_pack: requires non-empty MIDX");
+ return nth_midxed_pack_int_id(m, pack_pos_to_midx(bitmap_git->midx, 0));
}
int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
@@ -1199,20 +1431,37 @@
uint32_t *entries,
struct bitmap **reuse_out)
{
+ struct packed_git *pack;
struct bitmap *result = bitmap_git->result;
struct bitmap *reuse;
struct pack_window *w_curs = NULL;
size_t i = 0;
uint32_t offset;
+ uint32_t objects_nr;
assert(result);
+ load_reverse_index(bitmap_git);
+
+ if (bitmap_is_midx(bitmap_git))
+ pack = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)];
+ else
+ pack = bitmap_git->pack;
+ objects_nr = pack->num_objects;
+
while (i < result->word_alloc && result->words[i] == (eword_t)~0)
i++;
- /* Don't mark objects not in the packfile */
- if (i > bitmap_git->pack->num_objects / BITS_IN_EWORD)
- i = bitmap_git->pack->num_objects / BITS_IN_EWORD;
+ /*
+ * Don't mark objects not in the packfile or preferred pack. This bitmap
+ * marks objects eligible for reuse, but the pack-reuse code only
+ * understands how to reuse a single pack. Since the preferred pack is
+ * guaranteed to have all bases for its deltas (in a multi-pack bitmap),
+ * we use it instead of another pack. In single-pack bitmaps, the choice
+ * is made for us.
+ */
+ if (i > objects_nr / BITS_IN_EWORD)
+ i = objects_nr / BITS_IN_EWORD;
reuse = bitmap_word_alloc(i);
memset(reuse->words, 0xFF, i * sizeof(eword_t));
@@ -1226,10 +1475,23 @@
break;
offset += ewah_bit_ctz64(word >> offset);
- try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs);
+ if (try_partial_reuse(pack, pos + offset,
+ reuse, &w_curs) < 0) {
+ /*
+ * try_partial_reuse indicated we couldn't reuse
+ * any bits, so there is no point in trying more
+ * bits in the current word, or any other words
+ * in result.
+ *
+ * Jump out of both loops to avoid future
+ * unnecessary calls to try_partial_reuse.
+ */
+ goto done;
+ }
}
}
+done:
unuse_pack(&w_curs);
*entries = bitmap_popcount(reuse);
@@ -1243,7 +1505,7 @@
* need to be handled separately.
*/
bitmap_and_not(result, reuse);
- *packfile_out = bitmap_git->pack;
+ *packfile_out = pack;
*reuse_out = reuse;
return 0;
}
@@ -1296,7 +1558,7 @@
for (i = 0; i < eindex->count; ++i) {
if (eindex->objects[i]->type == type &&
- bitmap_get(objects, bitmap_git->pack->num_objects + i))
+ bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
count++;
}
@@ -1325,10 +1587,52 @@
struct bitmap_test_data {
struct bitmap_index *bitmap_git;
struct bitmap *base;
+ struct bitmap *commits;
+ struct bitmap *trees;
+ struct bitmap *blobs;
+ struct bitmap *tags;
struct progress *prg;
size_t seen;
};
+static void test_bitmap_type(struct bitmap_test_data *tdata,
+ struct object *obj, int pos)
+{
+ enum object_type bitmap_type = OBJ_NONE;
+ int bitmaps_nr = 0;
+
+ if (bitmap_get(tdata->commits, pos)) {
+ bitmap_type = OBJ_COMMIT;
+ bitmaps_nr++;
+ }
+ if (bitmap_get(tdata->trees, pos)) {
+ bitmap_type = OBJ_TREE;
+ bitmaps_nr++;
+ }
+ if (bitmap_get(tdata->blobs, pos)) {
+ bitmap_type = OBJ_BLOB;
+ bitmaps_nr++;
+ }
+ if (bitmap_get(tdata->tags, pos)) {
+ bitmap_type = OBJ_TAG;
+ bitmaps_nr++;
+ }
+
+ if (bitmap_type == OBJ_NONE)
+ die("object %s not found in type bitmaps",
+ oid_to_hex(&obj->oid));
+
+ if (bitmaps_nr > 1)
+ die("object %s does not have a unique type",
+ oid_to_hex(&obj->oid));
+
+ if (bitmap_type != obj->type)
+ die("object %s: real type %s, expected: %s",
+ oid_to_hex(&obj->oid),
+ type_name(obj->type),
+ type_name(bitmap_type));
+}
+
static void test_show_object(struct object *object, const char *name,
void *data)
{
@@ -1338,6 +1642,7 @@
bitmap_pos = bitmap_position(tdata->bitmap_git, &object->oid);
if (bitmap_pos < 0)
die("Object not in bitmap: %s\n", oid_to_hex(&object->oid));
+ test_bitmap_type(tdata, object, bitmap_pos);
bitmap_set(tdata->base, bitmap_pos);
display_progress(tdata->prg, ++tdata->seen);
@@ -1352,6 +1657,7 @@
&commit->object.oid);
if (bitmap_pos < 0)
die("Object not in bitmap: %s\n", oid_to_hex(&commit->object.oid));
+ test_bitmap_type(tdata, &commit->object, bitmap_pos);
bitmap_set(tdata->base, bitmap_pos);
display_progress(tdata->prg, ++tdata->seen);
@@ -1399,6 +1705,10 @@
tdata.bitmap_git = bitmap_git;
tdata.base = bitmap_new();
+ tdata.commits = ewah_to_bitmap(bitmap_git->commits);
+ tdata.trees = ewah_to_bitmap(bitmap_git->trees);
+ tdata.blobs = ewah_to_bitmap(bitmap_git->blobs);
+ tdata.tags = ewah_to_bitmap(bitmap_git->tags);
tdata.prg = start_progress("Verifying bitmap entries", result_popcnt);
tdata.seen = 0;
@@ -1432,6 +1742,33 @@
return 0;
}
+int test_bitmap_hashes(struct repository *r)
+{
+ struct bitmap_index *bitmap_git = prepare_bitmap_git(r);
+ struct object_id oid;
+ uint32_t i, index_pos;
+
+ if (!bitmap_git->hashes)
+ goto cleanup;
+
+ for (i = 0; i < bitmap_num_objects(bitmap_git); i++) {
+ if (bitmap_is_midx(bitmap_git))
+ index_pos = pack_pos_to_midx(bitmap_git->midx, i);
+ else
+ index_pos = pack_pos_to_index(bitmap_git->pack, i);
+
+ nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
+
+ printf("%s %"PRIu32"\n",
+ oid_to_hex(&oid), get_be32(bitmap_git->hashes + index_pos));
+ }
+
+cleanup:
+ free_bitmap_index(bitmap_git);
+
+ return 0;
+}
+
int rebuild_bitmap(const uint32_t *reposition,
struct ewah_bitmap *source,
struct bitmap *dest)
@@ -1469,19 +1806,32 @@
uint32_t i, num_objects;
uint32_t *reposition;
- num_objects = bitmap_git->pack->num_objects;
+ if (!bitmap_is_midx(bitmap_git))
+ load_reverse_index(bitmap_git);
+ else if (load_midx_revindex(bitmap_git->midx) < 0)
+ BUG("rebuild_existing_bitmaps: missing required rev-cache "
+ "extension");
+
+ num_objects = bitmap_num_objects(bitmap_git);
CALLOC_ARRAY(reposition, num_objects);
for (i = 0; i < num_objects; ++i) {
struct object_id oid;
struct object_entry *oe;
+ uint32_t index_pos;
- nth_packed_object_id(&oid, bitmap_git->pack,
- pack_pos_to_index(bitmap_git->pack, i));
+ if (bitmap_is_midx(bitmap_git))
+ index_pos = pack_pos_to_midx(bitmap_git->midx, i);
+ else
+ index_pos = pack_pos_to_index(bitmap_git->pack, i);
+ nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
oe = packlist_find(mapping, &oid);
- if (oe)
+ if (oe) {
reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
+ if (bitmap_git->hashes && !oe->hash)
+ oe->hash = get_be32(bitmap_git->hashes + index_pos);
+ }
}
return reposition;
@@ -1503,6 +1853,19 @@
free(b->ext_index.hashes);
bitmap_free(b->result);
bitmap_free(b->haves);
+ if (bitmap_is_midx(b)) {
+ /*
+ * Multi-pack bitmaps need to have resources associated with
+ * their on-disk reverse indexes unmapped so that stale .rev and
+ * .bitmap files can be removed.
+ *
+ * Unlike pack-based bitmaps, multi-pack bitmaps can be read and
+ * written in the same 'git multi-pack-index write --bitmap'
+ * process. Close resources so they can be removed safely on
+ * platforms like Windows.
+ */
+ close_midx_revindex(b->midx);
+ }
free(b);
}
@@ -1517,7 +1880,6 @@
enum object_type object_type)
{
struct bitmap *result = bitmap_git->result;
- struct packed_git *pack = bitmap_git->pack;
off_t total = 0;
struct ewah_iterator it;
eword_t filter;
@@ -1534,15 +1896,35 @@
continue;
for (offset = 0; offset < BITS_IN_EWORD; offset++) {
- size_t pos;
-
if ((word >> offset) == 0)
break;
offset += ewah_bit_ctz64(word >> offset);
- pos = base + offset;
- total += pack_pos_to_offset(pack, pos + 1) -
- pack_pos_to_offset(pack, pos);
+
+ if (bitmap_is_midx(bitmap_git)) {
+ uint32_t pack_pos;
+ uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, base + offset);
+ off_t offset = nth_midxed_offset(bitmap_git->midx, midx_pos);
+
+ uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos);
+ struct packed_git *pack = bitmap_git->midx->packs[pack_id];
+
+ if (offset_to_pack_pos(pack, offset, &pack_pos) < 0) {
+ struct object_id oid;
+ nth_midxed_object_oid(&oid, bitmap_git->midx, midx_pos);
+
+ die(_("could not find %s in pack %s at offset %"PRIuMAX),
+ oid_to_hex(&oid),
+ pack->pack_name,
+ (uintmax_t)offset);
+ }
+
+ total += pack_pos_to_offset(pack, pack_pos + 1) - offset;
+ } else {
+ size_t pos = base + offset;
+ total += pack_pos_to_offset(bitmap_git->pack, pos + 1) -
+ pack_pos_to_offset(bitmap_git->pack, pos);
+ }
}
}
@@ -1552,7 +1934,6 @@
static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
{
struct bitmap *result = bitmap_git->result;
- struct packed_git *pack = bitmap_git->pack;
struct eindex *eindex = &bitmap_git->ext_index;
off_t total = 0;
struct object_info oi = OBJECT_INFO_INIT;
@@ -1564,7 +1945,7 @@
for (i = 0; i < eindex->count; i++) {
struct object *obj = eindex->objects[i];
- if (!bitmap_get(result, pack->num_objects + i))
+ if (!bitmap_get(result, bitmap_num_objects(bitmap_git) + i))
continue;
if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
@@ -1594,7 +1975,28 @@
return total;
}
+int bitmap_is_midx(struct bitmap_index *bitmap_git)
+{
+ return !!bitmap_git->midx;
+}
+
const struct string_list *bitmap_preferred_tips(struct repository *r)
{
return repo_config_get_value_multi(r, "pack.preferbitmaptips");
}
+
+int bitmap_is_preferred_refname(struct repository *r, const char *refname)
+{
+ const struct string_list *preferred_tips = bitmap_preferred_tips(r);
+ struct string_list_item *item;
+
+ if (!preferred_tips)
+ return 0;
+
+ for_each_string_list_item(item, preferred_tips) {
+ if (starts_with(refname, item->string))
+ return 1;
+ }
+
+ return 0;
+}
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 99d733e..19a63fa 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -44,6 +44,7 @@
struct bitmap_index;
struct bitmap_index *prepare_bitmap_git(struct repository *r);
+struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx);
void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits,
uint32_t *trees, uint32_t *blobs, uint32_t *tags);
void traverse_bitmap_commit_list(struct bitmap_index *,
@@ -51,9 +52,11 @@
show_reachable_fn show_reachable);
void test_bitmap_walk(struct rev_info *revs);
int test_bitmap_commits(struct repository *r);
+int test_bitmap_hashes(struct repository *r);
struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
struct list_objects_filter_options *filter,
int filter_provided_objects);
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git);
int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
struct packed_git **packfile,
uint32_t *entries,
@@ -87,12 +90,17 @@
struct commit *commit);
void bitmap_writer_select_commits(struct commit **indexed_commits,
unsigned int indexed_commits_nr, int max_bitmaps);
-void bitmap_writer_build(struct packing_data *to_pack);
+int bitmap_writer_build(struct packing_data *to_pack);
void bitmap_writer_finish(struct pack_idx_entry **index,
uint32_t index_nr,
const char *filename,
uint16_t options);
+char *midx_bitmap_filename(struct multi_pack_index *midx);
+char *pack_bitmap_filename(struct packed_git *p);
+
+int bitmap_is_midx(struct bitmap_index *bitmap_git);
const struct string_list *bitmap_preferred_tips(struct repository *r);
+int bitmap_is_preferred_refname(struct repository *r, const char *refname);
#endif
diff --git a/pack-check.c b/pack-check.c
index c8e560d..3f418e3 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -142,7 +142,8 @@
err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
oid_to_hex(&oid), p->pack_name,
(uintmax_t)entries[i].offset);
- else if (check_object_signature(r, &oid, data, size, type_name(type)))
+ else if (check_object_signature(r, &oid, data, size,
+ type_name(type), NULL))
err = error("packed %s from %s is corrupt",
oid_to_hex(&oid), p->pack_name);
else if (fn) {
diff --git a/packfile.c b/packfile.c
index 9ef6d98..89402cf 100644
--- a/packfile.c
+++ b/packfile.c
@@ -339,6 +339,7 @@
close_pack_fd(p);
close_pack_index(p);
close_pack_revindex(p);
+ oidset_clear(&p->bad_objects);
}
void close_object_store(struct raw_object_store *o)
@@ -860,7 +861,7 @@
if (!strcmp(file_name, "multi-pack-index"))
return;
if (starts_with(file_name, "multi-pack-index") &&
- ends_with(file_name, ".rev"))
+ (ends_with(file_name, ".bitmap") || ends_with(file_name, ".rev")))
return;
if (ends_with(file_name, ".idx") ||
ends_with(file_name, ".rev") ||
@@ -1161,31 +1162,19 @@
return type;
}
-void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
+void mark_bad_packed_object(struct packed_git *p, const struct object_id *oid)
{
- unsigned i;
- const unsigned hashsz = the_hash_algo->rawsz;
- for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(sha1, p->bad_object_sha1 + hashsz * i))
- return;
- p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
- st_mult(GIT_MAX_RAWSZ,
- st_add(p->num_bad_objects, 1)));
- hashcpy(p->bad_object_sha1 + hashsz * p->num_bad_objects, sha1);
- p->num_bad_objects++;
+ oidset_insert(&p->bad_objects, oid);
}
const struct packed_git *has_packed_and_bad(struct repository *r,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
struct packed_git *p;
- unsigned i;
for (p = r->objects->packed_git; p; p = p->next)
- for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(sha1,
- p->bad_object_sha1 + the_hash_algo->rawsz * i))
- return p;
+ if (oidset_contains(&p->bad_objects, oid))
+ return p;
return NULL;
}
@@ -1272,7 +1261,7 @@
if (offset_to_pack_pos(p, obj_offset, &pos) < 0)
return OBJ_BAD;
nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
- mark_bad_packed_object(p, oid.hash);
+ mark_bad_packed_object(p, &oid);
type = oid_object_info(r, &oid, NULL);
if (type <= OBJ_NONE)
return OBJ_BAD;
@@ -1722,7 +1711,7 @@
nth_packed_object_id(&oid, p, index_pos);
error("bad packed object CRC for %s",
oid_to_hex(&oid));
- mark_bad_packed_object(p, oid.hash);
+ mark_bad_packed_object(p, &oid);
data = NULL;
goto out;
}
@@ -1811,7 +1800,7 @@
" at offset %"PRIuMAX" from %s",
oid_to_hex(&base_oid), (uintmax_t)obj_offset,
p->pack_name);
- mark_bad_packed_object(p, base_oid.hash);
+ mark_bad_packed_object(p, &base_oid);
base = read_object(r, &base_oid, &type, &base_size);
external_base = base;
}
@@ -2016,13 +2005,9 @@
{
off_t offset;
- if (p->num_bad_objects) {
- unsigned i;
- for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(oid->hash,
- p->bad_object_sha1 + the_hash_algo->rawsz * i))
- return 0;
- }
+ if (oidset_size(&p->bad_objects) &&
+ oidset_contains(&p->bad_objects, oid))
+ return 0;
offset = find_pack_entry_one(oid->hash, p);
if (!offset)
@@ -2205,6 +2190,12 @@
if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
!p->pack_promisor)
continue;
+ if ((flags & FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
+ p->pack_keep_in_core)
+ continue;
+ if ((flags & FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
+ p->pack_keep)
+ continue;
if (open_pack_index(p)) {
pack_errors = 1;
continue;
diff --git a/packfile.h b/packfile.h
index 3ae117a..1861467 100644
--- a/packfile.h
+++ b/packfile.h
@@ -159,8 +159,8 @@
struct packed_git *pack,
off_t offset, struct object_info *);
-void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
-const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
+void mark_bad_packed_object(struct packed_git *, const struct object_id *);
+const struct packed_git *has_packed_and_bad(struct repository *, const struct object_id *);
#define ON_DISK_KEEP_PACKS 1
#define IN_CORE_KEEP_PACKS 2
diff --git a/parallel-checkout.c b/parallel-checkout.c
index ddc0ff3..ed9c999 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -603,8 +603,7 @@
continue;
if (pfd->revents & POLLIN) {
- int len = packet_read(pfd->fd, NULL, NULL,
- packet_buffer,
+ int len = packet_read(pfd->fd, packet_buffer,
sizeof(packet_buffer), 0);
if (len < 0) {
diff --git a/parse-options.c b/parse-options.c
index 2abff13..fc5b43f 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -8,10 +8,13 @@
static int disallow_abbreviated_options;
-#define OPT_SHORT 1
-#define OPT_UNSET 2
+enum opt_parsed {
+ OPT_LONG = 0,
+ OPT_SHORT = 1<<0,
+ OPT_UNSET = 1<<1,
+};
-int optbug(const struct option *opt, const char *reason)
+static int optbug(const struct option *opt, const char *reason)
{
if (opt->long_name) {
if (opt->short_name)
@@ -22,9 +25,26 @@
return error("BUG: switch '%c' %s", opt->short_name, reason);
}
+static const char *optname(const struct option *opt, enum opt_parsed flags)
+{
+ static struct strbuf sb = STRBUF_INIT;
+
+ strbuf_reset(&sb);
+ if (flags & OPT_SHORT)
+ strbuf_addf(&sb, "switch `%c'", opt->short_name);
+ else if (flags & OPT_UNSET)
+ strbuf_addf(&sb, "option `no-%s'", opt->long_name);
+ else if (flags == OPT_LONG)
+ strbuf_addf(&sb, "option `%s'", opt->long_name);
+ else
+ BUG("optname() got unknown flags %d", flags);
+
+ return sb.buf;
+}
+
static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
const struct option *opt,
- int flags, const char **arg)
+ enum opt_parsed flags, const char **arg)
{
if (p->opt) {
*arg = p->opt;
@@ -50,7 +70,7 @@
static enum parse_opt_result opt_command_mode_error(
const struct option *opt,
const struct option *all_opts,
- int flags)
+ enum opt_parsed flags)
{
const struct option *that;
struct strbuf that_name = STRBUF_INIT;
@@ -82,7 +102,7 @@
static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
const struct option *opt,
const struct option *all_opts,
- int flags)
+ enum opt_parsed flags)
{
const char *s, *arg;
const int unset = flags & OPT_UNSET;
@@ -298,11 +318,11 @@
const struct option *all_opts = options;
const char *arg_end = strchrnul(arg, '=');
const struct option *abbrev_option = NULL, *ambiguous_option = NULL;
- int abbrev_flags = 0, ambiguous_flags = 0;
+ enum opt_parsed abbrev_flags = OPT_LONG, ambiguous_flags = OPT_LONG;
for (; options->type != OPTION_END; options++) {
const char *rest, *long_name = options->long_name;
- int flags = 0, opt_flags = 0;
+ enum opt_parsed flags = OPT_LONG, opt_flags = OPT_LONG;
if (!long_name)
continue;
@@ -310,19 +330,6 @@
again:
if (!skip_prefix(arg, long_name, &rest))
rest = NULL;
- if (options->type == OPTION_ARGUMENT) {
- if (!rest)
- continue;
- if (*rest == '=')
- return error(_("%s takes no value"),
- optname(options, flags));
- if (*rest)
- continue;
- if (options->value)
- *(int *)options->value = options->defval;
- p->out[p->cpidx++] = arg - 2;
- return PARSE_OPT_DONE;
- }
if (!rest) {
/* abbreviated? */
if (!(p->flags & PARSE_OPT_KEEP_UNKNOWN) &&
@@ -494,7 +501,8 @@
static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags)
+ const struct option *options,
+ enum parse_opt_flags flags)
{
ctx->argc = argc;
ctx->argv = argv;
@@ -519,7 +527,8 @@
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags)
+ const struct option *options,
+ enum parse_opt_flags flags)
{
memset(ctx, 0, sizeof(*ctx));
parse_options_start_1(ctx, argc, argv, prefix, options, flags);
@@ -710,13 +719,14 @@
free(options);
}
-static int usage_with_options_internal(struct parse_opt_ctx_t *,
- const char * const *,
- const struct option *, int, int);
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *,
+ const char * const *,
+ const struct option *,
+ int, int);
-int parse_options_step(struct parse_opt_ctx_t *ctx,
- const struct option *options,
- const char * const usagestr[])
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+ const struct option *options,
+ const char * const usagestr[])
{
int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
@@ -850,9 +860,11 @@
return ctx->cpidx + ctx->argc;
}
-int parse_options(int argc, const char **argv, const char *prefix,
- const struct option *options, const char * const usagestr[],
- int flags)
+int parse_options(int argc, const char **argv,
+ const char *prefix,
+ const struct option *options,
+ const char * const usagestr[],
+ enum parse_opt_flags flags)
{
struct parse_opt_ctx_t ctx;
struct option *real_options;
@@ -874,7 +886,7 @@
case PARSE_OPT_NON_OPTION:
case PARSE_OPT_DONE:
break;
- default: /* PARSE_OPT_UNKNOWN */
+ case PARSE_OPT_UNKNOWN:
if (ctx.argv[0][1] == '-') {
error(_("unknown option `%s'"), ctx.argv[0] + 2);
} else if (isascii(*ctx.opt)) {
@@ -910,32 +922,85 @@
#define USAGE_OPTS_WIDTH 24
#define USAGE_GAP 2
-static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
- const char * const *usagestr,
- const struct option *opts, int full, int err)
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *ctx,
+ const char * const *usagestr,
+ const struct option *opts,
+ int full, int err)
{
FILE *outfile = err ? stderr : stdout;
int need_newline;
+ const char *usage_prefix = _("usage: %s");
+ /*
+ * The translation could be anything, but we can count on
+ * msgfmt(1)'s --check option to have asserted that "%s" is in
+ * the translation. So compute the length of the "usage: "
+ * part. We are assuming that the translator wasn't overly
+ * clever and used e.g. "%1$s" instead of "%s", there's only
+ * one "%s" in "usage_prefix" above, so there's no reason to
+ * do so even with a RTL language.
+ */
+ size_t usage_len = strlen(usage_prefix) - strlen("%s");
+ /*
+ * TRANSLATORS: the colon here should align with the
+ * one in "usage: %s" translation.
+ */
+ const char *or_prefix = _(" or: %s");
+ /*
+ * TRANSLATORS: You should only need to translate this format
+ * string if your language is a RTL language (e.g. Arabic,
+ * Hebrew etc.), not if it's a LTR language (e.g. German,
+ * Russian, Chinese etc.).
+ *
+ * When a translated usage string has an embedded "\n" it's
+ * because options have wrapped to the next line. The line
+ * after the "\n" will then be padded to align with the
+ * command name, such as N_("git cmd [opt]\n<8
+ * spaces>[opt2]"), where the 8 spaces are the same length as
+ * "git cmd ".
+ *
+ * This format string prints out that already-translated
+ * line. The "%*s" is whitespace padding to account for the
+ * padding at the start of the line that we add in this
+ * function. The "%s" is a line in the (hopefully already
+ * translated) N_() usage string, which contained embedded
+ * newlines before we split it up.
+ */
+ const char *usage_continued = _("%*s%s");
+ const char *prefix = usage_prefix;
+ int saw_empty_line = 0;
+
if (!usagestr)
return PARSE_OPT_HELP;
if (!err && ctx && ctx->flags & PARSE_OPT_SHELL_EVAL)
fprintf(outfile, "cat <<\\EOF\n");
- fprintf_ln(outfile, _("usage: %s"), _(*usagestr++));
- while (*usagestr && **usagestr)
- /*
- * TRANSLATORS: the colon here should align with the
- * one in "usage: %s" translation.
- */
- fprintf_ln(outfile, _(" or: %s"), _(*usagestr++));
while (*usagestr) {
- if (**usagestr)
- fprintf_ln(outfile, _(" %s"), _(*usagestr));
- else
- fputc('\n', outfile);
- usagestr++;
+ const char *str = _(*usagestr++);
+ struct string_list list = STRING_LIST_INIT_DUP;
+ unsigned int j;
+
+ if (!saw_empty_line && !*str)
+ saw_empty_line = 1;
+
+ string_list_split(&list, str, '\n', -1);
+ for (j = 0; j < list.nr; j++) {
+ const char *line = list.items[j].string;
+
+ if (saw_empty_line && *line)
+ fprintf_ln(outfile, _(" %s"), line);
+ else if (saw_empty_line)
+ fputc('\n', outfile);
+ else if (!j)
+ fprintf_ln(outfile, prefix, line);
+ else
+ fprintf_ln(outfile, usage_continued,
+ (int)usage_len, "", line);
+ }
+ string_list_clear(&list, 0);
+
+ prefix = or_prefix;
}
need_newline = 1;
@@ -1013,18 +1078,3 @@
fprintf(stderr, "fatal: %s\n\n", msg);
usage_with_options(usagestr, options);
}
-
-const char *optname(const struct option *opt, int flags)
-{
- static struct strbuf sb = STRBUF_INIT;
-
- strbuf_reset(&sb);
- if (flags & OPT_SHORT)
- strbuf_addf(&sb, "switch `%c'", opt->short_name);
- else if (flags & OPT_UNSET)
- strbuf_addf(&sb, "option `no-%s'", opt->long_name);
- else
- strbuf_addf(&sb, "option `%s'", opt->long_name);
-
- return sb.buf;
-}
diff --git a/parse-options.h b/parse-options.h
index a845a9d..275fb44 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -8,7 +8,6 @@
enum parse_opt_type {
/* special types */
OPTION_END,
- OPTION_ARGUMENT,
OPTION_GROUP,
OPTION_NUMBER,
OPTION_ALIAS,
@@ -34,6 +33,7 @@
PARSE_OPT_KEEP_UNKNOWN = 1 << 3,
PARSE_OPT_NO_INTERNAL_HELP = 1 << 4,
PARSE_OPT_ONE_SHOT = 1 << 5,
+ PARSE_OPT_SHELL_EVAL = 1 << 6,
};
enum parse_opt_option_flags {
@@ -45,7 +45,6 @@
PARSE_OPT_NODASH = 1 << 5,
PARSE_OPT_LITERAL_ARGHELP = 1 << 6,
PARSE_OPT_FROM_ALIAS = 1 << 7,
- PARSE_OPT_SHELL_EVAL = 1 << 8,
PARSE_OPT_NOCOMPLETE = 1 << 9,
PARSE_OPT_COMP_ARG = 1 << 10,
PARSE_OPT_CMDMODE = 1 << 11,
@@ -135,7 +134,7 @@
const char *argh;
const char *help;
- int flags;
+ enum parse_opt_option_flags flags;
parse_opt_cb *callback;
intptr_t defval;
parse_opt_ll_cb *ll_callback;
@@ -155,8 +154,6 @@
#define OPT_INTEGER_F(s, l, v, h, f) { OPTION_INTEGER, (s), (l), (v), N_("n"), (h), (f) }
#define OPT_END() { OPTION_END }
-#define OPT_ARGUMENT(l, v, h) { OPTION_ARGUMENT, 0, (l), (v), NULL, \
- (h), PARSE_OPT_NOARG, NULL, 1 }
#define OPT_GROUP(h) { OPTION_GROUP, 0, NULL, NULL, NULL, (h) }
#define OPT_BIT(s, l, v, h, b) OPT_BIT_F(s, l, v, h, b, 0)
#define OPT_BITOP(s, l, v, h, set, clear) { OPTION_BITOP, (s), (l), (v), NULL, (h), \
@@ -169,8 +166,10 @@
#define OPT_BOOL(s, l, v, h) OPT_BOOL_F(s, l, v, h, 0)
#define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
-#define OPT_CMDMODE(s, l, v, h, i) { OPTION_SET_INT, (s), (l), (v), NULL, \
- (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
+#define OPT_CMDMODE_F(s, l, v, h, i, f) { OPTION_SET_INT, (s), (l), (v), NULL, \
+ (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG | (f), NULL, (i) }
+#define OPT_CMDMODE(s, l, v, h, i) OPT_CMDMODE_F(s, l, v, h, i, 0)
+
#define OPT_INTEGER(s, l, v, h) OPT_INTEGER_F(s, l, v, h, 0)
#define OPT_MAGNITUDE(s, l, v, h) { OPTION_MAGNITUDE, (s), (l), (v), \
N_("n"), (h), PARSE_OPT_NONEG }
@@ -216,7 +215,8 @@
*/
int parse_options(int argc, const char **argv, const char *prefix,
const struct option *options,
- const char * const usagestr[], int flags);
+ const char * const usagestr[],
+ enum parse_opt_flags flags);
NORETURN void usage_with_options(const char * const *usagestr,
const struct option *options);
@@ -225,9 +225,6 @@
const char * const *usagestr,
const struct option *options);
-int optbug(const struct option *opt, const char *reason);
-const char *optname(const struct option *opt, int flags);
-
/*
* Use these assertions for callbacks that expect to be called with NONEG and
* NOARG respectively, and do not otherwise handle the "unset" and "arg"
@@ -265,7 +262,7 @@
const char **out;
int argc, cpidx, total;
const char *opt;
- int flags;
+ enum parse_opt_flags flags;
const char *prefix;
const char **alias_groups; /* must be in groups of 3 elements! */
struct option *updated_options;
@@ -273,11 +270,12 @@
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
- const struct option *options, int flags);
+ const struct option *options,
+ enum parse_opt_flags flags);
-int parse_options_step(struct parse_opt_ctx_t *ctx,
- const struct option *options,
- const char * const usagestr[]);
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+ const struct option *options,
+ const char * const usagestr[]);
int parse_options_end(struct parse_opt_ctx_t *ctx);
diff --git a/path.c b/path.c
index 94ef673..d73146b 100644
--- a/path.c
+++ b/path.c
@@ -12,6 +12,7 @@
#include "packfile.h"
#include "object-store.h"
#include "lockfile.h"
+#include "exec-cmd.h"
static int get_st_mode_bits(const char *path, int *mode)
{
@@ -719,19 +720,25 @@
}
/*
- * Return a string with ~ and ~user expanded via getpw*. If buf != NULL,
- * then it is a newly allocated string. Returns NULL on getpw failure or
- * if path is NULL.
+ * Return a string with ~ and ~user expanded via getpw*. Returns NULL on getpw
+ * failure or if path is NULL.
*
- * If real_home is true, strbuf_realpath($HOME) is used in the expansion.
+ * If real_home is true, strbuf_realpath($HOME) is used in the `~/` expansion.
+ *
+ * If the path starts with `%(prefix)/`, the remainder is interpreted as
+ * relative to where Git is installed, and expanded to the absolute path.
*/
-char *expand_user_path(const char *path, int real_home)
+char *interpolate_path(const char *path, int real_home)
{
struct strbuf user_path = STRBUF_INIT;
const char *to_copy = path;
if (path == NULL)
goto return_null;
+
+ if (skip_prefix(path, "%(prefix)/", &path))
+ return system_path(path);
+
if (path[0] == '~') {
const char *first_slash = strchrnul(path, '/');
const char *username = path + 1;
@@ -812,7 +819,7 @@
strbuf_add(&validated_path, path, len);
if (used_path.buf[0] == '~') {
- char *newpath = expand_user_path(used_path.buf, 0);
+ char *newpath = interpolate_path(used_path.buf, 0);
if (!newpath)
return NULL;
strbuf_attach(&used_path, newpath, strlen(newpath),
@@ -1507,21 +1514,28 @@
return str && str[0] == '-';
}
-char *xdg_config_home(const char *filename)
+char *xdg_config_home_for(const char *subdir, const char *filename)
{
const char *home, *config_home;
+ assert(subdir);
assert(filename);
config_home = getenv("XDG_CONFIG_HOME");
if (config_home && *config_home)
- return mkpathdup("%s/git/%s", config_home, filename);
+ return mkpathdup("%s/%s/%s", config_home, subdir, filename);
home = getenv("HOME");
if (home)
- return mkpathdup("%s/.config/git/%s", home, filename);
+ return mkpathdup("%s/.config/%s/%s", home, subdir, filename);
+
return NULL;
}
+char *xdg_config_home(const char *filename)
+{
+ return xdg_config_home_for("git", filename);
+}
+
char *xdg_cache_home(const char *filename)
{
const char *home, *cache_home;
diff --git a/path.h b/path.h
index 251c78d..b68691a 100644
--- a/path.h
+++ b/path.h
@@ -181,10 +181,7 @@
const char *shallow;
};
-#define PATH_CACHE_INIT \
- { \
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
- }
+#define PATH_CACHE_INIT { 0 }
const char *git_path_squash_msg(struct repository *r);
const char *git_path_merge_msg(struct repository *r);
diff --git a/pathspec.c b/pathspec.c
index 08f8d3e..ddeeba7 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -37,11 +37,10 @@
num_unmatched++;
if (!num_unmatched)
return;
- /* TODO: audit for interaction with sparse-index. */
- ensure_full_index(istate);
for (i = 0; i < istate->cache_nr; i++) {
const struct cache_entry *ce = istate->cache[i];
- if (sw_action == PS_IGNORE_SKIP_WORKTREE && ce_skip_worktree(ce))
+ if (sw_action == PS_IGNORE_SKIP_WORKTREE &&
+ (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate)))
continue;
ce_path_match(istate, ce, pathspec, seen);
}
@@ -72,7 +71,7 @@
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
- if (ce_skip_worktree(ce))
+ if (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate))
ce_path_match(istate, ce, pathspec, seen);
}
diff --git a/pkt-line.c b/pkt-line.c
index 9f63eae..2dc8ac2 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -243,6 +243,43 @@
die("%s", err.buf);
}
+void packet_fwrite(FILE *f, const char *buf, size_t size)
+{
+ size_t packet_size;
+ char header[4];
+
+ if (size > LARGE_PACKET_DATA_MAX)
+ die(_("packet write failed - data exceeds max packet size"));
+
+ packet_trace(buf, size, 1);
+ packet_size = size + 4;
+
+ set_packet_header(header, packet_size);
+ fwrite_or_die(f, header, 4);
+ fwrite_or_die(f, buf, size);
+}
+
+void packet_fwrite_fmt(FILE *fh, const char *fmt, ...)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ va_list args;
+
+ strbuf_reset(&buf);
+
+ va_start(args, fmt);
+ format_packet(&buf, "", fmt, args);
+ va_end(args);
+
+ fwrite_or_die(fh, buf.buf, buf.len);
+}
+
+void packet_fflush(FILE *f)
+{
+ packet_trace("0000", 4, 1);
+ fwrite_or_die(f, "0000", 4);
+ fflush_or_die(f);
+}
+
void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
{
va_list args;
@@ -252,22 +289,6 @@
va_end(args);
}
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
-{
- size_t orig_len, n;
-
- orig_len = buf->len;
- strbuf_addstr(buf, "0000");
- strbuf_add(buf, data, len);
- n = buf->len - orig_len;
-
- if (n > LARGE_PACKET_MAX)
- die(_("protocol error: impossibly long line"));
-
- set_packet_header(&buf->buf[orig_len], n);
- packet_trace(data, len, 1);
-}
-
int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
{
char *buf = xmalloc(LARGE_PACKET_DATA_MAX);
@@ -416,38 +437,28 @@
return PACKET_READ_NORMAL;
}
-int packet_read(int fd, char **src_buffer, size_t *src_len,
- char *buffer, unsigned size, int options)
+int packet_read(int fd, char *buffer, unsigned size, int options)
{
int pktlen = -1;
- packet_read_with_status(fd, src_buffer, src_len, buffer, size,
- &pktlen, options);
+ packet_read_with_status(fd, NULL, NULL, buffer, size, &pktlen,
+ options);
return pktlen;
}
-static char *packet_read_line_generic(int fd,
- char **src, size_t *src_len,
- int *dst_len)
+char *packet_read_line(int fd, int *dst_len)
{
- int len = packet_read(fd, src, src_len,
- packet_buffer, sizeof(packet_buffer),
+ int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
PACKET_READ_CHOMP_NEWLINE);
if (dst_len)
*dst_len = len;
return (len > 0) ? packet_buffer : NULL;
}
-char *packet_read_line(int fd, int *len_p)
-{
- return packet_read_line_generic(fd, NULL, NULL, len_p);
-}
-
int packet_read_line_gently(int fd, int *dst_len, char **dst_line)
{
- int len = packet_read(fd, NULL, NULL,
- packet_buffer, sizeof(packet_buffer),
+ int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
PACKET_READ_CHOMP_NEWLINE|PACKET_READ_GENTLE_ON_EOF);
if (dst_len)
*dst_len = len;
@@ -456,11 +467,6 @@
return len;
}
-char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
-{
- return packet_read_line_generic(-1, src, src_len, dst_len);
-}
-
ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
{
int packet_len;
@@ -470,7 +476,7 @@
for (;;) {
strbuf_grow(sb_out, LARGE_PACKET_DATA_MAX);
- packet_len = packet_read(fd_in, NULL, NULL,
+ packet_len = packet_read(fd_in,
/* strbuf_grow() above always allocates one extra byte to
* store a '\0' at the end of the string. packet_read()
* writes a '\0' extra byte at the end, too. Let it know
diff --git a/pkt-line.h b/pkt-line.h
index 5af5f45..467ae01 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -29,13 +29,23 @@
void set_packet_header(char *buf, int size);
void packet_write(int fd_out, const char *buf, size_t size);
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len);
int packet_flush_gently(int fd);
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
int write_packetized_from_fd_no_flush(int fd_in, int fd_out);
int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out);
/*
+ * Stdio versions of packet_write functions. When mixing these with fd
+ * based functions, take care to call fflush(3) before doing fd writes or
+ * closing the fd.
+ */
+void packet_fwrite(FILE *f, const char *buf, size_t size);
+void packet_fwrite_fmt(FILE *f, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+
+/* packet_fflush writes a flush packet and flushes the stdio buffer of f */
+void packet_fflush(FILE *f);
+
+/*
* Read a packetized line into the buffer, which must be at least size bytes
* long. The return value specifies the number of bytes read into the buffer.
*
@@ -77,8 +87,7 @@
#define PACKET_READ_CHOMP_NEWLINE (1u<<1)
#define PACKET_READ_DIE_ON_ERR_PACKET (1u<<2)
#define PACKET_READ_GENTLE_ON_READ_ERROR (1u<<3)
-int packet_read(int fd, char **src_buffer, size_t *src_len, char
- *buffer, unsigned size, int options);
+int packet_read(int fd, char *buffer, unsigned size, int options);
/*
* Convert a four hex digit packet line length header into its numeric
@@ -128,12 +137,6 @@
int packet_read_line_gently(int fd, int *size, char **dst_line);
/*
- * Same as packet_read_line, but read from a buf rather than a descriptor;
- * see packet_read for details on how src_* is used.
- */
-char *packet_read_line_buf(char **src_buf, size_t *src_len, int *size);
-
-/*
* Reads a stream of variable sized packets until a flush packet is detected.
*/
ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options);
diff --git a/po/TEAMS b/po/TEAMS
index 66ad06b..3dd51fc 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -52,7 +52,7 @@
Language: pt_PT (Portuguese - Portugal)
Repository: https://github.com/git-l10n-pt-PT/git-po/
-Leader: Daniel Santos <hello@brighterdan.com>
+Leader: Daniel Santos <daniel@brilhante.top>
Language: ru (Russian)
Repository: https://github.com/DJm00n/git-po-ru/
diff --git a/po/bg.po b/po/bg.po
index 905eb8e..51d7c72 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -62,6 +62,7 @@
# fallback резервен вариант
# pathspec magic опция за магически пътища
# bitmap index индекс на база битови маски
+# multi-pack bitmap многопакетната битова маска
# mark маркер
# plumbing команди от системно ниво
# porcelain команди от потребителско ниво
@@ -143,9 +144,10 @@
# blame извеждане на авторство
# refname име на указател
# cone pattern matching пътеводно напасване
+# sparse-checkout cone пътеводен сегмент на частичното изтегляне
# negative pattern отрицателен шаблон
# colored hunk/diff оцветено парче/разлика
-# up to date обновен, освен като самостотелва дума - актуален или completely up to date - напълно актуален
+# up to date обновен, освен като самостоятелна дума - актуален или completely up to date - напълно актуален
# stateless без запазване на състоянието
# end packet пакет за край
# identity самоличност, информация за
@@ -157,8 +159,10 @@
# expired остарял
# reroll-count номер на редакция
# Nth re-roll N-та поредна редакция
-# fetch доставам
+# fetch доставям
# prefetch предварително доставяне
+# scheduler планиращ модул
+# snapshot снимка
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -175,10 +179,10 @@
# for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
msgid ""
msgstr ""
-"Project-Id-Version: git 2.31\n"
+"Project-Id-Version: git 2.34\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
-"PO-Revision-Date: 2021-08-06 13:38+0300\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-12 19:22+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -187,213 +191,214 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Неуспешен анализ — „%s“."
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "двоично"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "нищо"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "няма промени"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Обновяване"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "неуспешно добавяне в индекса на „%s“"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "индексът не може да бъде записан"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d файл обновен\n"
msgstr[1] "%d файла обновени\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Отмяна"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d файл с отменени промени\n"
msgstr[1] "%d файла с отменени промени\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Няма неследени файлове.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Добавяне на неследени"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d файл добавен\n"
msgstr[1] "%d файла добавени\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "пренебрегване на неслятото: „%s“"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Преглед на разликата"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "извеждане на пътищата с промени"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "добавяне на състоянието на работното дърво към промените в индекса"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "връщане на състоянието на индекса към соченото от „HEAD“"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "интерактивни избор и промяна на парчета код"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "разлика между соченото от „HEAD“ и индекса"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "добавяне на съдържанието на неследените файлове към индекса"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Помощ:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "избор на eдин елемент"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "избор на поредица от елементи"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "избор на няколко поредици от елементи"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "избор на базата на уникален префикс"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "изваждане на указаното от избора"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "избор на всички елементи"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(празно) приключване на избирането"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "избор на номериран елемент"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(празно) без избор на нищо"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Избор на следващо действие"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "в индекса"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "извън индекса"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "път"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "индексът не може да бъде обновен"
#
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
@@ -927,7 +932,7 @@
msgid "'git apply' failed"
msgstr "неуспешно изпълнение на „git apply“"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -937,37 +942,37 @@
"За да изключите това предупреждение, изпълнете:\n"
" git config advice.%s false"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:270
+#: advice.c:196
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."
@@ -975,40 +980,47 @@
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Не може да се извърши превъртане, преустановяване на действието."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Следните пътища не съвпадат с никой от настроените, но съвпадат с обекти\n"
-"в индекса, които са извън текущото частично изтегляне:\n"
+"Следните пътища напасват с пътища извън дефиницията за частично\n"
+"изтегляне и няма да се обновят в индекса:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Изключете или променете правилата за частичност, ако искате до обновявате "
-"такива обекти."
+"Ако искате да ги обновите, пробвайте едно от следните:\n"
+" ⁃ ползвайте опцията „--sparse“\n"
+" ⁃ изключете или променете правилата за частичност."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1197,37 +1209,37 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1236,13 +1248,13 @@
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1251,316 +1263,317 @@
"при търсене за:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "в хранилището липсват необходимите обекти-BLOB, за тройно сливане."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Тройно сливане…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Неуспешно тройно сливане…\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Преминаване към пряко прилагане…\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4559
+#: apply.c:4581
#, 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 отхвърлени парчета…"
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1569,138 +1582,138 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "БРОЙ"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"пробване с тройно сливане, ако това не сработи — стандартно прилагане на "
"кръпка"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "действие"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "повече подробности"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
@@ -1772,151 +1785,151 @@
msgid "cannot read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "такъв указател няма: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "неправилно име на обект: „%s“"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "не е обект-дърво: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "текущата работна директория не е следена"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Файлът „%s“ липсва"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "„%s“ не е обикновен файл"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "добавяне на неследените файлове към архива"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "задаване на нивото на компресиране"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "хранилище"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "команда"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "опцията „--exec“ изисква „--remote“"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "опциите „--add-file“ и „--remote“ са несъвместими"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "„%.*s“ е неправилно име за атрибут"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s: командата не е позволена: „%s:%d“"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1924,22 +1937,22 @@
"Отрицателните шаблони се игнорират в атрибутите на git.\n"
"Ако ви трябва начална удивителна, ползвайте „\\!“."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1948,7 +1961,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1957,7 +1970,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1966,7 +1979,7 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1977,7 +1990,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1988,36 +2001,36 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "неуспешно прочитане на указателите за двоично търсене"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "„%s“ e както „%s“, така и „%s“\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -2026,7 +2039,7 @@
"Липсва подходящо за тестване подаване.\n"
"Проверете параметрите за пътищата.\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -2036,7 +2049,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -2057,11 +2070,12 @@
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
@@ -2240,8 +2254,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
@@ -2300,7 +2314,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "пратка %d не може да се запише с алгоритъм %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
@@ -2342,7 +2356,7 @@
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "неправилна версия на контролна сума"
@@ -2388,197 +2402,197 @@
msgid "unable to find all commit-graph files"
msgstr "някои файлове на гра̀фа с подаванията не може да бъдат открити"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "подаването „%s“ не може да бъде открито"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"графът с подаванията изисква генериране на данни за отместването, но такива "
"липсват"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да бъде определен"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Разширяване на достижимите подавания в гра̀фа"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Събиране на свързаните подавания"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл"
msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "грешка при добавяне на пакетен файл „%s“"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "грешка при отваряне на индекса на „%s“"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Откриване на още върхове в гра̀фа с подаванията"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "правилният брой на базовите идентификатори не може да се запише"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "правата за споделен достъп до „%s“ не може да бъдат зададени"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Запазване на гра̀фа с подаванията в %d пас"
msgstr[1] "Запазване на гра̀фа с подаванията в %d паса"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Търсене на подаванията със сливания"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Сливане на гра̀фа с подаванията"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
"изключена"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "прекалено много подавания за записване на гра̀фа"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
"е преди „%s“, а не трябва"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
"трябва да е %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Проверка на подаванията в гра̀фа"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
"анализира"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
"подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2586,7 +2600,7 @@
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
"не е"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2594,32 +2608,32 @@
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
"другаде е"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
"%<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2642,29 +2656,29 @@
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2678,7 +2692,7 @@
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2693,35 +2707,35 @@
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "неправилен формат на настройка: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "липсва име на променлива на средата за настройката „%.*s“"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "липсва променлива на средата „%s“ за настройката „%.*s“"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
@@ -2731,168 +2745,168 @@
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "празен ключ за настройка"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "неправилен брой в „%s“"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "прекалено много записи в „%s“"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "ключът за настройка „%s“ липсва"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "стойността за настройка „%s“ липсва"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "неправилна булева стойност „%s“ за „%s“"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
@@ -2900,132 +2914,132 @@
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
@@ -3061,72 +3075,72 @@
msgstr ""
"след първоначалната обява на възможностите се очаква изчистване на буферите"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "пропускане на възможностите след първия ред „%s“"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "протоколна грешка: неочаквани възможности^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "протоколна грешка: очаква се SHA1 на плитък обект, а бе получено: „%s“"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "отсрещното хранилище не може да е плитко"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "неправилен пакет"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "протоколна грешка: неочаквано „%s“"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "сървърът указа непознат формат на обект: „%s“"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "неправилен отговор на „ls-refs“: „%s“"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "след изброяването на указателите се очаква изчистване на буферите"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "след изброяването на указателите се очаква пакет за край"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "протокол „%s“ не се поддържа"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Търсене на „%s“… "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "„%s“ (порт %s) не може да се открие („%s“)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3135,7 +3149,7 @@
"готово.\n"
"Свързване към „%s“ (порт %s)…"
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3145,90 +3159,90 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "действието завърши."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "„%s“ не може да се открие (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "непознат порт „%s“"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "необичайното име на хост „%s“ е блокирано"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "необичайният порт „%s“ е блокиран"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "посредникът „%s“ не може да се стартира"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"не е указан път. Проверете синтаксиса с командата:\n"
"\n"
" git help pull"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
"знакът за нов ред не е позволен в адресите и в пътищата до хранилищата "
"„git://“"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "необичайният път „%s“ е блокиран"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
#: convert.c:183
#, c-format
msgid "illegal crlf_action %d"
-msgstr "неправилно действие за край на ред: %d"
+msgstr "неправилно действие за край на ред (crlf_action): %d"
#: convert.c:196
#, c-format
@@ -3338,7 +3352,7 @@
msgid "path name too long for external filter"
msgstr "пътят е прекалено дълъг за външен филтър"
-#: convert.c:934
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3347,17 +3361,17 @@
"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
"филтрирани"
-#: convert.c:1234
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr ""
"„true“/„false“ (истина/лъжа̀) не може да са кодирания на работното дърво"
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
-#: convert.c:1490
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
@@ -3375,17 +3389,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "адресът трябва задължително да съдържа протокол"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "адресът съдържа нов ред в частта за %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "адресът е без схема: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "адресът за идентификация не може да се анализира: „%s“"
@@ -3489,23 +3503,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "непозната стойност за опцията „--diff-merges“: „%s“"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "опцията „--merge-base“ не работи с диапазони"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "опцията „--merge-base“ работи само с подавания"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "Указателят „HEAD“ не може да бъде получен"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "липсва база за сливане"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "много бази за сливане"
@@ -3521,28 +3535,28 @@
"Не е хранилище на git. Ползвайте опцията „--no-index“, за да сравните "
"пътища извън работно дърво"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
"директории\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
"настройката за цвят за преместване трябва да е една от: „no“ (без), "
-"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), "
-"„dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
+"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
+"zebra“ (тъмно райе), „plain“ (обикновено)"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3555,7 +3569,7 @@
"„allow-indentation-change“ (позволяване на промените в празните знаци за "
"форматиране)"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3563,12 +3577,12 @@
"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
"за празни знаци"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3577,53 +3591,53 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"опциите „-G“ и „--pickaxe-regex“ са несъвместими една с друга. Пробвайте „--"
"pickaxe-regex“ със „-S“"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
"опциите „--pickaxe-all“ и „--find-object“ са несъвместими една с друга. "
"Пробвайте „--pickaxe-all“ с „-G“ и „-S“"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "опцията „--follow“ изисква точно един път"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "неправилна стойност за „--stat“: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3632,44 +3646,44 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3678,158 +3692,158 @@
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
-msgstr "псевдоним на „-p --stat“"
+msgstr "псевдоним на „-p --raw“"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
+msgstr "псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3837,7 +3851,7 @@
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3845,261 +3859,261 @@
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"извеждане на контекст между последователните парчета с разлики от указания "
"БРОЙ редове"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -4107,69 +4121,69 @@
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "ПЪТ"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "първо извеждане на промяната в указания път"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "прескачане на изхода към указания път"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"пълното търсене на преименувания на обекти се прескача поради многото "
"файлове."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4180,7 +4194,7 @@
msgid "failed to read orderfile '%s'"
msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-#: diffcore-rename.c:1510
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Търсене на преименувания на обекти съчетани с промени"
@@ -4199,363 +4213,451 @@
msgid "unrecognized pattern: '%s'"
msgstr "непознат шаблон: „%s“"
-#: dir.c:792 dir.c:806
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "непознат отрицателен шаблон: „%s“"
-#: dir.c:824
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"файлът определящ частичността на изтегленото хранилище може да има проблем: "
"шаблонът „%s“ се повтаря"
-#: dir.c:834
+#: dir.c:830
msgid "disabling cone pattern matching"
msgstr "изключване на пътеводното напасване"
-#: dir.c:1221
+#: dir.c:1214
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:2358
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2660
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2784
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3617
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директорията не може да бъде отгатнато.\n"
+"Задайте директорията изрично на командния ред"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3664 dir.c:3669
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3698
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Филтриране на съдържанието"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "неправилен път към пространства от имена „%s“"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR не може да се зададе да е „%s“"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: неправилен изход от командата „index-pack“"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Сървърът поддържа „%s“"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "клонираното хранилище е плитко, затова няма да се клонира."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "сървърът не поддържа алгоритъм „%s“"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Сървърът поддържа филтри"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: очаква се пакет за край на отговора"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "неочаквано състояние за готовност от отдалечено хранилище"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"настройката „gpg.ssh.allowedSignersFile“ трябва да е зададена за проверка на "
+"подписите на ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"За проверка на подписите е необходима командата (достъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+" ssh-keygen -Y find-principals/verify"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"файлът за отхвърляне на подписи на ssh е настроен, но не може да се открие: "
+"%s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "лош/несъвместим подпис „%s“"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"Поне една от настройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
+"трябва да е зададена"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"командата „gpg.ssh.defaultKeyCommand“ завърши успешно, но не върна никакви "
+"ключове: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "неуспешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подписа данните."
+msgstr "Програмата „gpg“ не подписа данните"
+
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+"за подписване със ssh е необходимо да зададете настройката „user.signingkey“"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "неуспешно запазване на ключа за подписване на ssh в „%s“"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "неуспешно запазване на буфера за подписване на ssh в „%s“"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"За подписване със ssh е необходима командата (достъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+" ssh-keygen -Y"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "неуспешно прочитане на буфера за подписване на ssh от „%s“"
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4563,109 +4665,109 @@
"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа "
"в комбинация с „-P“ само при ползването на „PCRE v2“"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "работа по текущата промяна (погледнете: „git help everyday“)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "преглед на историята и състоянието (погледнете: „git help revisions“)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "увеличаване, отбелязване и промяна на общата история"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "съвместна работа (погледнете: „git help workflows“)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Основни команди от потребителско ниво"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Помощни команди / Променящи"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Помощни команди / Запитващи"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Съвместна работа с други хора"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Команди от ниско ниво / Променящи"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Команди от ниско ниво / Запитващи"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Команди от ниско ниво / Синхронизация на хранилища"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Команди от ниско ниво / Допълнителни инструменти"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "налични команди на git от „%s“"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "команди на git от други директории от „$PATH“"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Това са най-често използваните команди на Git:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "неподдържан списък от команди „%s“"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Ръководствата за концепциите в Git са:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Външни команди"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Псевдоними на командите"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4674,36 +4776,41 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
"не съществува."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Да се изпълни „%s“ вместо това? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
"имате предвид „%s“."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4717,16 +4824,16 @@
"\n"
"Най-близките команди са"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4740,6 +4847,16 @@
"\n"
"Команди с подобно име са:"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Куката „%s“ се прескача, защото липсват права за изпълнение.\n"
+"За да изключите това предупреждение, изпълнете:\n"
+" git config advice.ignoredHook false"
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Липсва информация за автора\n"
@@ -4805,7 +4922,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
@@ -4902,7 +5019,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "неправилна стойност „%s“ за „lsrefs.unborn“"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "неочакван ред: „%s“"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите"
@@ -4910,39 +5032,39 @@
msgid "quoted CRLF detected"
msgstr "цитирани знаци CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "неправилно действие „%s“ за „%s“"
-#: merge-ort.c:1228 merge-recursive.c:1206
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
-#: merge-ort.c:1237 merge-recursive.c:1213
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
-#: merge-ort.c:1246 merge-recursive.c:1220
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
"подаванията)"
-#: merge-ort.c:1256 merge-ort.c:1263
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
-#: merge-ort.c:1284
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Неуспешно сливане на подмодула „%s“"
-#: merge-ort.c:1291
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4951,7 +5073,7 @@
"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n"
"%s\n"
-#: merge-ort.c:1295 merge-recursive.c:1274
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4967,7 +5089,7 @@
"\n"
"Това приема предложеното.\n"
-#: merge-ort.c:1308
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4976,21 +5098,21 @@
"Неуспешно сливане на подмодула „%s“, но са открити множество решения:\n"
"%s"
-#: merge-ort.c:1527 merge-recursive.c:1363
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-ort.c:1532 merge-recursive.c:1368
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-ort.c:1539 merge-recursive.c:1401
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-ort.c:1678 merge-recursive.c:2123
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4999,7 +5121,7 @@
"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-#: merge-ort.c:1688 merge-recursive.c:2133
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -5009,7 +5131,7 @@
"съответства на „%s“. Косвено преименуване на директория води до поставянето "
"на тези пътища там: %s."
-#: merge-ort.c:1746
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -5020,7 +5142,7 @@
"да се преименува „%s“, защото е преместен в няколко нови директории, без "
"никоя от тях да е по-честа цел."
-#: merge-ort.c:1900 merge-recursive.c:2469
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -5029,7 +5151,7 @@
"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
"„%s“ също е с променено име."
-#: merge-ort.c:2044 merge-recursive.c:3252
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -5038,7 +5160,7 @@
"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
"„%s“. Обектът се мести в „%s“."
-#: merge-ort.c:2051 merge-recursive.c:3259
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -5047,7 +5169,7 @@
"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
"преименувана в „%s“. Обектът се мести в „%s“."
-#: merge-ort.c:2064 merge-recursive.c:3255
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -5056,7 +5178,7 @@
"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
"преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-ort.c:2072 merge-recursive.c:3262
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -5065,14 +5187,14 @@
"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-ort.c:2228
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон „%s“ "
"и на „%s“ в „%s“."
-#: merge-ort.c:2323
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -5083,24 +5205,24 @@
"има и промени в съдържанието, а и има съвпадение на пътя. Може да се "
"получат вложени маркери за конфликт."
-#: merge-ort.c:2342 merge-ort.c:2366
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"е изтрит в „%s“."
-#: merge-ort.c:2819 merge-recursive.c:3013
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-ort.c:2822 merge-recursive.c:3016
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-ort.c:3250
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5109,7 +5231,7 @@
"КОНФЛИКТ (файл/директория): директория на мястото на „%s“ от „%s“, вместо "
"това се извършва преместване в „%s“."
-#: merge-ort.c:3326
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5118,7 +5240,7 @@
"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта. И "
"двата се преименуват, за да може всичко да е отразено."
-#: merge-ort.c:3333
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5127,24 +5249,24 @@
"КОНФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта. "
"Извършва се преименуване в единия, за да може всичко да е отразено."
-#: merge-ort.c:3433 merge-recursive.c:3092
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "съдържание"
-#: merge-ort.c:3435 merge-recursive.c:3096
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-ort.c:3437 merge-recursive.c:3141
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-ort.c:3439 merge-recursive.c:3142
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-ort.c:3470
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5153,7 +5275,7 @@
"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s. Версия "
"%s на „%s“ е оставена в дървото."
-#: merge-ort.c:3757
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5165,12 +5287,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4116
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5179,113 +5301,113 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Вече е обновено."
-#: merge-recursive.c:357
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
-#: merge-recursive.c:380
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е "
"преустановено."
-#: merge-recursive.c:389
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. "
"Сливането е преустановено."
-#: merge-recursive.c:877
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:888
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:902 merge-recursive.c:921
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:911
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:952 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:957
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:982
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:998
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:1228 merge-recursive.c:1240
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Превъртане на подмодула „%s“ до следното подаване:"
-#: merge-recursive.c:1231 merge-recursive.c:1243
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Превъртане на подмодула „%s“"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
"от подаванията)"
-#: merge-recursive.c:1270
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
"Открито е сливане, което може да решава проблема със сливането на "
"подмодула:\n"
-#: merge-recursive.c:1283
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
-#: merge-recursive.c:1425
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5294,7 +5416,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1502
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5303,7 +5425,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5312,7 +5434,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1514
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5321,45 +5443,45 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото: %s."
-#: merge-recursive.c:1549
+#: merge-recursive.c:1558
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1549
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
-#: merge-recursive.c:1610
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
-#: merge-recursive.c:1668
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1704
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Преустановяване на действието, за да не се изгуби неследеният файл „%s“. "
"Вместо него се добавя „%s“"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5368,18 +5490,18 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1736
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1837
#, 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:2091
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5390,7 +5512,7 @@
"постави „%s“, защото няколко нови директории поделят съдържанието на "
"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-#: merge-recursive.c:2225
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5399,81 +5521,81 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3089
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3089
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:3119
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3172
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:3376
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:3404
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:3411
+#: merge-recursive.c:3420
#, 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:3420
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3482
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:3576
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:3589
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:3639
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:3804
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
@@ -5481,143 +5603,176 @@
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"версията на контролната сума на индекса за множество пакети %u не съвпада с "
"%u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "редът не може да се анализира: „%s“"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "неправилен ред: „%s“."
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"индексът за множество пакети се прескача, защото контролната сума не съвпада"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "пакетът не може да се зареди"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "индексът за „%s“ не може да се отвори"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "пакетният файл за триене „%s“ не може да се открие"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "непознат предпочитан пакет: %s"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+"не може да изберете „%s“, който не съдържа обекти, за предпочитан пакет"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетният файл за триене „%s“ не може да се открие"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "предпочитаният пакет „%s“ е остарял"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "няма пакетни файлове за индексиране"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "многопакетната битова маска не може да бъде запазена"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "индексът за множество пакети не може да бъде запазен"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "неправилна контролна сума"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5625,75 +5780,75 @@
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr ""
"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
"множество пакетни файлове"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Преброяване на свързаните обекти"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "командата „pack-objects“ не може да бъде стартирана"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "командата „pack-objects“ не може да бъде завършена"
#: name-hash.c:542
#, c-format
msgid "unable to create lazy_dir thread: %s"
-msgstr "не може да се създаде нишка за директории: %s"
+msgstr "не може да се създаде нишка за директории (lazy_dir): %s"
#: name-hash.c:564
#, c-format
msgid "unable to create lazy_name thread: %s"
-msgstr "не може да се създаде нишка за имена: %s"
+msgstr "не може да се създаде нишка за имена (lazy_name): %s"
#: name-hash.c:570
#, c-format
msgid "unable to join lazy_name thread: %s"
-msgstr "не може да се изчака нишка за имена: %s"
+msgstr "не може да се изчака нишка за имена (lazy_name): %s"
#: notes-merge.c:277
#, c-format
@@ -5743,266 +5898,263 @@
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
"alternates“"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
"дълбоко влагане"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "файлът с алтернативите не може да бъде прочетен"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "неуспешно изпълнение на „mmap“%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "неправилен вид обект"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
-"type“"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "неправилен вид обект"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "заглавната част на „%s“ е прекалено дълга — надхвърля %d байта"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "файлът „%s“ не може да бъде записан"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат зададени"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "грешка при запис на файл"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "грешка при затварянето на файла с непакетиран обект"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "грешка при записа на файла с непакетиран обект"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "обектът за „%s“ не може да се прочете"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "повредено подаване"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "повреден етикет"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
@@ -6032,9 +6184,9 @@
"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
"Възможно е такива указатели да са създадени случайно. Например:\n"
"\n"
-" git switch -c $BRANCH $(git rev-parse …)\n"
+" git switch -c $br $(git rev-parse …)\n"
"\n"
-"където стойността на променливата на средата BRANCH е празна, при което\n"
+"където стойността на променливата на средата „$br“ е празна, при което\n"
"се създава подобен указател. Прегледайте тези указатели и ги изтрийте.\n"
"За да изключите това съобщение, изпълнете:\n"
"\n"
@@ -6131,12 +6283,27 @@
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "задължителният обратен индекс липсва в многопакетната битова маска"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+"load_reverse_index: пакетът не може да се отвори (при зареждане на обратния "
+"индекс)"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "размерът на „%s“ не може да бъде получен"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "„%s“ липсва в пакет „%s“ при отместване %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "използваното място за „%s“ не може да бъде получено"
@@ -6168,50 +6335,50 @@
"идентификатор на контролна сума %2$<PRIu32> на файла с обратен индекс „%1$s“ "
"не се поддържа"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "обратният индекс не може едновременно да се записва и да се проверява"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "не може да се получи информация чрез „stat“ за „%s“"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "не може да се дадат права за четене на „%s“"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "гарантиращият файл „%s“ не може да се запише"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "не може да се изпълни „mmap“ върху пакетния файл „%s“%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
@@ -6233,72 +6400,72 @@
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "опцията „%s“ изисква аргумент"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "опцията „%s“ е несъвместима с нещо"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "опцията „%s“ не приема аргументи"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "опцията „%s“ не е налична"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "псевдоним на „--%s“"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "непозната опция: „%s“"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "непознат флаг „%c“"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "…"
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -6306,48 +6473,72 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-ЧИСЛО"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не може да се дадат права за запис в директорията „%s“ на групата"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Позволено е само едно указване на „attr:“."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "„attr:“ трябва да указва стойност"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "неправилно име на атрибут: „%s“"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6355,51 +6546,51 @@
"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
"други глобални настройки за пътища"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправилен параметър за опцията за магически пътища „prefix“"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Магическите пътища „%c“ са без реализация за „%s“"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: „%s“ е извън хранилището при „%s“"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "„%s“ (клавиш: „%c“)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "неправилно цитиран ред: %s"
@@ -6420,7 +6611,7 @@
msgid "flush packet write failed"
msgstr "неуспешно изчистване на буферите при запис на пакет"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "протоколна грешка: прекалено дълъг ред"
@@ -6428,7 +6619,7 @@
msgid "packet write with format failed"
msgstr "неуспешен запис на пакет с формат"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"неуспешен запис на пакетен файл — данните надвишават максималният размер на "
@@ -6439,25 +6630,25 @@
msgid "packet write failed: %s"
msgstr "неуспешен запис на пакет: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "грешка при четене"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "протоколна грешка: неправилна дължина на ред: %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "отдалечена грешка: %s"
@@ -6471,7 +6662,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
@@ -6503,21 +6694,21 @@
msgid "Removing duplicate objects"
msgstr "Изтриване на повтарящите се обекти"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6526,12 +6717,12 @@
"първият ред от изхода на командата „log“ не може да се анализира, защото не "
"започва с „commit “: „%s“"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "заглавната част на git „%.*s“ не може да се анализира"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
@@ -6561,7 +6752,7 @@
"%s: може да добавяте само обикновени файлове, символни връзки и директории "
"на git"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "не е изтеглено подаване в „%s“"
@@ -6581,16 +6772,16 @@
msgid "unable to stat '%s'"
msgstr "„stat“ не може да се изпълни върху „%s“"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s“ съществува и като файл, и като директория"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Обновяване на индекса"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6599,7 +6790,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6609,146 +6800,152 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "неправилен подпис: „0x%08x“"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "неправилна версия на индекса %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "игнориране на разширението „%.4s“"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "непознат формат на запис в индекса: „0x%08x“"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "неподредени записи в индекса"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "множество записи за слетия файл „%s“"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "неподредени записи за „%s“"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:331
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
-msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да се създаде нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
-msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да се изчака нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: неуспешно отваряне на файла на индекса"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: файлът на индекса е по-малък от очакваното"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: неуспешно изпълнение на „mmap“ върху индексния файл%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
+"не може да се създаде нишка за зареждане на разширенията на индекса "
+"(load_index_extensions): %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "споделеният индекс „%s“ не може да се обнови"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3074
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "индексът не може да бъде превърнат в частичен"
-#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:3158
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:3170
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: read-cache.c:3199
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "правата за достъп до „%s“ не може да бъдат поправени"
-#: read-cache.c:3348
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: не може да се премине към етап №0"
@@ -6830,7 +7027,7 @@
msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6838,7 +7035,7 @@
"\n"
"Не изтривайте редове. Подаванията може да се прескачат с командата „drop“.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6846,7 +7043,7 @@
"\n"
"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6861,7 +7058,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6871,14 +7068,14 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "„%s“ не може да се запише"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "„%s“ не може да се запише."
@@ -6909,12 +7106,10 @@
"предупреждение)\n"
"или „error“ (считане за грешка).\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да се чете."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „merges“ заменя „preserve“"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6935,257 +7130,278 @@
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "непознат аргумент за %%(objectsize): %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) не приема аргументи"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "непознат аргумент за %%(subject): %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr "очаква се %%(trailers:КЛЮЧ=СТОЙНОСТ)"
+msgstr "очаква се %%(trailers:key=ЕПИЛОГ)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "непознат аргумент за „%%(raw)“: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "очаква се положителна стойност за „%s“ в %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "непознат аргумент „%s“ в %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "непозната опция за е-поща: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "непознат аргумент за „%%(if)“: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) не приема аргументи"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "тази команда отхвърли лексемата %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+"опцията „--format=%.*s“ е несъвместима с „--python“, „--shell“, „--tcl“"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично търсене от „%s“)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(указателят „HEAD“ не е свързан и е при „%s“)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(указателят „HEAD“ не е свързан и е отделѐн от „%s“)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(извън клон)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: ref-filter.c:2498
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2592
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2597
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "„%s“ не сочи към позволен обект!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7210,81 +7426,81 @@
"\n"
" git branch -m ИМЕ\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "„%s“ не може да бъде получен"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "неправилно име на клон: „%s = %s“"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "игнориране на указател на обект извън клон „%s“"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "журналът с подаванията за указателя „%s“ е празен"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "указател не може да се обнови с грешно име „%s“"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
-msgstr "неуспешно обновяване на указателя „%s“: %s"
+msgstr "неуспешно обновяване на указателя (update_ref) „%s“: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "обновяванията на указатели са преустановени от кука"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
@@ -7588,7 +7804,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "грешки при записването на „%s“ (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "грешка при изчистването на буферите при записването на „%s“"
@@ -7636,8 +7852,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
@@ -7675,49 +7891,43 @@
msgid "could not determine HEAD revision"
msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-#: reset.c:70 reset.c:76 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "дървото, сочено от „%s“, не може да бъде открито"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "опциите „--unsorted-input“ и „--no-walk“ са несъвместими"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "опциите „--no-walk“ и „--unsorted-input“ са несъвместими"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
"p“ и „-s“"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "неуспешно отваряне на „/dev/null“"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "не може да се създаде асинхронна нишка: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Куката „%s“ се прескача, защото липсват права за изпълнение.\n"
-"За да изключите това предупреждение, изпълнете:\n"
-" git config advice.ignoredHook false"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7739,24 +7949,24 @@
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: неуспешно създаване на процес"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "неуспешно договаряне на изтласкване, но се продължава с изтласкването"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
"отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7764,101 +7974,149 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "пребазиране"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"след коригирането на конфликтите, отбележете съответните\n"
-"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
+"след коригирането на конфликтите, отбележете съответните пътища с:\n"
+"\n"
+" git add ПЪТ…\n"
+"\n"
+"или\n"
+"\n"
+" git rm ПЪТ…"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"след коригирането на конфликтите, отбележете съответните\n"
-"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
-"подайте резултата с командата „git commit'“."
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+" git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
+"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
+"изпълнете:\n"
+"\n"
+" git cherry-pick --abort"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+" git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+" git revert --continue\n"
+"\n"
+"Ако предпочитате да прескочите тази кръпка, изпълнете:\n"
+"\n"
+" git revert --skip\n"
+"\n"
+"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
+"изпълнете:\n"
+"\n"
+" git revert --abort"
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
@@ -7866,65 +8124,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7953,13 +8211,13 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7987,7 +8245,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -8012,356 +8270,361 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "неправилна самоличност за автор: „%s“"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "повредена информация за автор: липсва дата"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "Съобщението при подаване №1 ще бъде прескочено:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщението при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "неуспешно извличане на съобщението за подаване на „%s“"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да се чете."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "преустановяване на извършваното в момента отбиране на подавания"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "преустановяване на извършваното в момента отмяна на подаване"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "в момента вече се извършва отбиране на подавания"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
"директорията за определянето на последователността „%s“ не може да бъде "
"създадена"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "в момента не тече пребазиране"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "в момента не се извършва отбиране на подавания"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "неуспешно прескачане на подаването"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "няма какво да се прескочи"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8371,16 +8634,16 @@
"\n"
" git %s --continue"
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8399,27 +8662,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "В момента се изпълнява: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8434,11 +8697,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8455,90 +8718,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Неочакван резултат при скатаване: „%s“"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Директорията за „%s“ не може да бъде създадена"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Автоматично скатано: „%s“\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "неуспешно изпълнение на „git reset --hard“"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8550,29 +8813,29 @@
"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
"поискате.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Конфликти при прилагането на автоматично скатаното."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8595,58 +8858,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Пребазиране (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Успешно пребазиране и обновяване на „%s“.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8656,50 +8919,60 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "промените в индекса не може да бъдат подадени."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "прескачане на вече приложеното подаване „%s“"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"може да включите пропуснатите подавания с опцията „--reapply-cherry-picks“"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
@@ -8866,27 +9139,15 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "опит за ползване на частичен индекс без пътеводен режим"
-
-#: sparse-index.c:174
-msgid "unable to update cache-tree, staying full"
-msgstr "дървото на кеша не може да бъде обновено и остава пълно"
-
-#: sparse-index.c:261
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "обектът в индекса е директория, но не частично изтеглена (%08x)"
@@ -8943,13 +9204,13 @@
msgstr[0] "%u байт/сек."
msgstr[1] "%u байта/сек."
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "„%s“ не може да се редактира"
@@ -8975,7 +9236,7 @@
msgid "invalid value for %s"
msgstr "Неправилна стойност за „%s“"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
@@ -9000,22 +9261,22 @@
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в неподготвения подмодул „%s“"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -9024,12 +9285,12 @@
"Подмодулът при подаване %s на пътя „%s“ е различен от другия модул със "
"същото име, затова първият се прескача."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -9038,36 +9299,36 @@
"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се "
"изпълни в подмодула „%s“"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "процесът за подмодула „%s“ завърши неуспешно"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Изтласкване на подмодула „%s“\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде изтласкан\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Доставяне на подмодула „%s%s“\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде достъпен\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -9076,63 +9337,63 @@
"Грешки при доставяне на подмодул:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "„%s“ не е хранилище на git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "неуспешно зануляване на индекса на подмодула"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "индексът на подмодула „%s“ не е чист"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Подмодулът „%s“ не може да се обнови."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -9140,17 +9401,17 @@
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "„%s“ не може да се премести в съществуваща директория на git"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -9161,11 +9422,11 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
@@ -9187,7 +9448,7 @@
msgstr "непозната стойност „%s“ за настройката „%s“"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "стойността „%s“ се повтаря в настройките"
@@ -9202,11 +9463,11 @@
msgid "could not read input file '%s'"
msgstr "входният файл „%s“ не може да бъде прочетен"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "Не може да се получи информация чрез „stat“ за „%s“"
@@ -9278,7 +9539,7 @@
msgid "error while running fast-import"
msgstr "грешка при изпълнението на бързо внасяне"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "указателят „%s“ не може да се прочете"
@@ -9296,7 +9557,7 @@
msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола"
@@ -9305,7 +9566,7 @@
msgid "can't connect to subservice %s"
msgstr "неуспешно свързване към подуслугата „%s“"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "опцията „--negotiate-only“ изисква версия 2 на протокола"
@@ -9319,63 +9580,62 @@
msgstr ""
"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"насрещната помощна програма не поддържа изтласкване. Необходимо е "
"изброяване на указателите"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
-msgstr ""
-"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--force“"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "не може да се извърши бързо изнасяне"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "грешка при изпълнението на командата за бързо изнасяне"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9384,52 +9644,52 @@
"Няма общи указатели, не са указани никакви указатели —\n"
"нищо няма да бъде направено. Пробвайте да укажете клон.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "обект с неподдържан формат „%s“"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "неправилен отговор в списъка с указатели: „%s“"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "неуспешно четене на „%s“"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "неуспешен запис в „%s“"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "неуспешно изпълнение на нишката „%s“"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "неуспешно изпълнение на „%s“"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "неуспешно стартиране на нишка за копиране на данните"
@@ -9443,47 +9703,47 @@
msgid "could not read bundle '%s'"
msgstr "пратката на git „%s“ не може да бъде прочетена"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
"За повече информация вижте раздела „protocol.version“ в „git help config“"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "опциите на сървъра изискват поне версия 2 на протокола"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "сървърът не поддържа „wait-for-done“"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "протокол версия 2 все още не се поддържа"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "непозната стойност за настройката „%s“: „%s“"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "преносът по „%s“ не е позволен"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "командата „git-over-rsync“ вече не се поддържа"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9492,7 +9752,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9517,11 +9777,11 @@
" git push\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
@@ -9790,17 +10050,17 @@
"във файлови системи, които не различават главни от малки букви)\n"
"и само един от участниците в конфликта е в работното дърво:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Обновяване на флаговете на индекса"
-#: unpack-trees.c:2707
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"работното дърво и неследеното подаване съдържат повтарящи се обекти: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
@@ -9837,7 +10097,7 @@
msgid "Fetching objects"
msgstr "Доставяне на обектите"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
@@ -9936,17 +10196,27 @@
msgid "gitdir file points to non-existent location"
msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "променливата на средата „%s“ не може да се зададе чрез „setenv“"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "„%s“ не може да бъде отворен и за четене, и за запис"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "няма достъп до „%s“"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
@@ -10508,25 +10778,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "командата за комуникация между процеси не може да бъде пратена"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "отговорът за комуникацията между процеси не може да бъде прочетен"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "неуспешно изпълнение на „accept_thread“ върху нишката „%s“"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "не може да се стартира нишката worker[0] за „%s“"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -10535,136 +10805,136 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "правата на „%2$s“ не може да се зададат да са %1$cx"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Файлът „%s“ не може да бъде отворен за запис."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "прескачане на файловете, които не може да бъдат добавени поради грешки"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"обновяване и на записите извън пътеводния сегмент на частичното изтегляне"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "реализация на „git stash -p“"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10695,12 +10965,12 @@
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10711,56 +10981,56 @@
"\n"
" git config advice.addIgnoredFile false"
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr ""
"опцията „--dry-run“ е несъвместима с всяка от опциите „--interactive“/„--"
"patch“"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--"
"interactive“/„--patch“"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "опциите „-A“ и „-u“ са несъвместими"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "опцията „--ignore-missing“ изисква „--dry-run“"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища"
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10771,110 +11041,110 @@
"\n"
" git config advice.addEmptyPathspec false"
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Кръпките не може да бъдат разделени."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "След коригирането на този проблем изпълнете „%s --continue“."
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на "
"редовете може да се загубят."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Кръпката е празна."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "липсва ред за авторство в подаването „%s“"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "грешен ред с идентичност: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10882,24 +11152,24 @@
"Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -10907,38 +11177,38 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не може да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте:\n"
@@ -10966,17 +11236,17 @@
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10987,166 +11257,166 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Неправилна стойност за „--show-current-patch“: „%s“"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
+msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "прекарване през „git-mailinfo“"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "показване на прилаганата кръпка"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -11154,18 +11424,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11174,11 +11444,11 @@
"Открита е излишна директория „%s“.\n"
"Може да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "интерактивният режим изисква кръпки на командния ред"
@@ -11186,45 +11456,36 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "архивният файл „%s“ не може да бъде създаден"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "изходът не може да бъде пренасочен"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Липсва адрес за отдалеченото хранилище"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
"git archive: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: получен е „NACK“ — %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: протоколна грешка"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check ЛОШО ДОБРО УПРАВЛЯВАЩА_ДУМА"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11248,60 +11509,73 @@
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
+msgstr "git bisect--helper --bisect-state (ЛОШО) [ВЕРСИЯ]"
#: builtin/bisect--helper.c:30
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
+msgstr "git bisect--helper --bisect-state (ДОБРО) [ВЕРСИЯ…]"
#: builtin/bisect--helper.c:31
msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-next ИМЕ_НА_ФАЙЛ"
+msgstr "git bisect--helper --bisect-replay ИМЕ_НА_ФАЙЛ"
#: builtin/bisect--helper.c:32
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИАПАЗОН)…]"
+msgstr "git bisect--helper --bisect-skip [(ВЕРСИЯ|ДИАПАЗОН)…]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run КОМАНДА…"
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "файлът „%s“ не може да се отвори в режим „%s“"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "във файла „%s“ не може да се пише"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "файлът „%s“ не може да бъде отворен за четене"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "не може да смените значението на управляващата дума „%s“"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "използвайте две различни управляващи думи"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "В момента не се извършва двоично търсене.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "„%s“ не е подаване"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11309,27 +11583,27 @@
"първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n"
"изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "файлът „%s“ не може да бъде отворен"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s."
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11338,7 +11612,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11349,7 +11623,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "двоично търсене само по „%s“ подаване."
@@ -11358,15 +11632,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "не са указани управляващи думи"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11375,7 +11649,7 @@
"Текущите управляващи думи са: %s за старото състояние\n"
"и %s за новото състояние.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11384,56 +11658,56 @@
"на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
"Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "неуспешно настройване на обхождането на версиите\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "файлът „%s“ не може да се отвори за добавяне"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "„“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "непозната опция: %s"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "„%s“ не изглежда като указател към версия"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "Неправилен указател „HEAD“"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start "
"СЪЩЕСТВУВАЩ_КЛОН“."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
"„cogito“"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "неправилен указател: „%s“"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Започнете като изпълните командата „git bisect start“\n"
@@ -11441,108 +11715,158 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "опцията „--bisect-state“ изисква поне един аргумент"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "Командата „git bisect %s“ приема само един аргумент."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Неправилна версия: „%s“"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Неправилна версия (не е подаване): „%s“"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "В момента не се извършва двоично търсене."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr ""
"Непозната команда „%s“. Възможностите са: „start“, „skip“, „good“, „bad“ (и "
"вариантите им)"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr ""
"файлът „%s“ не може да бъде прочетен, за да се изпълнят командите от него "
"наново"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "неуспешно двоично търсене, не е зададена команда."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "изпълнение на %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"неуспешно двоично търсене: изходният код от командата „%2$s“ е %1$d — това е "
+"извън интервала [0, 128)"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "файлът „%s“ не може да бъде отворен за запис"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "двоичното търсене не може да продължи"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "успешно двоично търсене"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "двоичното търсене откри първото лошо подаване"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"неуспешно двоично търсене: „git bisect--helper --bisect-state %s“ завърши с "
+"код за грешка: %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "извеждане на управляващите думи"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "начало на двоично търсене"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "откриване на следващото подаване при двоично търсене"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "задаване на състоянието на указателя/ите"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "извеждане на стъпките на двоичното търсене досега"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "наново изпълнение на двоичното търсене чрез дадения файл"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "прескачане на някои подавания при изтегляне"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "визуализиране на двоичното търсене"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr ""
+"за автоматично определяне на състоянието при двоичното търсене да се ползва "
+"тази КОМАНДА…"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "липсва запис за „BISECT_WRITE“"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "опцията „--bisect-next“ не приема аргументи"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "опцията „--bisect-log“ не приема аргументи"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "не е зададен журнален файл"
@@ -11554,167 +11878,169 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "трябва да е цвят: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "трябва да завършва с цвят"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "неправилна стойност за „blame.coloring“"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "версията за прескачане „%s“ не може да бъде открита"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "извеждане на авторството с намирането му, последователно"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"без извеждане на имената на обектите за граничните подавания (стандартно "
"опцията е изключена)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
"началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "извеждане на статистика за извършените действия"
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "извеждане на допълнителна информация за определянето на авторството"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr ""
"извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr ""
"извеждане на първоначалния номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr ""
"извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
"използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr ""
"извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "без разлики в знаците за интервали"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "ВЕРС"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "прескачане на ВЕРСията при извеждане на авторството"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "прескачане на версиите указани във ФАЙЛа"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr ""
"оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "оцветяване на редовете по възраст"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "изчитане на версиите от ФАЙЛа, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr ""
"търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr ""
"търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "диапазон"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -11728,18 +12054,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Редове с авторство"
@@ -11840,75 +12166,75 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "не може да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr ""
"не може да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11919,183 +12245,183 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
"отдалечените клони"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "изчистване на информацията за клон-източник"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "извеждане на името на текущия клон"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12103,31 +12429,31 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -12135,7 +12461,7 @@
"опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -12143,32 +12469,32 @@
"опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--"
"set-upstream-to“"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "версия на git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "компилатор: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "библиотека на C: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "командата е стартирана извън хранилище на Git, затова няма куки\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory ФАЙЛ] [-s|--suffix ФОРМАТ]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12204,38 +12530,33 @@
"Разгледайте останалата част от доклада за грешка по-долу.\n"
"Може да изтриете редовете, които не искате да споделите.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "укажете файла, в който да се запази докладът за грешка"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "укажете суфикса на файла във формат за „strftime“"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Информация за системата"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Включени куки"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "новият файл „%s“ не може да бъде създаден"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "в „%s“ не може да се пише"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Новият доклад е създаден в „%s“.\n"
@@ -12256,54 +12577,54 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "версия на пратката"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "За създаването на пратка е необходимо хранилище."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "без подробна информация за пратките"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "Пратката „%s“ е наред\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "повече подробности. Поставя се пред подкоманда"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Разпакетиране на пратки от обекти"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12311,7 +12632,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -12319,79 +12640,79 @@
"git cat-file (--batch[=ФОРМАТ] | --batch-check[=ФОРМАТ]) [--follow-symlinks] "
"[--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "може да укажете само една пакетна опция"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта-BLOB"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "обект-BLOB"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "без подреждане на изхода от „--batch-all-objects“"
@@ -12411,7 +12732,7 @@
msgid "use .gitattributes only from the index"
msgstr "използване на файла „.gitattributes“ само от индекса"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "изчитане на имената на файловете от стандартния вход"
@@ -12419,8 +12740,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -12478,10 +12799,10 @@
msgstr "git checkout--worker [ОПЦИЯ…]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1824
-#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
-#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "НИЗ"
@@ -12575,69 +12896,69 @@
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:414
+#: builtin/checkout.c:411
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Пресъздаден е %d конфликт при сливане"
msgstr[1] "Пресъздадени са %d конфликта при сливане"
-#: builtin/checkout.c:419
+#: builtin/checkout.c:416
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "Обновен е %d път от „%s“"
msgstr[1] "Обновени са %d пътя от „%s“"
-#: builtin/checkout.c:426
+#: builtin/checkout.c:423
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "Обновен е %d път от индекса"
msgstr[1] "Обновени са %d пътя от индекса"
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:459 builtin/checkout.c:462
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "опциите „%s“ и „%s“ са несъвместими"
-#: builtin/checkout.c:469
+#: builtin/checkout.c:466
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:473
+#: builtin/checkout.c:470
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "не е указано нито „%s“, нито „%s“"
-#: builtin/checkout.c:477
+#: builtin/checkout.c:474
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:479 builtin/checkout.c:484
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:558 builtin/checkout.c:565
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12647,50 +12968,50 @@
"индекса:\n"
"%s"
-#: builtin/checkout.c:886
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:939
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:943
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12712,7 +13033,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12739,19 +13060,19 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12760,7 +13081,7 @@
"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12782,51 +13103,51 @@
"\n"
" checkout.defaultRemote=origin"
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s“ напасва с множество (%d) отдалечени клони"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "очаква се само един указател"
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "очаква се клон, а не етикет — „%s“"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "очаква се локален, а не отдалечен клон — „%s“"
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "очаква се клон, а не „%s“"
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "очаква се клон, а не подаване — „%s“"
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12834,7 +13155,7 @@
"по време на сливане не може да преминете към друг клон.\n"
"Пробвайте с „git merge --quit“ или „git worktree add“."
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12843,7 +13164,7 @@
"клон.\n"
"Пробвайте с „git am --quit“ или „git worktree add“."
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12851,7 +13172,7 @@
"по време на пребазиране не може да преминете към друг клон.\n"
"Пробвайте с „git rebase --quit“ или „git worktree add“."
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12859,7 +13180,7 @@
"по време на отбиране на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12867,139 +13188,139 @@
"по време на отмяна на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git revert --quit“ или „git worktree add“."
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "преминаване към друг клон по време на двоично търсене"
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1527
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1540
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "опциите „-%c“, „-%c“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1628
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "опциите „-p“ и „--overlay“ са несъвместими"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "липсва име на клон, използвайте опцията „-%c“"
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "„%s“ не може да бъде открит"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими"
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими"
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -13007,74 +13328,75 @@
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "трябва да укажете поне един път за възстановяване"
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "използване на припокриващ режим (стандартно)"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git switch "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "зануляване на локалните промени"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "към кой указател към дърво да се премине"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "възстановяване на индекса"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "възстановяване на работното дърво (стандартно)"
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "пренебрегване на неслетите елементи"
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "използване на припокриващ режим"
@@ -13213,8 +13535,8 @@
msgstr "изтриване на цели директории"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
@@ -13305,19 +13627,20 @@
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ИМЕ"
@@ -13333,8 +13656,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "ДЪЛБОЧИНА"
@@ -13342,8 +13665,8 @@
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "ВРЕМЕ"
@@ -13352,16 +13675,16 @@
msgstr "плитко клониране до момент във времето"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "ВЕРСИЯ"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
@@ -13393,21 +13716,21 @@
msgstr "задаване на настройките на новото хранилище"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "специфични за сървъра"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
@@ -13422,51 +13745,43 @@
"инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) "
"да съдържа само файловете в основната директория"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Името на директорията не може да бъде отгатнато.\n"
-"Задайте директорията изрично на командния ред"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13479,108 +13794,108 @@
"\n"
" git restore --source=HEAD :/\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "частичното изтегляне не може да се инициализира"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "настройките не може да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "пътят в хранилището „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не може да бъдат създадени"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13588,53 +13903,53 @@
"опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "отдалеченият транспорт върна грешка"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -13670,14 +13985,14 @@
msgid "--command must be the first argument"
msgstr "опцията „--command“ трябва да е първият аргумент"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13687,99 +14002,97 @@
"split[=СТРАТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "директория"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Графът с подаванията не може да се отвори: „%s“"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "непознат аргумент към „--split“: %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "неочакван, нешестнайсетичен идентификатор на обект: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "обхождането да започне от всички указатели"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"проверка на подаванията за индексите на пакетите изброени на командния ред"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "започване на обхождането при подаванията подадени на стандартния вход"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "включване на изчисленията за променените пътища"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "максимален брой подавания в небазово ниво на раздробен граф"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"максимално отношение на броя подавания в две последователни нива в раздробен "
"граф"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "обявяване за остарели само на файловете по-стари от това ВРЕМЕ"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "максимален брой промени в пътищата следени от филтрите на Блум"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Получаване на подаванията от входа"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "непозната подкоманда: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13793,70 +14106,65 @@
msgid "duplicate parent %s ignored"
msgstr "прескачане на повтарящ се родител: „%s“"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: „%s“ не може да се отвори"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: „%s“ не може да се прочете"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: „%s“ не може да се затвори"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "родител"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "изчитане на съобщението за подаване от ФАЙЛ"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "трябва да е точно едно дърво"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: не може да се прочете"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13868,7 +14176,7 @@
"с опцията „--allow-empty“, или да го изтриете от историята с командата:\n"
"„git reset HEAD^“.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13883,21 +14191,21 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr ""
"В противен случай използвайте командата:\n"
"\n"
" git rebase --skip\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
"В противен случай използвайте командата:\n"
"\n"
" git cherry-pick --skip\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13919,73 +14227,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
-msgstr "новият индекс не може да бъде записан"
+msgstr "новият индекс (new_index) не може да бъде записан"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "по време на пребазиране не може да се извърши частично подаване."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13993,43 +14301,43 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "опциите „-m“ и „--fixup“ са несъвместими:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14038,7 +14346,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14047,7 +14355,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14056,7 +14364,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, също ще бъдат включени — може да ги изтриете вие.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -14067,7 +14375,7 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -14082,7 +14390,7 @@
" git update-ref -d MERGE_HEAD\n"
"и опитайте отново.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -14097,78 +14405,78 @@
" git update-ref -d CHERRY_PICK_HEAD\n"
"и опитайте отново.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "епилогът не може да се подаде на „--trailers“"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
"В момента се извършва сливане, не може да промените съобщение при подаване."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr ""
"В момента се извършва отбиране на подаване, не може да промените съобщение "
"при подаване."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
"опцията за промяна на съобщението на „--fixup“ и указването на път „%s“ са "
"несъвместими"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -14176,107 +14484,107 @@
"опцията за промяна на съобщението на „--fixup“ и „--patch“/„--interactive“/"
"„--all“/„--include“/„--only“ са несъвместими"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не може да поправяте."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не може да поправяте."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "В момента се извършва пребазиране, не може да поправяте."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "непозната опция: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14285,11 +14593,11 @@
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14298,197 +14606,197 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]подаване"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа или за промяна на подаването или съобщението"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr "епилог"
+msgstr "ЕПИЛОГ"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
-msgstr "добовяне на друг епилог"
+msgstr "добавяне на друг ЕПИЛОГ"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "добавяне на епилог за подпис „Signed-off-by“"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1747
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1754
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1775
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1782
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1798
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1834
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14756,7 +15064,7 @@
#: builtin/config.c:684
msgid "$HOME not set"
-msgstr "променливата „HOME“ не е зададена"
+msgstr "стойността „$HOME“ не е зададена"
#: builtin/config.c:708
msgid ""
@@ -14764,7 +15072,7 @@
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-"опцията „--worktre“ не приема множество работни дървета, преди\n"
+"опцията „--worktree“ не приема множество работни дървета, преди\n"
"включването на разширението в настройките „worktreeConfig“. За\n"
"повече информация вижте раздела „CONFIGURATION FILE“ в\n"
"„git help worktree“"
@@ -14865,10 +15173,10 @@
#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-"демонът за кеша с идентификациите е недостъпен — липсва поддръжка на гнезда "
-"на unix"
+"демонът за кеша с идентификациите е недостъпен (credential-cache--daemon) — "
+"липсва поддръжка на гнезда на unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
"кешът с идентификациите е недостъпен — липсва поддръжка на гнезда на unix"
@@ -15049,7 +15357,7 @@
#: builtin/diff-tree.c:155
msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "опциите „-stdin“ и „--merge-base“ са несъвместими"
+msgstr "опциите „--stdin“ и „--merge-base“ са несъвместими"
#: builtin/diff-tree.c:157
msgid "--merge-base only works with two commits"
@@ -15074,7 +15382,7 @@
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
@@ -15098,115 +15406,115 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "неуспешно действие с изходен код: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "неуспешно действие с изходен код: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
-"ненулев код"
+"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА за разлики "
+"завърши с ненулев код"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "подава се към „diff“"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
@@ -15214,7 +15522,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕНЛИВИ"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "ВИД"
@@ -15246,100 +15554,100 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "опцията „--anonymize-map“ изисква аргумент"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"как да се обработват съобщенията за подаване, които са в друго кодиране"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "внасяне на маркерите от този ФАЙЛ, ако съществува"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr ""
"да се използва изкуствено име на човек при липса на създател на етикета"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "ОТ:КЪМ"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "заместване ОТ със КЪМ в анонимизирания изход"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"указване на родителите, които не са в потока на бързо изнасяне, с "
"идентификатор на обект"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "задаване на идентификатори на маркери на етикетите"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "опцията „--anonymize-map“ изисква „--anonymize“"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими"
@@ -15397,15 +15705,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "задаване на клон за следене за издърпване/доставяне"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
@@ -15413,7 +15721,7 @@
msgid "use atomic transaction to update references"
msgstr "изискване на атомарни операции за обновяване на указателите"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
@@ -15425,7 +15733,7 @@
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
@@ -15443,7 +15751,7 @@
"промяна на указателя, така че и той, както останалите, да бъде в „refs/"
"prefetch/“"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
@@ -15453,7 +15761,7 @@
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
"хранилище и презаписване на променените"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "ПРИ НУЖДА"
@@ -15465,7 +15773,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "запазване на доставените указатели във файла „FETCH_HEAD“"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
@@ -15473,16 +15781,16 @@
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
@@ -15498,19 +15806,19 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти може са достижими при започване от този"
@@ -15524,7 +15832,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "изпълняване на „maintenance --auto“ след доставяне"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "проверка за принудителни обновявания на всички клони"
@@ -15540,62 +15848,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[актуален]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15606,7 +15914,7 @@
"\n"
" git config fetch.showForcedUpdates true"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15620,23 +15928,23 @@
"\n"
" git config fetch.showForcedUpdates false\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на „%s“, защото плитките върхове не може да бъдат обновявани"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15646,57 +15954,62 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "обектът „%s“ не съществува"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "непознат вид клон"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15704,22 +16017,22 @@
"не е открит клон за следене.\n"
"Трябва изрично да зададете един клон с опцията „--set-upstream option“."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15727,70 +16040,70 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
"Опцията „--negotiate-only“ изисква една или повече опции „--negotiate-tip=*“"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "опциите „--deepen“ и „--depth“ са несъвместими"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "не може да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "към „git fetch --all“ не може да добавите аргумент-указател на версия"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "опцията „--negotiate-only“ изисква хранилище"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Протоколът не поддържа опцията „--negotiate-only“, изход от прогамата."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
-"настройката „extensions.partialClone“"
+"настройката „extensions.partialclone“"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "опцията „--stdin“ поддържа доставяне само от едно отдалечено хранилище"
@@ -15858,7 +16171,7 @@
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
@@ -15886,15 +16199,15 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "настройка"
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr "настройка, която съдържа списък с пътища към хранилища"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "липсва --config=НАСТРОЙКА"
@@ -16014,130 +16327,140 @@
msgid "notice: No default references"
msgstr "внимание: няма указатели по подразбиране"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: разлика в контролната сума при: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
-msgstr "„%s“: липсващ обект: „%s“"
+msgstr "%s: развален или липсващ обект: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: обектът е непознат вид „%s“: %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "„%s“: не може да се анализира: „%s“"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "неправилен ред с контролна сума по SHA1: „%s“"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Проверка на директория с обекти"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Проверка на връзките на „%s“"
#
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "неправилен указател „%s“"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "„%s“ сочи към нещо необичайно (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Проверка на дървото на кеша"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "в дървото на кеша има нещо, което не е дърво"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Проверка на обектите"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "„%s“: липсващ обект"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
@@ -16161,7 +16484,7 @@
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -16170,14 +16493,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\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"
+"При последното изпълнение на „git gc“ бе докладвано следното — коригирайте\n"
+"причината за него и изтрийте „%s“.\n"
"Автоматичното изчистване на боклука няма да работи, преди да изтриете "
"файла.\n"
"\n"
@@ -16265,153 +16587,192 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "непознат аргумент към „--schedule“: %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "графът с подаванията не може да бъде записан"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "неуспешно предварително доставяне на отдалечените клони"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "процесът за командата „git pack-objects“ не може да бъде стартиран"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "процесът за командата „git pack-objects“ не може да завърши"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "индексът за множество пакети не може да бъде записан"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index expire“"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "неуспешно изпълнение на „git multi-pack-index repack“"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"задачата „incremental-repack“ се прескача, защото настройката „core."
"multiPackIndex“ е изключена"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "заключващият файл „%s“ съществува. Действието се прескача"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "неуспешно изпълнение на задачата „%s“"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s“ не е правилна задача"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "задачата „%s“ не може да се избере повече от веднъж"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "изпълняване на задачи според състоянието на хранилището"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "честота"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "изпълняване на задачи по график"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "без извеждане на напредъка и друга информация на стандартния изход"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "задача"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "изпълнение на определена задача"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
-"може да се указва максимум една от опциите „--auto“ и „--schedule=ЧЕСТОТА“"
+msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТА“ са несъвместими"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "неуспешно изпълнение на „git config“"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "грешка при заместването на пътя „%s“"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "неуспешно стартиране на „launchctl“."
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "услугата „%s“ не може се настрои първоначално"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "неуспешно създаване на временен файл за xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "задачите за периодично изпълнение не може да се стартират"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа "
"„cron“"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "стандартният вход на „crontab“ не може да се отвори"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "процесът на „crontab“ умря"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "неуспешно стартиране на „systemctl“"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "неуспешно изпълнение на „systemctl“"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "неуспешно изтриване на „%s“"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "непознат аргумент към „--scheduler“: %s"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "липсват както таймери на systemd, така и crontab"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "планиращият модул „%s“ липсва"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "друг процес задава поддръжката на заден фон"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=ПЛАНИРАЩ_МОДУЛ]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "ПЛАНИРАЩ_МОДУЛ"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "ПЛАНИРАЩият_МОДУЛ, който да изпълнява задачите"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "неуспешно добавяне на хранилище към файла с глобални настройки"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "неправилна подкоманда: „%s“"
@@ -16420,12 +16781,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -16434,275 +16795,275 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
-msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
+msgstr "опциите „--no-index“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "опциите „--untracked“ и „--cached“ са несъвместими"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16710,97 +17071,109 @@
"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] "
"ФАЙЛ…"
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "ВИД на обекта"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "записване на обекта в базата от данни за обектите"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "изчитане на обекта от стандартния вход"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "запазване на файла както е — без филтри"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"създаване и изчисляване на контролни суми на произволни данни за повредени "
"обекти за трасиране на Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "обработване на ФАЙЛа все едно е с този път"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "показване на всички налични команди"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "без въведения"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "показване на списък с въведения"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "показване на имената на всички конфигуриращи променливи"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "показване на страница от ръководството"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "показване на страница от ръководството в уеб браузър"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "показване на информационна страница"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "извеждане на описанието на команда"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМАНДА]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "показване на списък с въведения"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "показване на имената на всички конфигуриращи променливи"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [КОМАНДА]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "непознат формат на помощта „%s“"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Неуспешно стартиране на „emacsclient“."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Версията на „emacsclient“ не може да се анализира."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16809,7 +17182,7 @@
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16818,342 +17191,327 @@
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "неправилен низ за настройката „alias.%s“: „%s“"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "опцията не приема аргументи"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "За повече информация изпълнете „git help config“"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетният файл „%s“ не може да бъде създаден"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "пакетният файл „%s“ не може да бъде отворен"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт"
msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект-BLOB „%s“"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "грешка при проверката на пакетирани обекти"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не може да бъдат достигнати"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr ""
-"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
-"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка във функцията „parse_pack_objects“"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
-msgstr ""
-"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
-"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "действието завърши с %d локален обект"
msgstr[1] "действието завърши с %d локални обекта"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "името на пакетния файл „%s“ не завършва с „%s“"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "временният файл „*.%s“ не може да се преименува на „%s“"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "пакетният файл не може да бъде запазен"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "файлът за индекса не може да бъде съхранен"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "дължината на веригата е %d: %lu обект"
msgstr[1] "дължината на веригата е %d: %lu обекта"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "непознат алгоритъм за контролни суми „%s“"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "опцията „--object-format“ и „--stdin“ са несъвместими"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "грешка при проверка с „fsck“ на пакетните обекти"
@@ -17365,7 +17723,7 @@
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
-msgstr "опцията „--trailer“ е несъвместима с „--name-only“"
+msgstr "опцията „--trailer“ е несъвместима с „--only-input“"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
@@ -17738,7 +18096,7 @@
#: builtin/log.c:1933
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
+msgstr "опциите „--subject-prefix“/„--rfc“ и „-k“ са несъвместими"
#: builtin/log.c:1941
msgid "--name-only does not make sense"
@@ -17815,131 +18173,135 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "разделяне на пътищата с нулевия знак „NUL“"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "малки букви за файловете за командата „fsmonitor clean“"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "изчитане на шаблоните за игнориране от ФАЙЛ"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "без повтаряне на записите"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМАНДА]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "КОМАНДА"
@@ -18012,9 +18374,7 @@
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr ""
-"git mailinfo [ОПЦИЯ…] СЪОБЩЕНИЕ КРЪПКА < ПИСМО >ИНФОРМАЦИЯ\n"
-"git diff --no-index ПЪТ ПЪТ"
+msgstr "git mailinfo [ОПЦИЯ…] СЪОБЩЕНИЕ КРЪПКА < ПИСМО >ИНФОРМАЦИЯ"
#: builtin/mailinfo.c:58
msgid "keep subject"
@@ -18063,7 +18423,7 @@
msgid "use headers in message's body"
msgstr "заглавни части в тялото на писмото"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
@@ -18180,146 +18540,146 @@
msgid "Merging %s with %s\n"
msgstr "Сливане на „%s“ с „%s“\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "опцията „%s“ изисква стойност"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
-msgstr "преустановяване без промяна на индекса и работното дърво"
+msgstr "преустановяване (--abort) без промяна на индекса и работното дърво"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и сливане и при промяна на "
"съобщението за подаване (pre-merge-commit и commit-msg)"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Вече е обновено (няма какво да се вкара)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
@@ -18330,38 +18690,38 @@
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:602
+#: builtin/merge.c:603
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:728
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:741
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
+msgid "unknown strategy option: -X%s"
+msgstr "непозната опция за стратегия: -X%s"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:812
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:821
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:827
+#: builtin/merge.c:829
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"
@@ -18370,11 +18730,11 @@
"В съобщението при подаване добавете информация за причината за\n"
"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-#: builtin/merge.c:832
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Празно съобщение предотвратява подаването.\n"
-#: builtin/merge.c:835
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18383,76 +18743,76 @@
"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
"съобщение преустановява подаването.\n"
-#: builtin/merge.c:888
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:903
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:964
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:1003
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:1005
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:1012
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1069
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1172
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1320
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "опцията „--quit“ не приема аргументи"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1371
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18460,7 +18820,7 @@
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1378
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18468,100 +18828,94 @@
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1381
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1395
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "опциите „--squash“ и „--no-ff“ са несъвместими."
-#: builtin/merge.c:1397
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "опциите „--squash“ и „--commit“ са несъвместими."
-#: builtin/merge.c:1413
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1430
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-"Понеже върхът е без история, всички сливания са превъртания, не може да се "
-"извърши същинско сливане изисквано от опцията „--no-ff“"
+"Понеже върхът е без история, сливания, които не са превъртания, са невъзможни"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Може да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Не може да се извърши превъртане, преустановяване на действието."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1655
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1718
+#: builtin/merge.c:1732
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-"Автоматичното сливане завърши успешно. Самото подаване не е извършено, "
-"защото бе зададена опцията „--no-commit“.\n"
+"Автоматичното сливане завърши успешно. Самото подаване не е извършено\n"
#: builtin/mktag.c:10
msgid "git mktag"
@@ -18592,15 +18946,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "обектът „%s“ е с етикет за %s, но е %s"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "етикетът на стандартния вход не преминава строгата проверка с „fsck“"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "етикетът на стандартния вход не сочи към правилен обект"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
@@ -18621,37 +18975,55 @@
msgstr "разрешаване на създаването на повече от едно дърво"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=ПАКЕТ] [--refs-"
+"snapshot=ПЪТ]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [ОПЦИЯ…] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [ОПЦИЯ…] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [ОПЦИЯ…] repack [--batch-size=РАЗМЕР]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със "
"съответния им индекс"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "предпочитан_пакет"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
"пакет, който да се преизползва при изчисляване на многопакетна битовата маска"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "запазване на многопакетната битова маска"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+"запазване на битовата маска за множество пакети, съдържаща само дадените "
+"индекси"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "снимка на указателите за избор на подавания по битова маска"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18659,11 +19031,6 @@
"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
"се обединяват в пакети с по-голям от този размер"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "непозната подкоманда: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
@@ -18692,72 +19059,72 @@
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ съществува и не е директория"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "конфликт"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
@@ -18938,48 +19305,48 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "действието „show“ не може да се завърши за обект „%s“"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "задайте съдържанието на бележката с някоя от опциите „-m“ или „-F“"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "обектът-бележка не може да бъде записан"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "обектът „%s“ не може да бъде прочетен."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
"съдържанието на бележка не може да се вземе от обект, който не е BLOB: „%s“."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "входен ред с неправилен формат: „%s“."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "бележката не може да се копира от „%s“ към „%s“"
@@ -18987,50 +19354,50 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/"
"notes/“."
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "прекалено много аргументи"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "няма бележки за обекта „%s“."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "низ, който е съдържанието на бележката"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "ФАЙЛ със съдържанието на бележката"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на указания ОБЕКТ-бележка"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "преизползване на указания ОБЕКТ-бележка"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "замяна на съществуващите бележки"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19039,31 +19406,31 @@
"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "изчитане на обектите от стандартния вход"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
"опцията „--stdin“)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "прекалено малко аргументи"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19072,12 +19439,12 @@
"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "няма бележки за обекта-източник „%s“. Не може да се копира."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19088,52 +19455,52 @@
"Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "неуспешно сливане на бележките"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "непозната стратегия за сливане на бележки „%s“"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -19143,46 +19510,46 @@
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "трябва да укажете указател към бележка за сливане."
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19193,41 +19560,41 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
@@ -19279,87 +19646,91 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "очаква се обект при отместване %<PRIuMAX> в пакетния файл „%s“"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "неуспешно записване на индекси на база битови маски"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Преброяване на обектите"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "обектът „%s“ не може да се прочете"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "неоптимизиран пакет — паметта свърши"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Делта компресията ще използва до %d нишки"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
"обектите, които може да бъдат достигнати от етикета „%s“, не може да бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "неправилен брой разлики"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19368,7 +19739,7 @@
"стойността на „uploadpack.blobpackfileuri“ трябва да е във формат "
"„СУМА_НА_ОБЕКТ СУМА_НА_ПАКЕТ АДРЕС“ (получена е „%s“)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19376,17 +19747,18 @@
"вече има настройка за обекта в друг ред „uploadpack."
"blobpackfileuri“ (получена е „%s“)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "видът на обекта „%s“ в пакет „%s“ не може да бъде определен"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "пакетът „%s“ не може да се открие"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19395,7 +19767,7 @@
"очаква се идентификатор на краен обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19404,264 +19776,264 @@
"очаква се идентификатор на обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "неправилна стойност за „--missing“"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "индексът на пакетния файл не може да бъде отворен"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да бъде наложено"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "неправилна версия „%s“"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "скорошните обекти не може да бъдат добавени"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които може да се достигнат от произволен указател"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "изчитане на пакетите от стандартния вход"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "използване на алгоритъм за частична достижимост"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "пропускане на този пакет"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "запазване и на индекс на база битова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "записване на индекси на база битови маски при възможност"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "как да се обработват липсващите обекти"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "без пакетиране на обекти в гарантиращи пакети"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "без промяна на групите при делта компресия"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "протокол"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "без ползване на настройки „uploadpack.blobpackfileuri“ с този протокол"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
"Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се "
"ползва %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
"файлове за пренос"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "минималният размер на пакетите е 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
-msgstr "опцията „-filter“ изисква „-stdout“"
+msgstr "опцията „--filter“ изисква „--stdout“"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
-msgstr "опциите „-filter“ и „--stdin-packs“ са несъвместими"
+msgstr "опциите „--filter“ и „--stdin-packs“ са несъвместими"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"вътрешният списък на указатели и опцията „--stdin-packs“ са несъвместими"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19716,7 +20088,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
@@ -19729,44 +20101,50 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
+"дали куките преди подаване и сливане и при промяна на съобщението за "
+"подаване (pre-merge-commit и commit-msg) да се изпълнят"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19774,14 +20152,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19789,7 +20167,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19800,43 +20178,43 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Ако искате да зададете информация за следен клон, може да направите това с "
"командата:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19845,20 +20223,20 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19870,8 +20248,8 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Не се насърчава издърпване без указване на стратегията за съгласуване на\n"
-"клоните. За да заглушите това съобщение, изпълнете някоя от следните\n"
+"Някои от клоните са се раздалечили и трябва да укажете как да се решава\n"
+"това. За да заглушите това съобщение, изпълнете някоя от следните\n"
"команди преди следващото издърпване:\n"
"\n"
" git config pull.rebase false # сливане (стандартна стратегия)\n"
@@ -19883,19 +20261,19 @@
"използвайте опциите „--rebase“, „--no-rebase“, „--ff-only“. Те са с\n"
"приоритет пред настройките.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19905,7 +20283,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19922,15 +20300,24 @@
" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Не може да превъртите към повече от един клон."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+"Трябва да укажете как да се решават разликите при разминаване на клоните."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -20120,15 +20507,15 @@
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
@@ -20140,19 +20527,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr ""
"изискване обновяванията в отдалечените хранилища да се внасят и в локалното"
@@ -20161,12 +20548,12 @@
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "програма за получаването на пакети"
@@ -20188,11 +20575,11 @@
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
@@ -20304,83 +20691,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -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=ФАЙЛ_С_ИЗКЛЮЧЕНИЯ] | -i]] [--no-sparse-"
-"checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 "
-"[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=ФАЙЛ] (--empty | "
+"УКАЗАТЕЛ_КЪМ_ДЪРВО_1 [УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "запазване на индекса в този ФАЙЛ"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "само зануляване на индекса"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Сливане"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "да се извърши и сливане след освен изчитането"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "тройно сливане, ако не се налага пофайлово сливане"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "обновяване на работното дърво с резултата от сливането"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "без проверка на работното дърво след сливането"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "без обновяване и на индекса, и на работното дърво"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "без прилагане на филтъра за частично изтегляне"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "изчистване на грешки в командата „unpack-trees“"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "без информационни съобщения"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Първо трябва да коригирате индекса си"
@@ -20402,197 +20788,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "не може да се създаде временна директория „%s“"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "невъзможно задаване на интерактивна работа"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "файлът с командите не може да се генерира"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [ОПЦИЯ…]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "запазванe на първоначално празните подавания"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "позволяване на празни съобщения при подаване"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "пребазиране на подаванията със сливания"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-"запазване на първоначалните точки на разклоняване на сестринските клони"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "подписване на подаванията"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "извеждане на статистика с промените в следения клон"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "продължаване на пребазирането"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "прескачане на подаване"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "редактиране на списъка с команди за изпълнение"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "извеждане на текущата кръпка"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "съкратени идентификатори в списъка за изпълнение"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "пълни идентификатори в списъка за изпълнение"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "проверка на списъка за изпълнение"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-"преподреждане на редовете за вкарване на подаванията подаванията в "
-"предходните им със и без смени на съобщението"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "върху"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "подаване на източника"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "стратегия на пребазиране"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "опции на стратегията"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "опции на стратегията"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "преминаване към"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "клонът, към който да се премине"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "име на база"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "име на база"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "команда"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "команда за изпълнение"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "„%s“ изисква пребазиране"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20606,7 +20839,7 @@
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20624,7 +20857,7 @@
"\n"
"В резултат те не може да се пребазират."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20633,7 +20866,7 @@
"неправилна стойност „%s“: вариантите са „drop“ (прескачане), "
"„keep“ (запазване) и „ask“ (питане)"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20650,7 +20883,7 @@
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20663,192 +20896,202 @@
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "командите за изпълнение не може да съдържат нови редове"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "празна команда за изпълнение"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "за текуща база да се ползва базата за сливане на клона и следеното"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "извеждане на статистика с промените в следения клон"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "добавяне на епилог за подпис „Signed-off-by“ към всяко подаване"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "датата на подаващия да отговаря на датата на автора"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "да се ползва днешна дата, а не тази на автора"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "псевдоним на „--reset-author-date“"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "без промени в празните знаци"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "при пребазиране да се ползва стратегия с прилагане"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия със сливане"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "как да се обработват оказалите се празни подавания"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавания"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
"преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
" git merge-base --fork-point"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "прилагане на всички промени, дори и наличните вече в следеното"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
+"Изглежда, че сега се прилагат кръпки чрез командата „git am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
-"нея."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "Опцията „--preserve-merges“ е заменена с „--rebase-merges“."
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "опциите „--keep-base“ и „--onto“ са несъвместими"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "опциите „--keep-base“ и „--root“ са несъвместими"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "опциите „--root“ и „--fork-point“ са несъвместими"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20856,16 +21099,16 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не може да бъдат занулени"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20886,147 +21129,136 @@
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "опциите за „apply“ са несъвместими с опциите за сливане"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Непозната реализация на пребазиране: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
"interactive“"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
-"несъвместими"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s“: изисква се точно една база за сливане с клона"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
+msgid "no such branch/commit '%s'"
+msgstr "не съществува клон/подаване „%s“"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която "
"пребазирате…\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -21059,7 +21291,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -21080,11 +21312,11 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
@@ -21124,7 +21356,7 @@
msgid "%s points nowhere!"
msgstr "„%s“ не сочи наникъде!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "не е указан журнал с подавания за изтриване"
@@ -21284,7 +21516,7 @@
"указването на следени клони е смислено само за отдалечени хранилища, от "
"които се доставя"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "вече съществува отдалечено хранилище с име „%s“."
@@ -21294,25 +21526,30 @@
msgid "Could not setup master '%s'"
msgstr "Основният клон „%s“ не може да бъде настроен"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "„branch.%s.rebase=%s“ не се поддържа. Приема се „true“ (истина)"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Обектите за доставяне за указателя „%s“ не може да бъдат получени"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(съвпадащи)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "„%s“ не може да се зададе"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21323,17 +21560,17 @@
" %s:%d\n"
"използва отдалечено хранилище, което вече не съществува: „%s“"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21344,17 +21581,17 @@
" %s\n"
" Променете настройките ръчно, ако е необходимо."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21368,121 +21605,121 @@
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече "
-"от 1 клон"
+"неправилен клон за сливане „branch.%s.merge“. Невъзможно е да пребазирате "
+"върху повече от 1 клон"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с отдалечения клон „%s“\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "може да се превърти"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(без адрес)"
@@ -21490,25 +21727,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(без проверка)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(непознат)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21517,161 +21754,165 @@
"хранилище\n"
" не е еднозначен и е някой от следните):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адресите за изтласкване, а не за доставяне"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "извеждане на всички адреси"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "изтриване на адреси"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "повече подробности. Поставя се пред подкоманда"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [ОПЦИЯ…]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21680,154 +21921,167 @@
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "грешка при отваряне на индекса за „%s“"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "пакет „%s“ е твърде голям, за да е част от геометрична прогресия"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "пакет „%s“ е твърде голям за свиване"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "временният файл „%s“ не може да бъде отворен за запис"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "временният файл със снимка на указателите не може да се затвори"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "откриване на геометрична прогресия с частно <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "запазване на многопакетен индекс за създадените пакети"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "опциите „--geometric“ и „-A“/„-a“ са несъвместими"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "липсва задължителния файл „%s“"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "неуспешно изтриване на „%s“"
@@ -22138,96 +22392,96 @@
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--"
"soft“"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "опцията „-N“ изисква опцията „--mixed“"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -22240,12 +22494,12 @@
"Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n"
"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
@@ -22426,15 +22680,19 @@
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подавания"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "позволяване на празни съобщения при подаване"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
@@ -22487,72 +22745,73 @@
msgstr[0] "следният файл е с променено съдържание"
msgstr[1] "следните файлове са с променено съдържание"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "да не се извеждат изтритите файлове"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "изтриване само от индекса"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "въпреки проверката за актуалността на съдържанието"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "рекурсивно изтриване"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr ""
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Не са зададени пътища. Кои файлове да се изтрият?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"за да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
"или ги скатайте"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да се изтрие"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
-"pack=ПАКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКАЗАТЕЛ…]\n"
-" опцията „--all“ и изричното посочване на УКАЗАТЕЛ са взаимно несъвместими."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=ПАКЕТ]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [ХОСТ:]ДИРЕКТОРИЯ (--all | УКАЗАТЕЛ…])"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "име на отдалечено хранилище"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "използване на протокол без запазване на състоянието за RPC"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "извеждане на състоянието от отдалечената помощна функция"
@@ -22609,21 +22868,21 @@
msgid "group by field"
msgstr "групиране по поле"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "прекалено много аргументи извън хранилище"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-" [--current] [--color[=КОГА] | --no-color] [--sparse]\n"
-" [--more=БРОЙ | --list | --independent | --merge-base]\n"
-" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКАЗАТЕЛ)…]"
+" [--current] [--color[=КОГА] | --no-color] [--sparse]\n"
+" [--more=БРОЙ | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УКАЗАТЕЛ)…]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22636,117 +22895,117 @@
msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател"
msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "никой указател не съвпада с „%s“"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "извеждане на следящите и локалните клони"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "извеждане на следящите клони"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветяване на „*!+-“ според клоните"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "псевдоним на „more=-1“"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "включване и на текущия клон"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "именуване на подаванията с имената им на обекти"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за сливания"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недостижимите указатели"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "извеждане на подаванията в топологическа подредба"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "извеждане само на подаванията, които не са от първия клон"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "извеждане на сливанията, които може да се достигнат само от един връх"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БАЗА]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
"independent“ и „--merge-base“"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
-msgstr "опцията „--track“ изисква точно едно име на клон"
+msgstr "опцията „--reflog“ изисква точно едно име на клон"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "само %d запис може да бъде показан наведнъж."
msgstr[1] "само %d записа може да бъде показани наведнъж."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "не може да се обработи повече от %d указател."
msgstr[1] "не може да се обработят повече от %d указатели."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
@@ -22820,72 +23079,86 @@
msgstr ""
"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"директорията „%s“ съдържа неследени файлове, но не е в пътищата на "
+"пътеводното напасване на частичното изтегляне"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "директорията „%s“ не може да бъде изтрита"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"настройката „worktreeConfig“ не може да се включи, защото форматът на "
"хранилището не може да се обнови"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "инициализиране на частичното изтегляне в пътеводен режим"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "превключване на ползването на частичен индекс"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "настройките на частичния индекс не може да се променят"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "„%s“ не може да се отвори"
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "пътят „%s“ не може да се нормализира"
-#: builtin/sparse-checkout.c:431
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)"
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено"
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "шаблоните за частично изтегляне не може да се заредят"
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "изчитане на шаблоните от стандартния вход"
-#: builtin/sparse-checkout.c:594
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:613
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "грешка при обновяване на работната директория"
@@ -22921,7 +23194,7 @@
" [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n"
" [--] [ПЪТ…]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22951,6 +23224,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n"
" [--] [ПЪТ…]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22974,7 +23255,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "командата „git stash clear“ не поддържа аргументи"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22985,168 +23266,168 @@
" „%s“ на „%s“\n"
" за да се направи място.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "по време на сливане не може да приложите нещо скатано"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "файлът с разликите „%s^!“ не може да се генерира"
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr ""
"в индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "дървото сочено от индекса не може да бъде запазено"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "неследени файлове не може да се възстановят от скатаното"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Сливане на „%s“ с „%s“"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Индексът не е изваден от скатаното."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "неследени файлове не може да се възстановят от скатаното"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "опит за повторно създаване на индекса"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Изтрито: „%s“ (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "Скатаното „%s“ не може да бъде изтрито"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s“ не е указател към нещо скатано"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "дървото не може да бъде анализирано"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "дървото не може да бъде разпакетирано"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "извеждане само на неследените файлове в скатаното"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не може да се запазят"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не може да бъдат занулени"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -23170,7 +23451,7 @@
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
@@ -23185,59 +23466,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-msgid "alternative anchor for relative paths"
-msgstr "директория за определянето на относителните пътища"
-
-#: builtin/submodule--helper.c:414
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
-
-#: builtin/submodule--helper.c:524
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "Влизане в „%s“\n"
-
-#: builtin/submodule--helper.c:527
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"изпълнената команда завърши с ненулев изход за „%s“\n"
-"."
-
-#: builtin/submodule--helper.c:549
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"изпълнената команда завърши с ненулев изход при обхождане на подмодулите, "
-"вложени в „%s“\n"
-"."
-
-#: builtin/submodule--helper.c:565
-msgid "suppress output of entering each submodule command"
-msgstr "без извеждане на изход при въвеждането на всяка команда за подмодули"
-
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
-msgid "recurse into nested submodules"
-msgstr "рекурсивно обхождане на подмодулите"
-
-#: builtin/submodule--helper.c:572
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
-
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:211
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -23246,55 +23475,107 @@
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+msgid "alternative anchor for relative paths"
+msgstr "директория за определянето на относителните пътища"
+
+#: builtin/submodule--helper.c:410
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:520
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Влизане в „%s“\n"
+
+#: builtin/submodule--helper.c:523
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"изпълнената команда (run_command) завърши с ненулев изход за „%s“\n"
+"."
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"изпълнената команда (run_command) завърши с ненулев изход при обхождане на "
+"подмодулите, вложени в „%s“\n"
+"."
+
+#: builtin/submodule--helper.c:561
+msgid "suppress output of entering each submodule command"
+msgstr "без извеждане на изход при въвеждането на всяка команда за подмодули"
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
+msgid "recurse into nested submodules"
+msgstr "рекурсивно обхождане на подмодулите"
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
+
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "без изход за състоянието на подмодула"
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -23302,100 +23583,100 @@
"използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "● %s %s(обект-BLOB)→%s(подмодул)"
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "● %s %s(подмодул)→%s(обект-BLOB)"
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "неуспешно изчисляване на контролната сума на обект от „%s“"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "неочакван режим „%o“\n"
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
"сравнение на подаването указано в индекса с това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "прескачане на подмодули, чиято настройка „ignore_config“ е „all“"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "ограничаване на размера на обобщението"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] -- [ПЪТ]"
+msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДАВАНЕ] [--] [ПЪТ]"
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "не може да се достави версия за „HEAD“"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "опциите „--cached“ и „--files“ са несъвместими"
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Синхронизиране на адреса на подмодул за „%s“\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "без извеждане на информация при синхронизирането на подмодул"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23404,7 +23685,7 @@
"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23413,47 +23694,47 @@
"Работното дърво на подмодул „%s“ съдържа локални промени. Може да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23465,47 +23746,70 @@
"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“."
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1771
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
+"друг подмодул"
+
+#: builtin/submodule--helper.c:1812
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
+
+#: builtin/submodule--helper.c:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "директорията не е празна: „%s“"
+
+#: builtin/submodule--helper.c:1829
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "директорията на подмодула „%s“ не може да бъде получена"
+
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "предотвратяване на клониране в непразна история"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23514,108 +23818,185 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ"
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на "
-"друг подмодул"
-
-#: builtin/submodule--helper.c:1884
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-
-#: builtin/submodule--helper.c:1888
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "директорията не е празна: „%s“"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "директорията на подмодула „%s“ не може да бъде получена"
-
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Неуспешно изтегляне на версия „%s“ в пътя към подмодул „%s“'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Неуспешно пребазиране на версия „%s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Неуспешно сливане на версия „%s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Неуспешно изпълнение на командата „%s %s“ в пътя към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Път към подмодул „%s“: изтеглена е версия „%s“\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Път към подмодул „%s“: слят в „%s“\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Пътят на подмодула „%s“: „%s %s“\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Неуспешно доставяне в пътя към подмодул „%s“, опит за директно доставяне на "
+"„%s“"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Подмодулът в пътя „%s“ е доставен, но не съдържа обекта със сума\n"
+"„%s“. Директното доставяне на това подаване е неуспешно."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "извършване на плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+"без извеждане на информация при обновяване чрез пребазиране или сливане"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "принудително изтегляне на обновленията"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "без доставяне на новите обекти от отдалеченото хранилище"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"различен режим на обновяване, когато хранилището е чисто ново изтеглено"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "дълбочина на плиткото доставяне"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "сума по SHA1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "сумата по SHA1, очаквана от обхващащия модул"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "сумата по SHA1 на подмодула"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "сумата по SHA1 за указателя HEAD на подмодула"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [ОПЦИЯ…] [ПЪТ]"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23624,83 +24005,192 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "изтриване на настройка във файла „.gitmodules“"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset ИМЕ"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "без извеждане на информация при задаването на адреса на подмодул"
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [НОВ_ПЪТ]"
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "задаване на стандартния следящ клон да е „master“"
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "задаване на стандартния следящ клон"
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ПЪТ"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) КЛОН ПЪТ"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "необходимо е една от опциите „--branch“ и „--default“"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "опциите „--branch“ и „--default“ са несъвместими"
-#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3037
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Добавяне на съществуващото хранилище в „%s“ към индекса\n"
+
+#: builtin/submodule--helper.c:3040
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "„%s“ съществува, а не е хранилище на Git"
+
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Открита е локална директория на Git — „%s“, която сочи към отдалечените "
+"хранилища:\n"
+
+#: builtin/submodule--helper.c:3060
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"Ако искате да преизползвате тази локална директория на git, вместо да\n"
+"клонирате отново:\n"
+" %s\n"
+"използвайте опцията „--force“. Ако локалната директория на git не е\n"
+"правилното хранилище или ако не знаете какво означава това, използвайте\n"
+"друго име като аргумент към опцията „--name“."
+
+#: builtin/submodule--helper.c:3072
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Активиране на локалното хранилище за подмодула „%s“ наново.\n"
+
+#: builtin/submodule--helper.c:3109
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Подмодулът „%s“ не може да бъде изтеглен"
+
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Неуспешно добавяне на подмодула „%s“"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Неуспешно регистриране на подмодула „%s“"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s“ вече съществува в индекса"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "„%s“ вече съществува в индекса и не е подмодул"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "клон на хранилище, който да се добави като подмодул"
+
+#: builtin/submodule--helper.c:3254
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "позволяване на добавяне и на иначе игнорираните файлове"
+
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "извеждане само на съобщенията за грешка"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "заемане на обектите от еталонните хранилища"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "името на подмодула да е указаното, а не да е същото като пътя"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ПЪТ]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Относителен път може да се ползва само от основната директория на работното "
+"дърво"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"адрес на хранилище: „%s“ трябва или да е абсолютен, или да започва с „./“ "
+"или „../“"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s“ е неправилно име за подмодул"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -23725,18 +24215,18 @@
msgid "shorten ref output"
msgstr "кратка информация за указателя"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "причина за обновяването"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ]\n"
" ЕТИКЕТ [ВРЪХ]"
@@ -23749,7 +24239,7 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[БРОЙ]] [--contains ПОДАВАНЕ] [--no-contains ПОДАВАНЕ]\n"
@@ -23820,130 +24310,130 @@
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
-msgstr "опцията „-contains“ изисква режим на списък."
+msgstr "опцията „--contains“ изисква режим на списък."
+
+#: builtin/tag.c:550
+msgid "--no-contains option is only allowed in list mode"
+msgstr "опцията „--no-contains“ изисква режим на списък."
#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опцията „-contains“ изисква режим на списък."
+msgid "--points-at option is only allowed in list mode"
+msgstr "опцията „--points-at“ изисква режим на списък."
#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "опцията „-points-at“ изисква режим на списък."
-
-#: builtin/tag.c:556
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -23957,217 +24447,212 @@
msgid "failed to create directory %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "файлът „%s“ не може да бъде създаден"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нов файл"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нова директория"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след "
"обновяването на нов файл"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след добавянето "
"на файл в поддиректория"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на файл"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на директория"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "файлове да може да заменят директории и обратно"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "без промяна на файловете само за индекса"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неследените файлове"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неследените файлове без проверка на файловата система"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "запис на индекса, дори да не е отбелязан като променен"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "включване или изключване на наблюдението на файловата система"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "отбелязване на файловете, че може да се следят чрез файловата система"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "изчистване на флага за следенето чрез файловата система"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -24175,7 +24660,7 @@
"Настройката „core.splitIndex“ е зададена на „false“ (лъжа̀). Сменете я или я "
"изтрийте, за да включите разделянето на индекса"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -24183,7 +24668,7 @@
"Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или "
"я изтрийте, за да изключите разделянето на индекса."
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24191,11 +24676,11 @@
"Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я "
"или я изтрийте, за да изключите кеша за неследените файлове"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Кешът за неследените файлове е изключен"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24203,29 +24688,29 @@
"Настройката „core.untrackedCache“ е зададена на „false“ (лъжа̀). Сменете я "
"или я изтрийте, за да включите кеша за неследените файлове"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кешът за неследените файлове е включен за „%s“"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "следенето чрез файловата система е включено"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "следенето чрез файловата система е изключено"
@@ -24241,21 +24726,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -24269,28 +24754,28 @@
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
+msgstr "git upload-pack [ОПЦИЯ…] ДИРЕКТОРИЯ"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "изход след първоначалната размяна на заявка и отговор"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "изход след първоначалната обява на указатели"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "доставяне на информацията/указателите за „git-http-backend“"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"да не се търси „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-tag [-v | --verbose] ПОДАВАНЕ…"
+msgstr "git verify-commit [-v | --verbose] ПОДАВАНЕ…"
#: builtin/verify-commit.c:68
msgid "print commit contents"
@@ -24320,63 +24805,58 @@
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "неуспешно изтриване на „%s“"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Изтриване на „%s/%s“: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "докладване на окастрените работни дървета"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "целта не може да се ползва за работно дърво: „%s“"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -24386,7 +24866,7 @@
"За изрично задаване ползвайте „%s -f -f“, а за изчистване —\n"
"„unlock“, „prune“ или „remove“"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24396,145 +24876,145 @@
"За изрично задаване ползвайте „%s -f“, а за изчистване —\n"
"„prune“ или „remove“"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "инициализация"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "опцията „--reason“ изисква „--lock“"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "добавена с „--lock“"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "извеждане на подробни анотации и обяснения, ако такива са налични"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"добавяне на анотация за окастряне на работните копия по-стари от това ВРЕМЕ"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "опциите „--verbose“ и „--porcelain“ са несъвместими"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -24543,7 +25023,7 @@
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -24551,41 +25031,41 @@
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "неуспешно изпълнение на „git status“ върху „%s“"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s“ съдържа променени или нови файлове, за принудително изтриване е "
"необходима опцията „--force“"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24594,7 +25074,7 @@
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24602,17 +25082,17 @@
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "поправяне: %s: „%s“"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "грешка: %s: „%s“"
@@ -24741,17 +25221,17 @@
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24760,14 +25240,14 @@
"употреба: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
"git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "командата „%s“ не може да се изпълни: %s\n"
@@ -24814,65 +25294,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "изход след първоначалната обява на възможностите"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "гнездото/каналът вече се ползват: „%s“"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "сървърът не стартира на гнездо/канал „%s“"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "демонът не може да се стартира във фонов режим"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "неуспешно изпълнение на „waitpid“"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "демонът още не отговаря на заявки"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "демонът не е стартирал"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "„waitpid“ върна неочаквана стойност"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "демонът не е спрял"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [ИМЕ] [ОПЦИЯ…]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [ИМЕ] [НИШКИ]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [ИМЕ] [НИШКИ] [ИЗЧАКВАНЕ]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [ИМЕ] [ИЗЧАКВАНЕ]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [ИМЕ] [ЛЕКСЕМА]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [ИМЕ] [БРОЙ_БАЙТОВЕ] [РАЗМЕР]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24880,88 +25326,84 @@
"test-helper simple-ipc multiple [ИМЕ] [НИШКИ] [БРОЙ_БАЙТОВЕ] "
"[РАЗМЕР_НА_ПАКЕТА]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "име или път за гнездото на Unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "име на именован канал"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "брой нишки в запаса нишки"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "секунди изчакване на демона да стартира или спре"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "брой байтове"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "брой заявки на нишка"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "байта"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "знаци за пращане"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "лексема"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "командна лексема за пращане"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без "
"поддръжка на SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
"друга"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24979,47 +25421,52 @@
"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
"„%s“"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
"пакет „flush“"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "неправилен отговор от сървъра, бе получено: „%s“"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "хранилището „%s“ липсва"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Неуспешна идентификация към „%s“"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "няма достъп до „%s“ със следната настройка на „http.pinnedPubkey“: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "няма достъп до „%s“: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "пренасочване към „%s“"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "получен е EOF, в режим без поддръжка за това"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "отдалеченият сървър прати неочакван пакет за край на отговор"
@@ -25029,86 +25476,86 @@
"данните за POST не може да се прочетат наново, пробвайте да увеличите "
"настройката „http.postBuffer“"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: неочакван пакет за край на отговор"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "Неуспешно отдалечено извикване. %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "толкова големи изтласквания не може да се изпълнят"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
"декомпресиране: %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "получени са %d байта от заглавна част"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "очакват се още %d байта от тялото на отговора"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "опростеният транспорт по http не поддържа плитки клиенти"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "неуспешно доставяне."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "умният вариант на http не може да доставя по SHA1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "транспортът по http не поддържа „%s“"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "неуспешно изпълнение на „git-http-push“"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: грешка при изчитането на потока команди от git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: опит за доставяне без локално хранилище"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: непозната команда „%s“ от git"
@@ -25129,46 +25576,46 @@
msgid "object filtering"
msgstr "филтриране по вид на обекта"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "период на валидност/запазване"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "повече подробности"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "по-малко подробности"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "да се показват такъв БРОЙ цифри от имената на обектите"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "изчитане на пътищата от ФАЙЛ"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
"знак „NUL“"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "КЛЮЧ"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
@@ -25871,42 +26318,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "неуспешно двоично търсене, не е зададена команда."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "изпълнение на командата „${command}“"
-
-#: git-bisect.sh:80
-#, 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:105
-msgid "bisect run cannot continue any more"
-msgstr "двоичното търсене не може да продължи"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"неуспешно двоично търсене:\n"
-"функцията „bisect-state ${state}“ завърши с код за грешка ${res}"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "успешно двоично търсене"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25945,99 +26356,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простото сливане не сработи, пробва се автоматично сливане."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Относителен път може да се ползва само от основната директория на работното "
-"дърво"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
-"„./“ или „../“"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„${sm_path}“ вече съществува в индекса"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "в „${sm_path}“ не е изтеглено подаване"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„${sm_path}“ съществува, а не е хранилище на Git"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Открита е локална директория на Git — „${sm_name}“, която сочи към "
-"отдалечените хранилища:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Ако искате да преизползвате тази директория на git, вместо да клонирате "
-"отново\n"
-" $realrepo\n"
-"използвайте опцията „--force“. Ако локалната директория на git не е за\n"
-"правилното хранилище или ако не знаете какво означава това, използвайте\n"
-"друго име като аргумент към опцията „--name“."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:578
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:583
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -26046,409 +26375,12 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно "
-"доставяне на „${sha1}“"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
-"„${sha1}“. Директното доставяне на това подаване е неуспешно."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Автоматично скатаното е приложено."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "„$stash_sha1“ не може да бъде запазен"
-
-#: git-rebase--preserve-merges.sh:113
-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"
-"надеждно скатани. Може да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Пребазиране ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Команди:\n"
-" p, pick ПОДАВАНЕ — прилагане на подаването\n"
-" r, reword ПОДАВАНЕ — прилагане на подаването, но промяна на съобщението му\n"
-" e, edit ПОДАВАНЕ — прилагане на подаването и спиране при него за още "
-"промени\n"
-" s, squash ПОДАВАНЕ — вкарване на подаването в предходното му\n"
-" f, fixup ПОДАВАНЕ — вкарване на подаването в предходното му, без смяна на\n"
-" съобщението\n"
-" x, exec ПОДАВАНЕ — изпълнение на команда към обвивката: останалата част "
-"на\n"
-" реда\n"
-" d, drop ПОДАВАНЕ — прескачане на подаването\n"
-" l, label ЕТИКЕТ — задаване на етикет на указаното от HEAD\n"
-" t, reset ЕТИКЕТ — зануляване на HEAD към ЕТИКЕТа\n"
-" m, merge [-C ПОДАВАНЕ | -c ПОДАВАНЕ] ЕТИКЕТ [# ЕДИН_РЕД]\n"
-" — създаване на подаване със сливане със съобщението от\n"
-" първоначалното подаване (или съобщението от ЕДИН_РЕД,\n"
-" ако не е зададено подаване със сливане. С опцията\n"
-" „-c ПОДАВАНЕ“, може да смените съобщението.\n"
-"\n"
-"Може да променяте последователността на редовете — те се изпълняват\n"
-"последователно отгоре-надолу.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Може да промените подаването с командата:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"След като привършите, продължете с командата:\n"
-"\n"
-" git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: това не е подаване, което може да бъде отбрано"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Неправилно име на подаване: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-"Заместващата сума по SHA1 за текущото подаване не може да бъде запазена"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Превъртане до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Не може да се превърти до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Подаването не може да се смачка: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Грешка при повтарянето на сливането на „$sha1“"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "„$sha1“ не може да се отбере."
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Това е съобщение при подаване №${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Съобщение при подаване №${n} ще бъде прескочено."
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Това е обединение от $count подаване."
-msgstr[1] "Това е обединение от $count подавания."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Това е обединение от 2 подавания"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Не може да се подаде $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Подаването не може за де промени след успешното отбиране на „$sha1…“ $rest.\n"
-"Най-вероятните причини са празно съобщение при подаване или неуспешно "
-"изпълнение\n"
-"на куката преди подаване. Ако имате проблем с куката, ще трябва да го "
-"коригирате,\n"
-"преди да може да промените съобщението на подаването."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Спиране при „$sha1_abbrev…“ $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Без предходно подаване не може да се изпълни „$squash_style“"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "В момента се изпълнява: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Неуспешно изпълнение: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "и промени индекса и/или работното дърво"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Може да коригирате проблема, след което изпълнете:\n"
-"\n"
-" git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Успешно изпълнение: $rest\n"
-"Остават още промени в индекса или работното дърво.\n"
-"Трябва да ги подадете или скатаете и след това изпълнете:\n"
-"\n"
-" git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Непозната команда: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Успешно пребазиране и обновяване на „$head_name“."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"В индекса има промени. Ако искате да ги вкарате в\n"
-"предишното подаване, изпълнете:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Ако искате да създадете ново подаване, изпълнете:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"И в двата случая след като привършите, продължете с командата:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Не може да бъде открит автор за поправянето на подаването"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
-"отново изпълнете „git rebase --continue“."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Промените в индекса не може да бъдат подадени."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Текстовият редактор не може да бъде стартиран"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "„$switch_to“ не може да се изтегли"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Липсва указател „HEAD“"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Пребазирането не е интерактивно"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команда)"
-msgstr[1] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Празните подавания са коментирани"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -26467,52 +26399,32 @@
"ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Не може да пребазирате, защото има промени, които не са в индекса."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Не може да презапишете клоните, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Не може да издърпвате при това пребазиране, защото има промени, които не са "
-"в индекса."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Не може да изпълните „$action“, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Не може да пребазирате, защото в индекса има неподадени промени."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Не може да издърпвате при това пребазиране, защото в индекса има неподадени "
-"промени."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Не може да изпълните „$action“, защото в индекса има неподадени промени."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Освен това в индекса има неподадени промени."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Тази команда трябва да се изпълни от основната директория на работното дърво"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Абсолютният път на работното дърво не може да се определи"
@@ -26860,7 +26772,7 @@
#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
-msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
+msgstr "неизвестна стратегия за прилагане на кръпка към „--patch“: „%s“"
#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
@@ -27181,7 +27093,7 @@
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
@@ -27206,30 +27118,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -27240,12 +27152,12 @@
"%s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27254,13 +27166,13 @@
"ФАТАЛНА ГРЕШКА: %s: %d е повече от 998 знака\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "„%s“ се пропуска, защото е с разширение за архивен файл: „%s“.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
diff --git a/po/ca.po b/po/ca.po
index e6e77f3..556b028 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -22,6 +22,7 @@
# hook | lligam
# hunk | tros
# not supported | no està admès
+# push | pujar
# repository | repositori
# setting | paràmetre
# shallow | superficial
@@ -56,9 +57,9 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
+"POT-Creation-Date: 2021-10-30 09:36+0800\n"
"PO-Revision-Date: 2021-05-14 10:22-0600\n"
-"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
+"Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -67,212 +68,213 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.3.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510
+#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binari"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "res"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sense canvis"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "no s'ha pogut fer «stage» «%s»"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "No s'ha pogut analitzar HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertit %d camí\n"
msgstr[1] "revertits %d camins\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "afegit %d camí\n"
msgstr[1] "afegits %d camins\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "s'està ignorant allò no fusionat: %s"
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Reviseu les diferències"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "mostra els camins amb canvis"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "selecciona els trossos i actualitza selectivament"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "visualitza les diferències entre HEAD i l'índex"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Mostra ajuda:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "seleccioneu un únic ítem"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "seleccioneu un rang d'ítems"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "seleccioneu rangs múltiples"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "seleccioneu un ítem basant-se en un prefix únic"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "desselecciona els ítems especificats"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "trieu tots els ítems"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(buit) finalitza la selecció"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "seleccioneu un ítem numerat"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(buit) no seleccionis res"
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "I ara què"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "staged"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "unstaged"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "camí"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Adeu.\n"
@@ -299,11 +301,11 @@
#: add-patch.c:39
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"staging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" staging."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«staging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «staging»."
#: add-patch.c:42
msgid ""
@@ -341,8 +343,8 @@
#: add-patch.c:61
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"stashing."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" stashing."
msgstr ""
"Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament "
"per a «stashing»."
@@ -383,11 +385,11 @@
#: add-patch.c:85
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"unstaging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" unstaging."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«unstaging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «unstaging»."
#: add-patch.c:88
msgid ""
@@ -425,8 +427,8 @@
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"applying."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" applying."
msgstr ""
"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per "
"aplicar-lo."
@@ -471,11 +473,11 @@
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"discarding."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" discarding."
msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"ser descartat."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" ser descartat."
#: add-patch.c:134 add-patch.c:202
msgid ""
@@ -495,13 +497,14 @@
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,d"
-"%s,?]? "
+"Descarta el canvi de mode de l'índex i de l'arbre de treball "
+"[y,n,q,a,d%s,?]? "
#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
#, c-format, perl-format
@@ -538,7 +541,8 @@
#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
#, c-format, perl-format
@@ -578,34 +582,34 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n"
-#: add-patch.c:342
+#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»"
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»"
-#: add-patch.c:419
+#: add-patch.c:420
msgid "could not parse diff"
msgstr "no s'ha pogut analitzar el diff"
-#: add-patch.c:438
+#: add-patch.c:439
msgid "could not parse colored diff"
msgstr "no s'ha pogut analitzar el diff acolorit"
-#: add-patch.c:452
+#: add-patch.c:453
#, c-format
msgid "failed to run '%s'"
msgstr "no s'ha pogut executar «%s»"
-#: add-patch.c:611
+#: add-patch.c:612
msgid "mismatched output from interactive.diffFilter"
msgstr "sortida no coincident des d'interactive.diffFilter"
-#: add-patch.c:612
+#: add-patch.c:613
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -613,7 +617,7 @@
"El filtre ha de mantenir una correspondència d'un a un\n"
"entre les línies d'entrada i sortida."
-#: add-patch.c:790
+#: add-patch.c:791
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -622,7 +626,7 @@
"s'esperava la línia amb contingut #%d a\n"
"%.*s"
-#: add-patch.c:805
+#: add-patch.c:806
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -635,12 +639,12 @@
"\tno acaben amb:\n"
"%.*s"
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
-#: add-patch.c:1085
+#: add-patch.c:1086
#, c-format
msgid ""
"---\n"
@@ -654,7 +658,7 @@
"Les línies que comencin per %c s'eliminaran.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -664,11 +668,11 @@
"de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n"
"i el tros es deixa sense cap canvi.\n"
-#: add-patch.c:1132
+#: add-patch.c:1133
msgid "could not parse hunk header"
msgstr "no s'ha pogut analitzar la capçalera del tros"
-#: add-patch.c:1177
+#: add-patch.c:1178
msgid "'git apply --cached' failed"
msgstr "«git apply --cached» ha fallat"
@@ -677,33 +681,33 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#.
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
+" "
msgstr ""
"El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es "
"descartarà) [y/n]? "
-#: add-patch.c:1289
+#: add-patch.c:1290
msgid "The selected hunks do not apply to the index!"
msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
-#: add-patch.c:1354
+#: add-patch.c:1355
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -725,73 +729,73 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
msgid "No previous hunk"
msgstr "Sense tros previ"
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
msgid "No next hunk"
msgstr "No hi ha tros següent"
-#: add-patch.c:1537
+#: add-patch.c:1538
msgid "No other hunks to goto"
msgstr "No hi ha altres trossos on anar-hi"
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "ves a quin tros (<ret> per a veure'n més)? "
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "ves a quin tros? "
-#: add-patch.c:1560
+#: add-patch.c:1561
#, c-format
msgid "Invalid number: '%s'"
msgstr "Número no vàlid: «%s»"
-#: add-patch.c:1565
+#: add-patch.c:1566
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Només %d tros disponible."
msgstr[1] "Només %d trossos disponibles."
-#: add-patch.c:1574
+#: add-patch.c:1575
msgid "No other hunks to search"
msgstr "No hi ha cap altre tros a cercar"
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "cerca per expressió regular? "
-#: add-patch.c:1595
+#: add-patch.c:1596
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Expressió regular de cerca mal formada %s: %s"
-#: add-patch.c:1612
+#: add-patch.c:1613
msgid "No hunk matches the given pattern"
msgstr "No hi ha trossos que coincideixin amb el patró donat"
-#: add-patch.c:1619
+#: add-patch.c:1620
msgid "Sorry, cannot split this hunk"
msgstr "No es pot dividir aquest tros"
-#: add-patch.c:1623
+#: add-patch.c:1624
#, c-format
msgid "Split into %d hunks."
msgstr "Divideix en %d trossos."
-#: add-patch.c:1627
+#: add-patch.c:1628
msgid "Sorry, cannot edit this hunk"
msgstr "No es pot editar aquest tros"
-#: add-patch.c:1679
+#: add-patch.c:1680
msgid "'git apply' failed"
msgstr "«git apply» ha fallat"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -800,37 +804,37 @@
"\n"
"Desactiva aquest missatge amb «git config advice.%s false»"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sconsell: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No és possible %s perquè teniu fitxers sense fusionar."
-#: advice.c:270
+#: advice.c:196
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."
@@ -839,36 +843,49 @@
"«git add/rm <fitxer>» segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
-#: advice.c:296
-#, c-format
-msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
-msgstr ""
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "No és possible avançar ràpidament, s'està avortant."
-#: advice.c:303
+#: advice.c:227
+#, c-format, fuzzy
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
+"Els camins següents i/o les especificacions de camí coincideixen amb els camins que existeixen\n"
+"fora de la vostra definició de restricció de proves, no serà\n"
+"actualitzat en l'índex:"
-#: advice.c:310
+#: advice.c:234
+#, fuzzy
+msgid ""
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"Si té intenció d'actualitzar aquestes entrades, intenti una de les següents:\n"
+"* Utilitzeu l'opció --sparse.\n"
+"* Inhabilita o modifica les regles d'escassetat."
+
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -886,15 +903,14 @@
"\n"
" git switch -\n"
"\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
+"Turn off this advice by setting config variable advice.detachedHead to false\n"
"\n"
msgstr ""
"Avís: s'està canviant a «%s».\n"
"\n"
"Esteu en un estat de «HEAD separat». Podeu donar un cop d'ull, fer canvis\n"
-"experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n"
-"en aquest estat sense impactar a cap branca tornant a una branca.\n"
+"experimentals i cometre'ls. Podeu descartar qualsevol comissió que feu\n"
+"en aquest estat, sense impactar a cap branca, tornant a una branca.\n"
"\n"
"Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
"poder fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
@@ -905,8 +921,7 @@
"\n"
" git switch -\n"
"\n"
-"Desactiveu aquest consell configurant la variable advice.detachedHead a "
-"«false»\n"
+"Desactiveu aquest consell configurant la variable advice.detachedHead a «false»\n"
"\n"
#: alias.c:50
@@ -997,11 +1012,11 @@
#: apply.c:1371
#, c-format
msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
+"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)"
+"git diff header lacks filename information when removing %d leading pathname"
+" components (line %d)"
msgstr[0] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d component de nom de camí inicial (línia %d)"
@@ -1053,49 +1068,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: «%c»"
-#: apply.c:3056
+#: apply.c:3057
#, 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'%d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
-#: apply.c:3068
+#: apply.c:3069
#, 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"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1104,23 +1119,23 @@
"tot cercant:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1128,290 +1143,290 @@
"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
"rebut %s)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"al repositori li manca el blob necessari per a fer a una fusió de 3 vies."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "S'està fent una fusió de 3 vies...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "S'ha produït un error en fer una fusió de tres vies...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "S'està usant alternativament l'aplicació directa...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: «%s»"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3976
+#: apply.c:3998
#, 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)"
-#: apply.c:3981
+#: apply.c:4003
#, 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"
-#: apply.c:4001
+#: apply.c:4023
#, 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"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta la informació sha1 o és inútil per al submòdul %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "canvi de mode per a %s, el qual no està en la HEAD actual"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-"no s'ha pogut crear un magatzem de suport per al fitxer novament creat "
-"%s"
+"no s'ha pogut crear un magatzem de suport per al fitxer novament creat %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242
+#: builtin/gc.c:2277
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "error intern"
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1420,136 +1435,139 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "número"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:5006
+#: apply.c:5028
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"
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de "
+"l'entrada"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: apply.c:5012
+#: apply.c:5034
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"
-#: apply.c:5014
+#: apply.c:5036
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"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca els fitxers nous amb «git add --intent-to-add»"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
+msgstr ""
+"intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
-msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
+msgstr ""
+"construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "acció"
-#: apply.c:5036
+#: apply.c:5058
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"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: apply.c:5057
+#: apply.c:5079
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"
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "arrel"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
@@ -1587,7 +1605,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
@@ -1607,7 +1625,8 @@
#: archive.c:16
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
+"[<path>...]"
msgstr ""
"git archive --remote <repositori> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
@@ -1621,151 +1640,151 @@
msgid "cannot read %s"
msgstr "no es pot llegir «%s»"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112
+#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir «%s»"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "no existeix la referència: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "no és un nom d'objecte vàlid: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "no és un objecte d'arbre: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "no se segueix el directori de treball actual"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Fitxer no trobat: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "No és un fitxer normal: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "format"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "fitxer"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "inclou els fitxers no seguits a l'arxiu"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "estableix el nivell de compressió"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repositori"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del repositori remot <repositori>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "ordre"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Les opcions --add-file i --remote no es poden usar juntes"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument no admès per al format «%s»: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no està permès: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1773,22 +1792,22 @@
"Els patrons negatius s'ignoren en els atributs de git\n"
"Useu «\\!» per exclamació capdavantera literal."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1797,7 +1816,7 @@
"La base de fusió %s és errònia.\n"
"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1806,7 +1825,7 @@
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1815,7 +1834,7 @@
"La base de fusió %s és %s.\n"
"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1826,7 +1845,7 @@
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1834,40 +1853,39 @@
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
-"%s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
"Continuem de totes maneres."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1876,7 +1894,7 @@
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí incorrectes?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1885,8 +1903,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1907,11 +1924,12 @@
"--reverse i --first-parent junts requereixen una última comissió "
"especificada"
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -1998,7 +2016,8 @@
#: branch.c:110
#, 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»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència local «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -2025,7 +2044,8 @@
#: branch.c:233
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+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."
@@ -2081,121 +2101,119 @@
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD de l'arbre de treball %s no està actualitzat"
-#: bundle.c:41
+#: bundle.c:44
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "Algoritme de hash del farcell desconegut: %s"
-#: bundle.c:45
+#: bundle.c:48
#, c-format
msgid "unknown capability '%s'"
msgstr "funcionalitat «%s» desconeguda"
-#: bundle.c:71
+#: bundle.c:74
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
-#: bundle.c:110
+#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir «%s»"
-#: bundle.c:189
+#: bundle.c:198
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositori li manquen aquestes comissions prerequerides:"
-#: bundle.c:192
+#: bundle.c:201
msgid "need a repository to verify a bundle"
msgstr "cal un repositori per verificar un farcell"
-#: bundle.c:243
+#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El farcell conté aquesta referència:"
msgstr[1] "El farcell conté aquestes %d referències:"
-#: bundle.c:250
+#: bundle.c:264
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:252
+#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El farcell requereix aquesta referència:"
msgstr[1] "El farcell requereix aquestes %d referències:"
-#: bundle.c:319
+#: bundle.c:333
msgid "unable to dup bundle descriptor"
msgstr "no s'ha pogut duplicar el descriptor del farcell"
-#: bundle.c:326
+#: bundle.c:340
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut generar el pack-objects"
-#: bundle.c:337
+#: bundle.c:351
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:386
+#: bundle.c:400
#, c-format
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:490
+#: bundle.c:504
#, c-format
msgid "unsupported bundle version %d"
msgstr "versió del farcell no compatible %d"
-#: bundle.c:492
+#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr "no es pot escriure la versió %d amb l'algorisme %s"
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument no reconegut: %s"
-#: bundle.c:539
+#: bundle.c:553
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:549
+#: bundle.c:563
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
-#: bundle.c:574
+#: bundle.c:588
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
-#: chunk-format.c:113
+#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
msgstr ""
-"l'identificador de fragment de finalització apareix abans del que "
-"s'esperava"
+"l'identificador de fragment de finalització apareix abans del que s'esperava"
-#: chunk-format.c:122
+#: chunk-format.c:126
#, c-format
msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-"desplaçament incorrecte del fragment %<PRIx64> and %<PRIx64>"
+msgstr "desplaçament incorrecte del fragment %<PRIx64> and %<PRIx64>"
-#: chunk-format.c:129
+#: chunk-format.c:133
#, c-format
msgid "duplicate chunk ID %<PRIx32> found"
msgstr "S'ha trobat un ID del fragment %<PRIx32> duplicat"
-#: chunk-format.c:143
+#: chunk-format.c:147
#, c-format
msgid "final chunk has non-zero id %<PRIx32>"
msgstr "El fragment final té un id %<PRIx32> que no és zero"
@@ -2205,7 +2223,7 @@
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "especificació de hash no vàlida"
@@ -2254,242 +2272,251 @@
msgid "unable to find all commit-graph files"
msgstr "no es poden trobar tots els fitxers del graf de comissions"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"posició de la comissió no vàlida. Probablement el graf de comissions està "
"malmès"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
+#, fuzzy
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
+"el graf de comissions requereix dades de generació de desbordaments però no "
+"en té"
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "S'estan carregant comissions conegudes al graf de comissions"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "S'estan expandint les comissions abastables al graf de comissions"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "S'estan esborrant les marques de comissions al graf de comissions"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "S'estan calculant els nivells topològics del graf de comissions"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "S'estan calculant els nombres de generació del graf de comissions"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr ""
"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "S'estan recollint els objectes referenciats"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
-msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
+msgstr[1] ""
+"S'estan cercant les comissions pel graf de comissions en %d paquets"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "error en afegir paquet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"S'estan cercant les comissions pel graf de comissions entre els objectes "
"empaquetats"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "S'estan cercant les vores addicionals al graf de comissions"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr ""
"s'ha produït un error en escriure el nombre correcte d'ids base del graf"
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "no s'ha pogut crear una capa de graf temporal"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "S'està escrivint el graf de comissions en %d pas"
msgstr[1] "S'està escrivint el graf de comissions en %d passos"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr ""
"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "S'estan escanejant les comissions fusionades"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "S'està fusionant el graf de comissions"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"s'està intentant escriure un graf de comissions, però «core.commitGraph» "
"està desactivat"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "massa comissions per escriure un graf"
-#: commit-graph.c:2450
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el fitxer commit-graph (graf de comissions) té una suma de verificació "
"incorrecta i probablement és corrupte"
-#: commit-graph.c:2460
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s"
-#: commit-graph.c:2470 commit-graph.c:2485
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u != "
-"%u"
+"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u !="
+" %u"
-#: commit-graph.c:2477
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
"s'ha produït un error en analitzar la comissió %s del graf de comissions"
-#: commit-graph.c:2495
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "S'estan verificant les comissions al graf de comissions"
-#: commit-graph.c:2510
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"no s'han pogut analitzar la comissió %s de la base de dades d'objectes per "
"al graf de comissions"
-#: commit-graph.c:2517
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != %s"
+"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != "
+"%s"
-#: commit-graph.c:2527
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"la llista de pares del graf de comissions per a la comissió %s és massa "
"llarga"
-#: commit-graph.c:2536
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "el pare pel graf de comissions %s és %s != %s"
-#: commit-graph.c:2550
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "la llista pare del graf de comissions per %s acaba aviat"
-#: commit-graph.c:2555
+#: commit-graph.c:2584
#, c-format
msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+"commit-graph has generation number zero for commit %s, but non-zero "
+"elsewhere"
msgstr ""
-"El graf de comissions té nombre de generació zero per a la comissió %s, però "
-"té no zero en altres llocs"
+"El graf de comissions té nombre de generació zero per a la comissió %s, però"
+" té no zero en altres llocs"
-#: commit-graph.c:2559
+#: commit-graph.c:2588
#, c-format
msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+"commit-graph has non-zero generation number for commit %s, but zero "
+"elsewhere"
msgstr ""
"El graf de comissions té un nombre de generació diferent de zero per a "
"comissió %s però té zero en altres llocs"
-#: commit-graph.c:2576
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr "generació del graf de comissions per a la comissió %s és %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"generació del graf de comissions per a la comissió %s és %<PRIuMAX> < "
+"%<PRIuMAX>"
-#: commit-graph.c:2582
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"La data d'enviament per a la comissió %s en el graf de comissions és "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2504,31 +2531,30 @@
"i s'eliminarà en una futura versió del Git.\n"
"\n"
"Si us plau useu «git replace --convert-graft-file»\n"
-"per convertir els grafs en substitució de referències. Desactiveu aquest "
-"missatge executant\n"
+"per convertir els grafs en substitució de referències. Desactiveu aquest missatge executant\n"
"«git config advice.graftFileDeprecated false»"
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una signatura GPG bona de %s\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2543,7 +2569,7 @@
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2558,36 +2584,36 @@
"\t%s\n"
"Això pot ser degut a inclusions circulars."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "les inclusions de configuració relatives han de venir de fitxers"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "format de configuració no vàlid: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
-msgstr ""
+msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr ""
+msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
@@ -2597,302 +2623,306 @@
msgid "key does not contain variable name: %s"
msgstr "la clau no conté un nom de variable: «%s»"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "clau no vàlida (línia nova): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "clau de configuració buida"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "comptatge erroni a %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "hi ha massa arguments a %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "falta la clau de configuració %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "falta el valor de configuració %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "línia de configuració %d errònia en l'entrada estàndard"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "línia de configuració %d errònia en el blob de submòdul %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "línia de configuració %d errònia en la línia d'ordres %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "fora de rang"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
+msgstr ""
+"valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: "
+"%s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en el blob de submòdul "
"%s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valor de configuració booleà erroni «%s» per a «%s»"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» per a «%s» no és una marca de temps vàlida"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "la longitud d'«abbrev» està fora de rang: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar només hauria de ser un caràcter"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"ha de ser un dels elements següents: nothing, matching, simple, upstream o "
"current"
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d erroni"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la referència «%s» no assenyala a un blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
-#: config.c:1873
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
-#: config.c:1929
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:2293
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
-msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+msgstr ""
+"un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2467
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
-#: config.c:2512
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
-#: config.c:2558
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
-#: config.c:2560
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
-#: config.c:2644
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
-#: config.c:2676
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2705
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
-#: config.c:2957 config.c:3283
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-#: config.c:2968
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
-#: config.c:3005 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
-#: config.c:3030
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "fitxer de configuració no vàlid %s"
-#: config.c:3043 config.c:3296
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat «fstat» a %s"
-#: config.c:3054
+#: config.c:3043
#, c-format
-msgid "unable to mmap '%s'"
-msgstr "no s'ha pogut fer «mmap» «%s»"
+msgid "unable to mmap '%s'%s"
+msgstr "no s'ha pogut fer «mmap» «%s»%s"
-#: config.c:3063 config.c:3301
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
-#: config.c:3148 config.c:3398
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-#: config.c:3182
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860
+#: builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
-#: config.c:3274
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
-#: config.c:3441
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
@@ -2927,73 +2957,74 @@
msgid "expected flush after capabilities"
msgstr "s'esperava un buidatge després de les capacitats"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignora les capacitats després de la primera línia «%s»"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "error de protocol: unexpected capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "el repositori de l'altre extrem no pot ser shallow"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquet no vàlid"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "format d'objecte «%s» especificat pel servidor desconegut"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "resposta de ls-refs no vàlida: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "s'esperava una neteja després del llistat de referències"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
-msgstr "s'esperava un final de resposta després del llistat de referències"
+msgstr ""
+"s'esperava un paquet de final de resposta després del llistat de referències"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "el protocol «%s» no és compatible"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "S'està cercant %s..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no s'ha pogut trobar %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3002,7 +3033,7 @@
"fet.\n"
"S'està connectant a %s (port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3012,79 +3043,81 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "fet."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no s'ha pogut trobar %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "port desconegut %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "s'ha bloquejat el port estrany «%s»"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per "
-"URL"
+"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per"
+" URL"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
+"la línia nova està prohibida en els servidors git:// i els camins de "
+"repositori"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "la variant «simple» de ssh no és compatible amb -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "la variant «simple» de ssh no és compatible amb -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variant «simple» de ssh no permet definir el port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "no s'ha pogut bifurcar"
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar «git rev-list»"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
@@ -3105,8 +3138,7 @@
"The file will have its original line endings in your working directory"
msgstr ""
"CRLF serà reemplaçat per LF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: convert.c:206
#, c-format
@@ -3120,8 +3152,7 @@
"The file will have its original line endings in your working directory"
msgstr ""
"LF serà reemplaçat per CRLF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: convert.c:273
#, c-format
@@ -3134,8 +3165,8 @@
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
msgstr ""
-"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com "
-"a codificacions d'arbre de treball."
+"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com"
+" a codificacions d'arbre de treball."
#: convert.c:293
#, c-format
@@ -3145,11 +3176,12 @@
#: convert.c:295
#, c-format
msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or "
+"UTF-%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o UTF-"
-"%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de treball."
+"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o "
+"UTF-%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de "
+"treball."
#: convert.c:408 convert.c:479
#, c-format
@@ -3194,25 +3226,25 @@
msgid "path name too long for external filter"
msgstr "el nom del camí és massa gran per al filtre extern"
-#: convert.c:934
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots "
-"els camins"
+"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots"
+" els camins"
-#: convert.c:1234
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr "cert/fals no són codificacions d'arbre de treball vàlides"
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: el filtre de netejat «%s» ha fallat"
-#: convert.c:1490
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: ha fallat el filtre smudge %s"
@@ -3232,17 +3264,17 @@
msgstr ""
"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url conté una línia nova en %s component: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "l'url no té esquema: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
@@ -3342,36 +3374,36 @@
msgid "Marked %d islands, done.\n"
msgstr "Marcades %d illes, fet.\n"
-#: diff-merges.c:80
+#: diff-merges.c:70
#, c-format
msgid "unknown value for --diff-merges: %s"
msgstr "valor desconegut per a --diff-merges: %s"
-#: diff-lib.c:538
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base no funciona amb intervals"
-#: diff-lib.c:540
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base només funciona amb comissions"
-#: diff-lib.c:557
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "no s'ha pogut obtenir HEAD"
-#: diff-lib.c:564
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "no s'ha trobat una base de fusió"
-#: diff-lib.c:566
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "s'han trobat múltiples bases de fusió"
-#: diff-no-index.c:238
+#: diff-no-index.c:237
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opcions>] <camí> <camí>"
-#: diff-no-index.c:263
+#: diff-no-index.c:262
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
@@ -3379,19 +3411,19 @@
"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
"directori de treball"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" S'ha produït un error en analitzar el percentatge limitant de dirstat "
"«%s»\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut «%s»\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3399,31 +3431,31 @@
"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
"«zebra», «dimmed-zebra» o «plain»"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
-"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
-"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change',"
+" 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
"el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són "
"«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-"
"indentation-change»"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes "
-"d'espai en blanc"
+"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes"
+" d'espai en blanc"
-#: diff.c:410
+#: diff.c:411
#, 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:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3432,35 +3464,49 @@
"S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
"%s"
-#: diff.c:4278
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:4630
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
-#: diff.c:4633
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S and --find-object són mútuament excloents"
-#: diff.c:4712
+#: diff.c:4648
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G i --pickaxe-regex són mútuament excloents, useu --pickaxe-regex amb -S"
+
+#: diff.c:4651
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all i --find-object són mútuament excloents, useu --pickaxe-all "
+"amb -G i -S"
+
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:4760
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat no vàlid: %s"
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numèric"
-#: diff.c:4797
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3469,200 +3515,199 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:4882
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
-#: diff.c:4906
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconegut després de ws-error-highlight=%.*s"
-#: diff.c:4920
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: diff.c:4970 diff.c:4976
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera una forma <n>/<m>"
-#: diff.c:4988
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperava un caràcter, s'ha rebut «%s»"
-#: diff.c:5009
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argument --color-moved incorrecte: %s"
-#: diff.c:5028
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode «%s» no vàlid en --color-moved-ws"
-#: diff.c:5068
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
+#: diff.c:5086
+msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
msgstr ""
"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
-#: diff.c:5104 diff.c:5124
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "argument no vàlid a %s"
-#: diff.c:5228
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "expressió regular donada a -I: no vàlida: «%s»"
-#: diff.c:5277
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
"s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:5333
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argument --word-diff incorrecte: %s"
-#: diff.c:5369
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opcions del format de sortida del diff"
-#: diff.c:5371 diff.c:5377
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "generant pedaç"
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5380 diff.c:5383
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "genera diffs amb <n> línies de context"
-#: diff.c:5385
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "genera el diff en format cru"
-#: diff.c:5388
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "sinònim de «-p --raw»"
-#: diff.c:5392
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "sinònim de «-p --stat»"
-#: diff.c:5396
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "llegible per màquina --stat"
-#: diff.c:5399
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "mostra només l'última línia de --stat"
-#: diff.c:5401 diff.c:5409
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5402
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"genera la distribució de la quantitat relativa de canvis per a cada "
"subdirectori"
-#: diff.c:5406
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "sinònim de --dirstat=cumulative"
-#: diff.c:5410
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinònim de --dirstat=files,param1,param2..."
-#: diff.c:5414
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avisa si els canvis introdueixen marcadors en conflicte o errors d'espai en "
"blanc"
-#: diff.c:5417
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "resum condensat com ara creacions, canvis de nom i mode"
-#: diff.c:5420
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "mostra només els noms de fitxers canviats"
-#: diff.c:5423
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "mostra només els noms i l'estat dels fitxers canviats"
-#: diff.c:5425
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
-#: diff.c:5426
+#: diff.c:5444
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<amplada>"
-#: diff.c:5429
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "genera diffstat amb una amplada donada"
-#: diff.c:5432
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "genera diffstat amb un nom d'amplada donat"
-#: diff.c:5435
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat amb una amplada de graf donada"
-#: diff.c:5437
+#: diff.c:5455
msgid "<count>"
msgstr "<comptador>"
-#: diff.c:5438
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "genera diffstat amb línies limitades"
-#: diff.c:5441
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "genera un resum compacte a diffstat"
-#: diff.c:5444
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "diff amb sortida binària que pot ser aplicada"
-#: diff.c:5447
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-"mostra els noms complets dels objectes pre i post-imatge a les línies «index»"
+"mostra els noms complets dels objectes pre i post-imatge a les línies "
+"«index»"
-#: diff.c:5449
+#: diff.c:5467
msgid "show colored diff"
msgstr "mostra un diff amb colors"
-#: diff.c:5450
+#: diff.c:5468
msgid "<kind>"
msgstr "<kind>"
-#: diff.c:5451
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3670,7 +3715,7 @@
"ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
"al diff"
-#: diff.c:5454
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3678,255 +3723,255 @@
"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
"sortida en --raw o --numstat"
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5458
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "mostra el prefix d'origen donat en lloc de «a/»"
-#: diff.c:5461
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
-#: diff.c:5464
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "afegir un prefix addicional per a cada línia de sortida"
-#: diff.c:5467
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "no mostris cap prefix d'origen o destí"
-#: diff.c:5470
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"mostra el context entre trossos de diferència fins al nombre especificat de "
"línies"
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<char>"
-#: diff.c:5475
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
"especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
-#: diff.c:5480
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
"especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
-#: diff.c:5485
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
-#: diff.c:5488
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opcions de canvi de nom del diff"
-#: diff.c:5489
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5490
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"divideix els canvis de reescriptura completa en parells de suprimir i crear"
-#: diff.c:5494
+#: diff.c:5512
msgid "detect renames"
msgstr "detecta els canvis de noms"
-#: diff.c:5498
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "omet les preimatges per les supressions"
-#: diff.c:5501
+#: diff.c:5519
msgid "detect copies"
msgstr "detecta còpies"
-#: diff.c:5505
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "usa els fitxers no modificats com a font per trobar còpies"
-#: diff.c:5507
+#: diff.c:5525
msgid "disable rename detection"
msgstr "inhabilita la detecció de canvis de nom"
-#: diff.c:5510
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "usa els blobs buits com a font de canvi de nom"
-#: diff.c:5512
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom"
-#: diff.c:5515
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de "
-"nom/còpia supera el límit indicat"
+"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de"
+" nom/còpia supera el límit indicat"
-#: diff.c:5517
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opcions de l'algorisme Diff"
-#: diff.c:5519
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "produeix el diff més petit possible"
-#: diff.c:5522
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignora els espais en blanc en comparar línies"
-#: diff.c:5525
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignora els canvis en la quantitat d'espai en blanc"
-#: diff.c:5528
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignora els canvis d'espai en blanc al final de la línia"
-#: diff.c:5531
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "ignora els retorns de línia al final de la línia"
-#: diff.c:5534
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "ignora els canvis en línies que estan en blanc"
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5537
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
-#: diff.c:5540
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heurística per a desplaçar els límits del tros de diferència per a una "
"lectura fàcil"
-#: diff.c:5543
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera diff usant l'algorisme «patience diff»"
-#: diff.c:5547
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera diff usant l'algorisme «histogram diff»"
-#: diff.c:5549
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algorisme>"
-#: diff.c:5550
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "trieu un algorisme per al diff"
-#: diff.c:5552
+#: diff.c:5570
msgid "<text>"
msgstr "<text>"
-#: diff.c:5553
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera diff usant l'algorisme «anchored diff»"
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5556
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"mostra el diff de paraules usant <mode> per delimitar les paraules "
"modificades"
-#: diff.c:5559
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "utilitza <regex> per a decidir què és una paraula"
-#: diff.c:5562
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5565
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
-#: diff.c:5568
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "com s'ignoren els espais en blanc a --color-moved"
-#: diff.c:5571
+#: diff.c:5589
msgid "Other diff options"
msgstr "Altres opcions diff"
-#: diff.c:5573
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els "
-"camins relatius"
+"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els"
+" camins relatius"
-#: diff.c:5577
+#: diff.c:5595
msgid "treat all files as text"
msgstr "tracta tots els fitxers com a text"
-#: diff.c:5579
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "intercanvia les dues entrades, inverteix el diff"
-#: diff.c:5581
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
-#: diff.c:5583
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "inhabilita totes les sortides del programa"
-#: diff.c:5585
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "permet executar un ajudant de diff extern"
-#: diff.c:5587
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"executa els filtres externs de conversió de text en comparar fitxers binaris"
-#: diff.c:5589
+#: diff.c:5607
msgid "<when>"
msgstr "<quan>"
-#: diff.c:5590
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "ignora els canvis als submòduls en la generació del diff"
-#: diff.c:5593
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5594
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "especifiqueu com es mostren els canvis als submòduls"
-#: diff.c:5598
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "amaga les entrades «git add -N» de l'índex"
-#: diff.c:5601
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "tracta les entrades «git add -N» com a reals a l'índex"
-#: diff.c:5603
+#: diff.c:5621
msgid "<string>"
msgstr "<cadena>"
-#: diff.c:5604
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3934,7 +3979,7 @@
"cerca les diferències que canvien el nombre d'ocurrències de la cadena "
"especificada"
-#: diff.c:5607
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3942,35 +3987,35 @@
"cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
"regular especificada"
-#: diff.c:5610
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
-#: diff.c:5613
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
-#: diff.c:5616
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
-#: diff.c:5617 diff.c:5620
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<camí>"
-#: diff.c:5618
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "mostra el canvi primer al camí especificat"
-#: diff.c:5621
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "omet la sortida al camí especificat"
-#: diff.c:5623
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id de l'objecte>"
-#: diff.c:5624
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3978,530 +4023,618 @@
"cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
"especificat"
-#: diff.c:5626
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5627
+#: diff.c:5645
msgid "select files by diff type"
msgstr "seleccioneu els fitxers per tipus de diff"
-#: diff.c:5629
+#: diff.c:5647
msgid "<file>"
msgstr "<fitxer>"
-#: diff.c:5630
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Sortida a un fitxer específic"
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6306
+msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-"s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
+"s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
-#: diff.c:6290
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
-"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
+"només s'han trobat còpies des de camins modificats perquè de massa fitxers."
-#: diff.c:6293
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
-"l'ordre."
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar"
+" l'ordre."
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
#: diffcore-rotate.c:29
-#, c-format
+#, c-format
msgid "No such path '%s' in the diff"
msgstr "No existeix el camí «%s» al diff"
-#: dir.c:578
+#: dir.c:593
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "patró no reconegut: «%s»"
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "patró negatiu no reconegut: «%s»"
-#: dir.c:809
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"el vostre fitxer «sparse-checkout» pot tenir problemes el patró «%s» es "
"repeteix"
-#: dir.c:819
+#: dir.c:830
msgid "disabling cone pattern matching"
msgstr "inhabilita la coincidència de patrons «cone»"
-#: dir.c:1206
+#: dir.c:1214
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no es pot usar %s com a fitxer d'exclusió"
-#: dir.c:2314
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "no s'ha pogut obrir el directori «%s»"
-#: dir.c:2614
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
-#: dir.c:2738
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr ""
"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
-#: dir.c:3543
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No s'ha pogut endevinar cap nom de directori.\n"
+"Especifiqueu un directori en la línia d'ordres"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "el fitxer d'índex al repositori %s és malmès"
-#: dir.c:3590 dir.c:3595
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "no s'han pogut crear directoris per %s"
-#: dir.c:3624
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c"
-#: entry.c:179
+#: entry.c:177
msgid "Filtering content"
msgstr "S'està filtrant el contingut"
-#: entry.c:500
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "camí d'espai de noms git incorrecte «%s»"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no s'ha pogut establir GIT_DIR a «%s»"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista shallow esperada"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-"git fetch-pack: s'esperava un paquet de buidatge després d'una llista shallow"
+"git fetch-pack: s'esperava un paquet de buidatge després d'una llista "
+"shallow"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "no s'ha pogut escriure al remot"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "s'abandona"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "fet"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
+msgstr ""
+"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "fetch-pack: sortida d'index-pack no vàlida"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "El servidor accepta %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
-msgstr "El servidor no és compatible amb el format d'objecte d'aquest repositori"
+msgstr ""
+"El servidor no és compatible amb el format d'objecte d'aquest repositori"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "el repositori font és superficial, es rebutja clonar-ho."
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "algoritmes no coincidents: client %s; servidor %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "el servidor no és compatible amb l'algorisme «%s»"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "El servidor no permet sol·licituds superficials"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "El servidor accepta filtratge"
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "no s'ha pogut escriure la sol·licitud al remot"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línia de confirmació inesperada: «%s»"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "s'ha produït un error en processar els acks: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "s'esperava l'enviament del fitxer de paquet després de «ready»"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "s'esperava que no s'enviés cap altra secció després de no «ready»"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "s'ha produït un error en processar la informació superficial: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperat: «%s»"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "s'ha produït un error en processar les referències desitjades: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
-#: fetch-pack.c:1930
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: fetch-pack.c:2056
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "«ready» no esperat des del remot"
-#: fetch-pack.c:2079
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:2082
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900
+#: gpg-interface.c:916
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:452
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
-#: gpg-interface.c:470
+#: gpg-interface.c:443
+#, fuzzy
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile s'ha de configurar i existeix per a la "
+"verificació de la signatura ssh"
+
+#: gpg-interface.c:467
+#, fuzzy
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify és necessari per a la verificació de la"
+" signatura ssh (disponible a opensh versió 8.2p1+)"
+
+#: gpg-interface.c:521
+#, c-format, fuzzy
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"ssh signatura fitxer de revocació configurat però no trobat: percentatges"
+
+#: gpg-interface.c:574
+#, fuzzy, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "%s és incompatible amb %s"
+
+#: gpg-interface.c:733 gpg-interface.c:738
+#, fuzzy, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr ""
+"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
+
+#: gpg-interface.c:760
+#, fuzzy
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "usuari.signingkey o gpg.ssh.defaultKeyCommand ha de ser configurat"
+
+#: gpg-interface.c:778
+#, c-format, fuzzy
+msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeycommand ha tingut èxit però no ha retornat cap clau: "
+"percentatge"
+
+#: gpg-interface.c:784
+#, c-format, fuzzy
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand ha fallat: percentatge"
+
+#: gpg-interface.c:872
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
+#: gpg-interface.c:893
+#, fuzzy
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "usuari.signingkey s'ha d'establir per signar ssh"
+
+#: gpg-interface.c:904
+#, fuzzy, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
+
+#: gpg-interface.c:922
+#, fuzzy, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
+
+#: gpg-interface.c:940
+#, fuzzy
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen el signe -Y és necessari per signar ssh (disponible a opensh "
+"versió 8.2p1+)"
+
+#: gpg-interface.c:952
+#, fuzzy, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
+
#: graph.c:98
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignora el color no vàlid «%.*s» a log.graphColors"
#: grep.c:531
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible "
-"amb -P sota PCRE v2"
+"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible"
+" amb -P sota PCRE v2"
-#: grep.c:1893
+#: grep.c:1907
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:1921
+#: grep.c:1935
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "examinar la història i l'estat (vegeu també: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "fer créixer, marcar i ajustar la vostra història comuna"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "col·laborar (vegeu també: git help workflow)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Ordres principals de porcellana"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Ordres auxiliars / manipuladors"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Ordres auxiliars / interrogadors"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Interaccionar amb altres"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Ordres de baix nivell / Manipuladors"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Ordres de baix nivell / Interrogadors"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Ordres de baix nivell / Sincronització de repositoris"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Ordres de baix nivell / Ajudants interns"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en «%s»"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
-msgstr ""
-"Aquestes són ordres habituals del Git usades en diverses situacions:"
+msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipus de llistat de l'ordre no compatible «%s»"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Les guies de Git de conceptes són:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Vegeu «git help <ordre>» per llegir sobre una subordre específica"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Ordres externes"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Àlies d'ordres"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4510,33 +4643,38 @@
"«%s» sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
-#: help.c:623
+#: help.c:646
+#, c-format, fuzzy
+msgid "Run '%s' instead? (y/N)"
+msgstr "Voleu executar «%s»? (s/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4550,16 +4688,16 @@
"\n"
"Les ordres més similars són"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4573,6 +4711,15 @@
"\n"
"Volíeu dir un d'aquests?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
+"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identitat de l'autor desconeguda\n"
@@ -4639,7 +4786,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
@@ -4654,7 +4801,7 @@
#: list-objects-filter-options.c:105
#, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid"
#: list-objects-filter-options.c:124
@@ -4678,8 +4825,8 @@
#: list-objects-filter-options.c:376
msgid "unable to upgrade repository format to support partial clone"
msgstr ""
-"no s'ha pogut actualitzar el format del repositori perquè sigui compatible amb "
-"un clonatge parcial"
+"no s'ha pogut actualitzar el format del repositori perquè sigui compatible "
+"amb un clonatge parcial"
#: list-objects-filter.c:532
#, c-format
@@ -4701,7 +4848,7 @@
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
-#: list-objects.c:395
+#: list-objects.c:398
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
@@ -4722,8 +4869,8 @@
"Sembla que un altre procés de git s'està executant en aquest\n"
"repositori, per exemple, un editor obert per «git commit». \n"
"Assegureu-vos que tots els processos s'hagin acabat i\n"
-"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
-"git ha tingut un error:\n"
+"llavors proveu de nou. Si encara falla, pot ser un procés git\n"
+"ha fallat en aquest repositori abans:\n"
"elimineu el fitxer manualment per a continuar."
#: lockfile.c:160
@@ -4736,7 +4883,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, fuzzy, c-format
+msgid "unexpected line: '%s'"
+msgstr "wanted-ref inesperat: «%s»"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "s'esperava una neteja després dels arguments ls-refs"
@@ -4744,39 +4896,40 @@
msgid "quoted CRLF detected"
msgstr "CRLF citat detectat"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "acció «%s» incorrecta per a «%s»"
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (les comissions no "
"segueixen merge-base)"
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Nota: avançament ràpid del submòdul %s a %s"
-#: merge-ort.c:1172
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "s'ha produït un error en fusionar recursivament el submòdul «%s»"
-#: merge-ort.c:1179
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4785,7 +4938,7 @@
"S'ha produït un error en fusionar el submòdul %s, però existeix una solució possible:\n"
"%s\n"
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4802,7 +4955,7 @@
"\n"
"que acceptarà aquest suggeriment.\n"
-#: merge-ort.c:1196
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4811,21 +4964,21 @@
"S'ha produït un error en fusionar el submòdul %s, però existeixen múltiples solucions possibles:\n"
"%s"
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4835,7 +4988,7 @@
"existent a %s en forma de canvi del nom del directori implícit, posant-hi "
"els camins següents a: %s."
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4845,7 +4998,7 @@
"camí a %s; els canvis del nom del directori implícits han intentat posar "
"aquests camins a: %s segons"
-#: merge-ort.c:1634
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4853,10 +5006,10 @@
"majority of the files."
msgstr ""
"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
-"%s; s'han canviat de nom a múltiples altres "
-"directoris, sense una destinació per a la majoria dels fitxers."
+"%s; s'han canviat de nom a múltiples altres directoris, sense una destinació"
+" per a la majoria dels fitxers."
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4865,137 +5018,149 @@
"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
"mateix ja havia canviat de nom."
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom a %s; "
-"movent-lo a %s."
+"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom "
+"a %s; movent-lo a %s."
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in"
+" %s; moving it to %s."
msgstr ""
-"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va canviar de nom a %s; "
-"movent-lo a %s."
+"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va "
+"canviar de nom a %s; movent-lo a %s."
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
+"CONFLICT (file location): %s added in %s inside a directory that was renamed"
+" in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori "
-"que va canviar de nom a %s suggerint que potser hauria de moure's "
-"a %s."
+"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori que va "
+"canviar de nom a %s suggerint que potser hauria de moure's a %s."
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
"CONFLICTE (ubicació del fitxer): %s canviat al nom %s a %s, dins d'un "
-"directori que va canviar de nom a %s, suggerint que potser hauria de moure's "
-"a %s."
+"directori que va canviar de nom a %s, suggerint que potser hauria de moure's"
+" a %s."
-#: merge-ort.c:2103
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr "CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
+msgstr ""
+"CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
-#: merge-ort.c:2198
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
-"conflicts AND collides with another path; this may result in nested conflict "
-"markers."
+"conflicts AND collides with another path; this may result in nested conflict"
+" markers."
msgstr ""
+"CONFLICTE (canvi de nom implicat en la col·lisió): el canvi de nom de %s -> "
+"%s té conflictes de contingut i col·lisiona amb un altre camí; això pot "
+"donar lloc a marcadors de conflicte imbricats."
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha suprimit "
-"a %s."
+"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha "
+"suprimit a %s."
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-ort.c:2981
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
+"CONFLICTE (fitxer/directori): directori en el camí de %s des de %s; en "
+"comptes es mou a %s."
-#: merge-ort.c:3055
+#: merge-ort.c:3721
#, c-format
msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
+"CONFLICT (distinct types): %s had different types on each side; renamed both"
+" of them so each can be recorded somewhere."
msgstr ""
+"CONFLICTE (tipus diferents): %s tenia diferents tipus a cada costat; se'ls "
+"ha canviat el nom per tal que cadascun pugui ser registrat en algun lloc."
-#: merge-ort.c:3062
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
+"CONFLICTE (tipus diferents): %s té diferents tipus a cada costat; s'ha "
+"canviat el nom d'un d'ells per tal que cadascun pugui ser registrat en algun"
+" lloc."
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "contingut"
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "submòdul"
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-ort.c:3198
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-"CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
+"CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La "
+"versió %s de %s s'ha deixat en l'arbre."
-#: merge-ort.c:3433
-#, c-format
+#: merge-ort.c:4152
+#, fuzzy, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
"copy renamed to %s"
msgstr ""
+"Nota: %s no està actualitzat i en forma de comprovar la versió en conflicte;"
+" còpia antiga reanomenada a %s"
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
-#.
-#: merge-ort.c:3730
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
+msgstr ""
+"ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5004,110 +5169,111 @@
"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Ja està al dia."
-#: merge-recursive.c:356
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:379
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
-#: merge-recursive.c:388
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
-#: merge-recursive.c:876
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: merge-recursive.c:887
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:910
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
-#: merge-recursive.c:956
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:981
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: merge-recursive.c:992
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
#, 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:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançament ràpid al submòdul %s"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions següents)"
+"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions "
+"següents)"
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
"fusions)"
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
"escrit a %s."
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5116,7 +5282,7 @@
"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:1501
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5125,7 +5291,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5134,7 +5300,7 @@
"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:1513
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5143,66 +5309,66 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "S'està refusant a perdre el fitxer brut a %s"
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig "
"de l'operació."
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit "
"%s a %s"
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
"com a %s"
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
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:1735
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
#, 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:2090
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5213,90 +5379,91 @@
"%s perquè el directori %s s'han canviat de nom a múltiples altres "
"directoris, sense una destinació per a la majoria dels fitxers."
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+"%s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
"nom de directori %s->%s en %s"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+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. S'està afegint %s com a "
-"%s"
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a"
+" %s"
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "S'està fusionant:"
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat en comú:"
msgstr[1] "s'han trobat %u avantpassats en comú:"
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
@@ -5304,187 +5471,237 @@
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "el fitxer de l'índex multipaquet %s és massa petit"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura 0x%08x"
+"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura "
+"0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "no es reconeix la versió %d de l'índex multipaquet"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la versió del hash índex multipaquet %u no coincideix amb la versió %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "falta un fragment de nom de paquet necessari al multi-index"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de «%s»"
+msgstr ""
+"els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de "
+"«%s»"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és massa petit"
+"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és "
+"massa petit"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet"
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "no es pot emmagatzemar el fitxer d'índex invers"
-#: midx.c:933
+#: midx.c:990
+#, fuzzy, c-format
+msgid "could not parse line: %s"
+msgstr "no s'ha pogut analitzar %s"
+
+#: midx.c:992
+#, fuzzy, c-format
+msgid "malformed line: %s"
+msgstr "línia d'entrada mal formada: «%s»."
+
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"s'està ignorant l'índex multipaquet existent; la suma de verificació no "
+"coincideix"
+
+#: midx.c:1184
+#, fuzzy
+msgid "could not load pack"
+msgstr "no s'ha pogut finalitzar «%s»"
+
+#: midx.c:1190
+#, fuzzy, c-format
+msgid "could not open index for %s"
+msgstr "s'ha produït un error en obrir l'índex per «%s»"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
-#: midx.c:979
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no s'ha vist caure el fitxer empaquetat %s"
-
-#: midx.c:1024
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "paquet preferit desconegut: «%s»"
-#: midx.c:1029
+#: midx.c:1289
+#, fuzzy, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no s'ha vist caure el fitxer empaquetat %s"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "el paquet preferit «%s» ha caducat"
-#: midx.c:1045
+#: midx.c:1380
msgid "no pack files to index."
msgstr "no hi ha fitxers empaquetats a indexar."
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1417
+#, fuzzy
+msgid "could not write multi-pack bitmap"
+msgstr "no s'ha pogut escriure la plantilla de comissió"
+
+#: midx.c:1427
+#, fuzzy
+msgid "could not write multi-pack-index"
+msgstr "no s'han pogut netejar els percentatges multi-paquet"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: midx.c:1156
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
-#: midx.c:1214
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
-msgstr "el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
+msgstr ""
+"el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
-#: midx.c:1222
+#: midx.c:1585
+msgid "incorrect checksum"
+msgstr "suma de verificació incorrecta"
+
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "S'estan cercant fitxers empaquetats referenciats"
-#: midx.c:1237
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1242
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "el midx no conté cap oid"
-#: midx.c:1251
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
-#: midx.c:1260
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1280
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "S'estan ordenant els objectes per fitxer empaquetats"
-#: midx.c:1287
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "S'estan verificant els desplaçaments dels objectes"
-#: midx.c:1303
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
-"no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
+msgstr "no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
-#: midx.c:1309
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer empaquetat %s"
-#: midx.c:1318
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != "
+"%<PRIx64>"
-#: midx.c:1343
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "S'estan comptant els objectes referenciats"
-#: midx.c:1353
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
-#: midx.c:1544
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "no s'ha pogut iniciar el pack-objects"
-#: midx.c:1564
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "no s'ha pogut finalitzar el pack-objects"
@@ -5507,12 +5724,10 @@
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
msgstr ""
"No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
-"avortar la fusió prèvia abans de començar una fusió de notes nova."
+"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
#: notes-merge.c:284
#, c-format
@@ -5536,283 +5751,284 @@
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
-#.
#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Valor erroni de %s: «%s»"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
+"no existeix el directori d'objecte %s; comproveu "
+".git/objects/info/alternates"
-#: object-file.c:577
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
-#: object-file.c:649
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació massa "
-"profunda"
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
+"massa profunda"
-#: object-file.c:656
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
-#: object-file.c:699
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
-#: object-file.c:717
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer «alternates»"
-#: object-file.c:724
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
-#: object-file.c:759
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
-#: object-file.c:780
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
-#: object-file.c:786
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el repositori de referència «%s» no és un repositori local."
-#: object-file.c:792
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el repositori de referència «%s» és superficial"
-#: object-file.c:800
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el repositori de referència «%s» és empeltat"
-#: object-file.c:860
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
-#: object-file.c:1010
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap ha fallat"
+#: object-file.c:1008
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap ha fallat%s"
-#: object-file.c:1195
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objecte solt corrupte «%s»"
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "brossa al final de l'objecte solt «%s»"
-#: object-file.c:1374
-msgid "invalid object type"
-msgstr "tipus d'objecte és incorrecte"
-
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type"
-
-#: object-file.c:1461
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "no s'ha pogut desempaquetar la capçalera %s"
-
-#: object-file.c:1467
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type"
-
-#: object-file.c:1470
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut analitzar la capçalera %s"
-#: object-file.c:1697
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "tipus d'objecte és incorrecte"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "no s'ha pogut desempaquetar la capçalera %s"
+
+#: object-file.c:1434
+#, c-format, fuzzy
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "la capçalera per a percentatges és massa llarga, supera els bytes"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte %s"
-#: object-file.c:1701
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "no s'ha trobat el reemplaçament %s per a %s"
-#: object-file.c:1705
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
-#: object-file.c:1709
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
-#: object-file.c:1814
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "no s'ha pogut escriure al fitxer %s"
-#: object-file.c:1821
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut establir el permís a «%s»"
-#: object-file.c:1828
+#: object-file.c:1795
msgid "file write error"
msgstr "s'ha produït un error en escriure al fitxer"
-#: object-file.c:1848
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "error en tancar el fitxer d'objecte solt"
-#: object-file.c:1913
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-"permisos insuficients per a afegir un objecte a la base de dades del repositori "
-"%s"
+"permisos insuficients per a afegir un objecte a la base de dades del "
+"repositori %s"
-#: object-file.c:1915
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un fitxer temporal"
-#: object-file.c:1939
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
-#: object-file.c:1945
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
-#: object-file.c:1949
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
-#: object-file.c:1953
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confós per la font de dades inestable de l'objecte per a %s"
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "ha fallat utime() a %s"
-#: object-file.c:2040
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "no es pot llegir l'objecte per a %s"
-#: object-file.c:2091
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "comissió corrupta"
-#: object-file.c:2099
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "etiqueta corrupta"
-#: object-file.c:2199
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "error de lectura mentre s'indexava %s"
-#: object-file.c:2202
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "lectura curta mentre s'indexa %s"
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: no s'han pogut inserir a la base de dades"
-#: object-file.c:2291
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipus de fitxer no suportat"
-#: object-file.c:2315
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s no és un objecte vàlid"
-#: object-file.c:2317
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de «%s» vàlid"
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "no coincideix la suma per a %s (s'esperava %s)"
-#: object-file.c:2559
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut fer «mmap» %s"
-#: object-file.c:2564
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut desempaquetar la capçalera de %s"
-#: object-file.c:2570
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut analitzar la capçalera de %s"
-#: object-file.c:2581
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'han pogut desempaquetar els continguts de %s"
-#: object-name.c:486
+#: object-name.c:480
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "l'id d'objecte curt %s és ambigu"
-#: object-name.c:497
+#: object-name.c:491
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: object-name.c:796
+#: object-name.c:790
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"
@@ -5836,22 +6052,22 @@
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
-#: object-name.c:916
+#: object-name.c:910
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "registre per a «%.*s» només retorna a %s"
-#: object-name.c:924
+#: object-name.c:918
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "registre per a «%.*s» només té %d entrades"
-#: object-name.c:1702
+#: object-name.c:1696
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "el camí «%s» existeix al disc, però no a «%.*s»"
-#: object-name.c:1708
+#: object-name.c:1702
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5860,45 +6076,45 @@
"el camí «%s» existeix, però no «%s»\n"
"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
-#: object-name.c:1717
+#: object-name.c:1711
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "el camí «%s» no existeix en «%.*s»"
-#: object-name.c:1745
+#: object-name.c:1739
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
-"el camí «%s» està a l'índex, però no a «stage» %d\n."
-"consell: volíeu dir «:%d:%s»?"
+"el camí «%s» està a l'índex, però no a «stage» %d\n"
+".consell: volíeu dir «:%d:%s»?"
-#: object-name.c:1761
+#: object-name.c:1755
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
-"el camí «%s» està a l'índex, però no a «%s»\n."
-"consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?"
+"el camí «%s» està a l'índex, però no a «%s»\n"
+".consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?"
-#: object-name.c:1769
+#: object-name.c:1763
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "el camí «%s» existeix al disc, però no a l'índex"
-#: object-name.c:1771
-#, c-format
+#: object-name.c:1765
+#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "el camí «%s» no existeix (ni al disc ni a l'índex)"
-#: object-name.c:1784
+#: object-name.c:1778
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"la sintaxi de camí relatiu no es pot utilitzar fora de l'arbre de treball"
-#: object-name.c:1922
+#: object-name.c:1916
#, c-format
msgid "invalid object name '%.*s'."
msgstr "nom d'objecte no vàlid «%.*s»."
@@ -5913,27 +6129,42 @@
msgid "object %s is a %s, not a %s"
msgstr "l'objecte %s és %s, no pas %s"
-#: object.c:232
+#: object.c:250
#, c-format
msgid "object %s has unknown type id %d"
msgstr "l'objecte %s té un identificador de tipus %d desconegut"
-#: object.c:245
+#: object.c:263
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
#, c-format
msgid "hash mismatch %s"
msgstr "el resum no coincideix %s"
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:348
+#, fuzzy
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
+
+#: pack-bitmap.c:424
+#, fuzzy
+msgid "load_reverse_index: could not open pack"
+msgstr "Loadreverseindex: no s'ha pogut obrir el paquet"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "no s'ha pogut obtenir la mida de %s"
-#: pack-bitmap.c:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, fuzzy, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no s'ha pogut finalitzar «%s»"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "no s'ha pogut obtenir l'ús del disc de %s"
@@ -5956,49 +6187,54 @@
#: pack-revindex.c:238
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa"
#: pack-revindex.c:243
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "no es pot escriure i verificar l'índex invers"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "no s'ha pogut fer stat a: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "s'ha produït un error en fer %s llegible"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: packfile.c:1937
+#: packfile.c:656
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "el fitxer de paquet %s no es pot mapar%s"
+
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
-#: packfile.c:1941
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'opció «%s» espera un valor numèric"
@@ -6018,123 +6254,145 @@
msgid "malformed object name '%s'"
msgstr "nom d'objecte «%s» mal format"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s requereix un valor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s és incompatible amb %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: és incompatible amb alguna altra cosa"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s no accepta cap valor"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s no és disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
-msgstr "voleu dir «--%s» (amb dos traços)?"
+msgstr "voleu dir «--%s» (amb dos guionets)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "àlies de --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "opció desconeguda «%s»"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "«switch» «%c» desconegut"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opció no ascii desconeguda en la cadena: «%s»"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
-#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#: parse-options.c:969
+#, c-format, fuzzy
+msgid "%*s%s"
+msgstr "%*s%"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"El caràcter d'escapament «\\» no està permès com a últim caràcter en un "
"valor d'un atribut"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Només es permet una especificació «attr:»."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "una especificació d'atribut no pot estar buida"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'atribut no vàlid %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
"incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6142,52 +6400,52 @@
"el paràmetre d'especificació de camí «literal» global és incompatible amb "
"tots els altres paràmetres d'especificació de camí globals"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: «literal» i «glob» són incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: «%s» està fora del repositori en «%s»"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "«%s» (mnemònic: «%c»)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "la línia està mal citada: %s"
@@ -6201,14 +6459,14 @@
msgstr "no s'ha pogut escriure el paquet delim"
#: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "no s'ha pogut escriure el paquet de separació sense estat"
+msgid "unable to write response end packet"
+msgstr "no s'ha pogut escriure el paquet de final de resposta"
#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "s'ha produït un error en escriure el paquet de buidatge"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "error de protocol: longitud de línia impossible"
@@ -6216,7 +6474,7 @@
msgid "packet write with format failed"
msgstr "ha fallat l'escriptura del paquet amb format"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
@@ -6227,25 +6485,25 @@
msgid "packet write failed: %s"
msgstr "no s'ha pogut escriure el paquet: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "el remot ha penjat inesperadament"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocol: longitud de línia errònia %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
@@ -6263,19 +6521,19 @@
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: promisor-remote.c:30
+#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés"
-#: promisor-remote.c:41
+#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés"
-#: promisor-remote.c:53
+#: promisor-remote.c:54
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "el nom remot «promisor» no pot començar amb «/»: %s"
@@ -6286,22 +6544,22 @@
#: prune-packed.c:35
msgid "Removing duplicate objects"
-msgstr "S'estan eliminant objectes duplicats"
+msgstr "S'estan eliminant els objectes duplicats"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "no s'ha pogut iniciar «log»"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "no s'ha pogut llegir la sortida de «log»"
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5603
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6310,70 +6568,69 @@
"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava "
"amb «commit»: «%s»"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
-#: range-diff.c:306
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "s'ha produït un error en generar el diff"
-#: range-diff.c:558
-#
+#: range-diff.c:559
msgid "--left-only and --right-only are mutually exclusive"
msgstr "--left-only i --right-only són mútuament excloents"
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
-#: read-cache.c:708
+#: read-cache.c:710
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
-#: read-cache.c:724
+#: read-cache.c:726
msgid "cannot create an empty blob in the object database"
msgstr "no es pot crear un blob buit a la base de dades d'objectes"
-#: read-cache.c:746
+#: read-cache.c:748
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git"
-#: read-cache.c:751
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "«%s» no té una comissió comprovada"
-#: read-cache.c:803
+#: read-cache.c:805
#, c-format
msgid "unable to index file '%s'"
msgstr "no es pot llegir indexar el fitxer «%s»"
-#: read-cache.c:822
+#: read-cache.c:824
#, c-format
msgid "unable to add '%s' to index"
msgstr "no s'ha pogut afegir «%s» a l'índex"
-#: read-cache.c:833
+#: read-cache.c:835
#, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut fer «stat» a «%s»"
-#: read-cache.c:1356
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "«%s» apareix com a fitxer i com a directori"
-#: read-cache.c:1571
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Actualitza l'índex"
-#: read-cache.c:1700
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6382,7 +6639,7 @@
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1710
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6391,155 +6648,153 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1766
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "signatura malmesa 0x%08x"
-#: read-cache.c:1769
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "versió d'índex incorrecta %d"
-#: read-cache.c:1778
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "signatura sha1 malmesa al fitxer d'índex"
-#: read-cache.c:1812
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
-#: read-cache.c:1814
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "s'està ignorant l'extensió %.4s"
-#: read-cache.c:1851
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrada d'índex desconeguda «0x%08x»"
-#: read-cache.c:1867
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
-#: read-cache.c:1924
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "entrades «stage» no ordenades en l'índex"
-#: read-cache.c:1927
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
-#: read-cache.c:1930
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrades «stage» no ordenades per a «%s»"
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: read-cache.c:2180
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil «load_cache_entries»: %s"
-#: read-cache.c:2193
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s"
-#: read-cache.c:2226
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: ha fallat l'obertura del fitxer d'índex"
-#: read-cache.c:2230
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: no es pot fer «stat» a l'índex obert"
-#: read-cache.c:2234
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: fitxer d'índex més petit que s'esperava"
-#: read-cache.c:2238
+#: read-cache.c:2267
#, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: no es pot mapar el fitxer d'índex"
+msgid "%s: unable to map index file%s"
+msgstr "%s: no es pot mapar el fitxer d'índex%s"
-#: read-cache.c:2280
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no s'ha pogut crear un fil «load_index_extensions»: %s"
-#: read-cache.c:2307
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no s'ha pogut unir un fil «load_index_extensions»: %s"
-#: read-cache.c:2345
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
-#: read-cache.c:2392
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:3138
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "s'ha produït un error en convertir a un índex dispers"
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:3222
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:3234
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: read-cache.c:3263
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no s'han pogut corregir els bits de permisos en «%s»"
-#: read-cache.c:3412
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no es pot baixar fins al «stage» #0"
#: rebase-interactive.c:11
msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --"
-"continue».\n"
+"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --continue».\n"
"O bé, podeu avortar el «rebase» amb «git rebase --abort».\n"
#: rebase-interactive.c:33
@@ -6579,25 +6834,20 @@
"p, pick <comissió> = usa la comissió\n"
"r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
"e, edit <comissió> = usa la comissió, però atura't per a esmenar-la\n"
-"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió "
-"prèvia\n"
+"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió prèvia\n"
"f, fixup [-C | -c] <commit> = com a «squash», però manté només el missatge\n"
" de comissió previ, a menys que s'usi -C, en aquest cas\n"
" manté només el missatge d'aquesta comissió; -c és el mateix\n"
" que -C, però obre l'editor\n"
-"x, exec <ordre> = executa l'ordre (la resta de la línia) usant "
-"l'intèrpret d'ordres\n"
-"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --"
-"continue»)\n"
+"x, exec <ordre> = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
+"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --continue»)\n"
"d, drop <comissió> = elimina la comissió\n"
"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
"t, reset <etiqueta> = reinicia HEAD a una etiqueta\n"
"m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
". crea una comissió de fusió usant el missatge de la comissió\n"
-". de fusió original (o línia única, si no hi ha cap comissió de fusió "
-"original\n"
-". especificada). Useu -c <comissió> per a reescriure el missatge de la "
-"comissió.\n"
+". de fusió original (o línia única, si no hi ha cap comissió de fusió original\n"
+". especificada). Useu -c <comissió> per a reescriure el missatge de la comissió.\n"
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
@@ -6608,16 +6858,15 @@
msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
-"comissió.\n"
+"No elimineu cap línia. Useu «drop» explícitament per a eliminar una comissió.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6625,7 +6874,7 @@
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6639,7 +6888,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6649,14 +6898,14 @@
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3886
+#: sequencer.c:3912 sequencer.c:5709 builtin/fsck.c:328 builtin/gc.c:1790
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "no s'ha pogut escriure «%s»"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "no s'ha pogut escriure a «%s»."
@@ -6667,8 +6916,7 @@
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
"Les comissions descartades (més nova a més vella):\n"
#: rebase-interactive.c:203
@@ -6676,26 +6924,21 @@
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una "
-"comissió.\n"
+"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una comissió.\n"
"\n"
-"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell "
-"d'advertències.\n"
+"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell d'advertències.\n"
"Els comportaments possibles són: ignore, warn, error.\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
-#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+#: rebase.c:29
+#, c-format, fuzzy
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "percentatges: \"preservei\" substituït per \"merges\""
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
msgstr "no hi és"
@@ -6714,132 +6957,142 @@
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
-#: ref-filter.c:175
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:177
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:199
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:203
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:205
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) desconegut: %s"
-#: ref-filter.c:260
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no accepta arguments"
-#: ref-filter.c:282
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argument %%(objectsize) no reconegut: %s"
-#: ref-filter.c:290
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no accepta arguments"
-#: ref-filter.c:302
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta arguments"
-#: ref-filter.c:315
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argument %%(subject) no reconegut: %s"
-#: ref-filter.c:334
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr ""
+msgstr "s'esperava %%(trailers:key=<value>)"
-#: ref-filter.c:336
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) desconegut: %s"
-#: ref-filter.c:367
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:369
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) no reconegut: %s"
-#: ref-filter.c:384
+#: ref-filter.c:443
+#, fuzzy, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "argument %%(%s) desconegut: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positiu esperat «%s» a %%(%s)"
-#: ref-filter.c:388
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argument no reconegut «%s» a %%(%s)"
-#: ref-filter.c:402
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "opció del correu electrònic no reconeguda: «%s»"
-#: ref-filter.c:432
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:444
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:451
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:460
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) no reconegut: %s"
-#: ref-filter.c:468
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:486
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) no reconegut: %s"
-#: ref-filter.c:588
+#: ref-filter.c:568
+#, fuzzy, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(body) no accepta arguments"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:619
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6847,127 +7100,137 @@
"no és un repositori, git però el camp «%.*s» requereix accés a les dades de "
"l'objecte"
-#: ref-filter.c:743
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
-#: ref-filter.c:807
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
-#: ref-filter.c:809
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
-#: ref-filter.c:811
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:839
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
-#: ref-filter.c:841
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
-#: ref-filter.c:843
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
-#: ref-filter.c:858
+#: ref-filter.c:965
#, 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:915
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format, fuzzy
+msgid "this command reject atom %%(%.*s)"
+msgstr "aquesta ordre rebutja l'àtom%(%.*s)"
+
+#: ref-filter.c:1040
+#, fuzzy, c-format
+msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
+msgstr "--object-format no es pot usar sense --stdin"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(sense branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1559
-#, c-format
+#: ref-filter.c:1709
+#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
-#: ref-filter.c:1562
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(sense branca, bisecció començada en %s)"
-#: ref-filter.c:1566
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
-#: ref-filter.c:1569
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat des de %s)"
-#: ref-filter.c:1572
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(sense branca)"
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1614
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
-#: ref-filter.c:1997
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
-#: ref-filter.c:2086
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: ref-filter.c:2431
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2525
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: ref-filter.c:2530
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opció «%s» ha d'apuntar a una comissió"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s no apunta a un objecte vàlid"
-#: refs.c:566
-#, c-format
+#: refs.c:563
+#, fuzzy, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"is subject to change. To configure the initial branch name to use in all\n"
@@ -6980,82 +7243,92 @@
"\n"
"\tgit branch -m <name>\n"
msgstr ""
+"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca per defecte\n"
+"està subjecte a canvis. Per a configurar el nom inicial de la branca que s'utilitzarà en tots\n"
+"els repositoris nous, i que suprimirà aquest avís, useu:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Els noms escollits habitualment en lloc de «master» són «main», «trunk» i «development»\n"
+"La branca acabada de crear es pot canviar de nom amb aquesta ordre:\n"
+"\n"
+"\tgit branch -m <nom>"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "no s'ha pogut recuperar «%s»"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nom de branca no vàlida: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "s'està ignorant symref penjant %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "registre per a ref %s té un buit després de %s"
-#: refs.c:929
-#, , c-format
+#: refs.c:927
+#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "registre per als ref %s ha acabat inesperadament a %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "el registre per a %s és buit"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "s'està refusant la referència amb nom malmès «%s»"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "ha fallat update_ref per a la ref «%s»: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "no es permeten múltiples actualitzacions per a la referència «%s»"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "les actualitzacions de referències s'han avortat per un lligam"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "«%s» existeix; no es pot crear «%s»"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no es poden processar «%s» i «%s» a la vegada"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "no s'han pogut suprimir les referències: %s"
@@ -7066,9 +7339,10 @@
msgstr "refspec no vàlida: «%s»"
#: remote.c:351
-#, fuzzy, c-format
+#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "config remote abreviation no pot començar amb «/»: %s"
+msgstr ""
+"l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
#: remote.c:399
msgid "more than one receivepack given, using the first"
@@ -7111,12 +7385,12 @@
#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
-msgstr "l'especificació de referència de src %s coincideix amb més d'una referència"
+msgstr ""
+"l'especificació de referència de src %s coincideix amb més d'una referència"
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
-#.
#: remote.c:1103
#, fuzzy, c-format
msgid ""
@@ -7132,9 +7406,9 @@
msgstr ""
"La destinació que heu proporcionat no és un nom de referència complet (és a "
"dir començant per \"refs/\"). Hem intentat endevinar el que voleu dir amb - "
-"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar "
-"si el <src> ser empès ('%s') és una referència a \"refs/{headtags}/\". Si és "
-"així afegirem un refs/{headstags que no ha funcionat completament."
+"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar"
+" si el <src> ser empès ('%s') és una referència a \"refs/{headtags}/\". Si "
+"és així afegirem un refs/{headstags que no ha funcionat completament."
#: remote.c:1123
#, c-format
@@ -7175,8 +7449,8 @@
"'%s:refs/tags/%s'?"
msgstr ""
"La part <src> de l'especificació de la referència és un objecte blob.\n"
-"Voleu posar una etiqueta al blob nou mitjançant la pujada a\n?"
-"«%s:refs/tags/%s»?"
+"Voleu posar una etiqueta al blob nou mitjançant la pujada a\n"
+"?«%s:refs/tags/%s»?"
#: remote.c:1174
#, c-format
@@ -7191,7 +7465,9 @@
#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
-msgstr "l'especificació de la referència dst %s coincideixen amb més d'una referència"
+msgstr ""
+"l'especificació de la referència dst %s coincideixen amb més d'una "
+"referència"
#: remote.c:1204
#, c-format
@@ -7221,7 +7497,8 @@
#, 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 amb seguiment remot"
+"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment "
+"remot"
#: remote.c:1769
#, c-format
@@ -7354,7 +7631,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "s'han produït errors en escriure «%s» (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2247 builtin/gc.c:2282
#, c-format
msgid "failed to flush '%s'"
msgstr "no s'ha pogut buidar «%s»"
@@ -7399,8 +7676,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Imatge prèvia registrada per a «%s»"
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori «%s»"
@@ -7438,46 +7715,43 @@
msgid "could not determine HEAD revision"
msgstr "no s'ha pogut determinar la revisió de HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3703
#, c-format
msgid "failed to find tree of %s"
msgstr "s'ha produït un error en cercar l'arbre de %s"
-#: revision.c:2343
-msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> ja no s'ha admet"
+#: revision.c:2259
+#, fuzzy
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--dir-diff és incompatible amb --no-index"
-#: revision.c:2683
+#: revision.c:2346
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ja no s'admet"
+
+#: revision.c:2655 revision.c:2659
+#, fuzzy
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--dir-diff és incompatible amb --no-index"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2686
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2892
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»"
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "s'ha produït un error en obrir /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil «async»: %s"
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
-"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7498,71 +7772,75 @@
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
-#: send-pack.c:455
+#: send-pack.c:457
+#, fuzzy
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
+"ha fallat la negociació de l'empenta; s'està procedint igualment amb "
+"l'empenta"
-#: send-pack.c:52
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "el receptor de destí no admet l'algorisme d'hash del repositori"
+msgstr "el receptor de destí no admet l'algorisme de hash del repositori"
-#: send-pack.c:529
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:531
+#: send-pack.c:539
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
msgstr ""
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:543
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:548
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "no s'ha pogut suprimir «%s»"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4752 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "no s'ha pogut eliminar «%s»"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revertir"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "acció desconeguda: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7570,119 +7848,138 @@
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb «git add <camins>» o «git rm <camins>»"
-#: sequencer.c:422
+#: sequencer.c:423
+#, fuzzy
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb «git add <camins>» o «git rm <camins>»\n"
-"i cometeu el resultat amb «git commit»"
+"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
+"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
+"Alternativament podeu ometre aquesta comissió: executeu «git rebase --skip».\n"
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+#, fuzzy
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
+"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
+"Alternativament podeu ometre aquesta comissió: executeu «git rebase --skip».\n"
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
+
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3564 sequencer.c:5619 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3572
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
-#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hi ha una clau a «%.*s»"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no s'han pogut treure les cometes del valor de «%s»"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable «%s» desconeguda"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta «GIT_AUTHOR_NAME»"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta «GIT_AUTHOR_DATE»"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7699,8 +7996,7 @@
" git rebase --continue\n"
msgstr ""
"teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
-"executeu:\n"
+"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n"
"\n"
" git commit --amend %s\n"
"\n"
@@ -7712,11 +8008,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1227
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
-#: sequencer.c:1218
+#: sequencer.c:1233
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7743,7 +8039,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1246
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7769,343 +8065,348 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1288
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: sequencer.c:1275
+#: sequencer.c:1290
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: sequencer.c:1321
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
-#: sequencer.c:1323
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "HEAD separat"
-#: sequencer.c:1327
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (comissió arrel)"
-#: sequencer.c:1348
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: sequencer.c:1436 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "identitat d'autor no vàlida: «%s»"
-#: sequencer.c:1491
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "autor malmès: falta la informació de la data"
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1643 builtin/commit.c:1821
+#: builtin/merge.c:913 builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1572 sequencer.c:4524 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sequencer.c:1606
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: sequencer.c:1611
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:1737
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "El primer missatge de comissió s'ometrà:"
-#: sequencer.c:1739
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:1740
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
-#: sequencer.c:1934
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1951 sequencer.c:3599
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:2072
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:2079
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "no es pot arreglar la comissió arrel"
-#: sequencer.c:2098
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:2120
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:2205
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:2265
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:2287
-#, fuzzy, c-format
+#: sequencer.c:2302
+#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-"deixant anar per cents per cents -- el contingut del pedaç ja s'ha avançat"
+msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
-#: sequencer.c:2345
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
-#: sequencer.c:2352
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
-#: sequencer.c:2425
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no accepta arguments: «%s»"
-#: sequencer.c:2434
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "falten els arguments per a %s"
-#: sequencer.c:2477
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "no s'ha pogut analitzar «%s»"
-#: sequencer.c:2538
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no es pot «%s» sense una comissió prèvia"
-#: sequencer.c:2635
+#: sequencer.c:2620 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
+
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "s'està cancel·lant un «cherry pick» en curs"
-#: sequencer.c:2644
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "s'està cancel·lant la reversió en curs"
-#: sequencer.c:2690
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
-#: sequencer.c:2692
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:2697
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:2708
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:2710
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:2788
+#: sequencer.c:2805
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:2897
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "«squash-onto» no usable"
-#: sequencer.c:2917
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3029 sequencer.c:4903
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:3029
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "una reversió ja està en curs"
-#: sequencer.c:3031
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
-#: sequencer.c:3034
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "un «cherry pick» ja està en curs"
-#: sequencer.c:3036
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
-#: sequencer.c:3050
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:3065
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3142 sequencer.c:4613
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3146 sequencer.c:3190
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:3159 builtin/grep.c:759
+#: sequencer.c:3176 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
-#: sequencer.c:3161
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:3162
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:3168
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:3179
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
-#: sequencer.c:3220
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "no hi ha cap reversió en curs"
-#: sequencer.c:3229
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "ni hi ha cap «cherry pick» en curs"
-#: sequencer.c:3239
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "s'ha produït un error en ometre la comissió"
-#: sequencer.c:3246
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "no hi ha res a ometre"
-#: sequencer.c:3249
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
@@ -8114,16 +8415,16 @@
"heu fet ja una comissió?\n"
"proveu «git %s --continue»"
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3428 sequencer.c:4504
msgid "cannot read HEAD"
msgstr "no es pot llegir HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3436
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8142,27 +8443,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3483
+#: sequencer.c:3500
#, c-format
msgid "Executing: %s\n"
msgstr "S'està executant: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3515
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8177,11 +8478,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3521
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
-#: sequencer.c:3510
+#: sequencer.c:3527
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8197,92 +8498,92 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3571
+#: sequencer.c:3589
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
-#: sequencer.c:3625
+#: sequencer.c:3662
msgid "writing fake root commit"
msgstr "s'està escrivint una comissió arrel falsa"
-#: sequencer.c:3630
+#: sequencer.c:3667
msgid "writing squash-onto"
msgstr "s'està escrivint «squash-onto»"
-#: sequencer.c:3714
+#: sequencer.c:3746
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: sequencer.c:3747
+#: sequencer.c:3778
msgid "cannot merge without a current revision"
msgstr "no es pot fusionar sense una revisió actual"
-#: sequencer.c:3769
+#: sequencer.c:3800
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:3778
+#: sequencer.c:3809
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "no hi ha res per fusionar «%.*s»"
-#: sequencer.c:3790
+#: sequencer.c:3821
#, fuzzy
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"no es pot executar la fusió del pop a la part superior d'una [arrel nova]"
-#: sequencer.c:3806
+#: sequencer.c:3876
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
-#: sequencer.c:3989
+#: sequencer.c:4022
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no s'ha pogut fusionar «%.*s»"
-#: sequencer.c:4005
+#: sequencer.c:4038
msgid "merge: Unable to write new index file"
msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:4079
+#: sequencer.c:4119
msgid "Cannot autostash"
msgstr "no es pot fer un «stash» automàticament"
-#: sequencer.c:4082
+#: sequencer.c:4122
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Resposta de «stash» inesperada: «%s»"
-#: sequencer.c:4088
+#: sequencer.c:4128
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No s'ha pogut crear el directori per a «%s»"
-#: sequencer.c:4091
+#: sequencer.c:4131
#, c-format
msgid "Created autostash: %s\n"
msgstr "S'ha creat un «stash» automàticament: %s\n"
-#: sequencer.c:4095
+#: sequencer.c:4135
msgid "could not reset --hard"
msgstr "no s'ha pogut fer reset --hard"
-#: sequencer.c:4120
+#: sequencer.c:4160
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:4132
+#: sequencer.c:4172
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:4135
+#: sequencer.c:4175
#, c-format
msgid ""
"%s\n"
@@ -8293,30 +8594,30 @@
"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-#: sequencer.c:4140
+#: sequencer.c:4180
msgid "Applying autostash resulted in conflicts."
msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
-#: sequencer.c:4141
+#: sequencer.c:4181
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4253
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: sequencer.c:4249
+#: sequencer.c:4268
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a HEAD\n"
-#: sequencer.c:4251
+#: sequencer.c:4270
#, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s\n"
-#: sequencer.c:4259
+#: sequencer.c:4302
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8337,58 +8638,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4305
+#: sequencer.c:4348
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "S'està fent «rebase» (%d/%d)%s"
-#: sequencer.c:4351
+#: sequencer.c:4394
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:4422
+#: sequencer.c:4464
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:4481
+#: sequencer.c:4512
msgid "could not read orig-head"
msgstr "no s'ha pogut llegir orig-head"
-#: sequencer.c:4486
+#: sequencer.c:4517
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir «onto»"
-#: sequencer.c:4500
+#: sequencer.c:4531
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:4560
+#: sequencer.c:4591
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
-#: sequencer.c:4612
+#: sequencer.c:4643
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:4621
+#: sequencer.c:4652
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:4623
+#: sequencer.c:4654
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:4625
+#: sequencer.c:4656
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:4628
+#: sequencer.c:4659
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8398,50 +8699,60 @@
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Cometeu-los primer i després executeu «git rebase --continue» de nou."
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4695 sequencer.c:4734
#, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut escriure el fitxer: «%s»"
-#: sequencer.c:4719
+#: sequencer.c:4750
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4726
+#: sequencer.c:4760
msgid "could not commit staged changes."
msgstr "no s'han pogut cometre els canvis «staged»."
-#: sequencer.c:4846
+#: sequencer.c:4880
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:4850
+#: sequencer.c:4884
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
-#: sequencer.c:4885
+#: sequencer.c:4919
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: sequencer.c:5362
+#: sequencer.c:5190 sequencer.c:5419
+#, fuzzy, c-format
+msgid "skipped previously applied commit %s"
+msgstr "esmena la comissió anterior"
+
+#: sequencer.c:5260 sequencer.c:5435
+#, fuzzy
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "useu --reapply-cherry-picks per incloure les comissions omeses"
+
+#: sequencer.c:5406
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
-#: sequencer.c:5365
+#: sequencer.c:5409
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5667 sequencer.c:5684
msgid "nothing to do"
msgstr "res a fer"
-#: sequencer.c:5651
+#: sequencer.c:5703
msgid "could not skip unnecessary pick commands"
msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-#: sequencer.c:5751
+#: sequencer.c:5803
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
@@ -8457,8 +8768,7 @@
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
-"localment."
+"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin localment."
#: setup.c:198
#, c-format
@@ -8467,8 +8777,7 @@
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
-"treball.\n"
+"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de treball.\n"
"Useu «--» per a separar els camins de les revisions:\n"
"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
@@ -8494,137 +8803,126 @@
"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
"vàlida"
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "aquesta operació s'ha d'executar en un arbre de treball"
-#: setup.c:661
+#: setup.c:658
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de repositori de git <= %d, s'ha trobat %d"
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "s'han trobat extensions de repositori desconegudes:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "s'ha trobat una extensió de repositori desconeguda:"
+msgstr[1] "s'han trobat extensions de repositori desconegudes:"
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "el repositori és versió 0, però només s'han trobat extensions v1:"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] ""
+"el repositori és versió 0, però només s'han trobat una extensió v1:"
+msgstr[1] "el repositori és versió 0, però només s'han trobat extensions v1:"
-#: setup.c:700
+#: setup.c:701
#, c-format
msgid "error opening '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: setup.c:702
+#: setup.c:703
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "massa gran per a ser un fitxer .git: «%s»"
-#: setup.c:704
+#: setup.c:705
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
-#: setup.c:706
+#: setup.c:707
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
-#: setup.c:708
+#: setup.c:709
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
-#: setup.c:710
+#: setup.c:711
#, c-format
msgid "not a git repository: %s"
msgstr "no és un repositori de git: %s"
-#: setup.c:812
+#: setup.c:813
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
-#: setup.c:826
+#: setup.c:827
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un repositori de git: «%s»"
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no es pot canviar de directori a «%s»"
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
msgid "cannot come back to cwd"
msgstr "no es pot tornar al directori de treball actual"
-#: setup.c:987
+#: setup.c:988
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
-#: setup.c:1225
+#: setup.c:1231
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
-#: setup.c:1245
+#: setup.c:1251
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "no és un repositori de git (ni cap dels directoris pares): %s"
-#: setup.c:1251
+#: setup.c:1257
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"no és un repositori de git (ni cap pare fins al punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"no està establert)."
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)."
-#: setup.c:1370
+#: setup.c:1381
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-"hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
-"(0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
-"escriptura."
+"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "s'ha produït un error en obrir /dev/null o dup"
-
-#: setup.c:1432
+#: setup.c:1443
msgid "fork failed"
msgstr "el «fork» ha fallat"
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "«setsid» ha fallat"
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:156
-#, fuzzy
-msgid "unable to update cache-tree, staying full"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
-
-#: sparse-index.c:239
-#, c-format
+#: sparse-index.c:273
+#, fuzzy, c-format
msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
+msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
#: strbuf.c:850
@@ -8678,13 +8976,13 @@
msgstr[0] "%u byte/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir «%s» per a escriptura"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "no s'ha pogut editar «%s»"
@@ -8702,14 +9000,15 @@
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-"s'està ignorant «%s» que pot interpretar-se com a una opció de línia d'ordres: %s"
+"s'està ignorant «%s» que pot interpretar-se com a una opció de línia "
+"d'ordres: %s"
#: submodule-config.c:499
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
@@ -8734,22 +9033,22 @@
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "al submòdul sense popular «%s»"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "argument incorrecte --ignore-submodules: %s"
-#: submodule.c:818
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8758,50 +9057,50 @@
"El submòdul en la comissió %s al camí: «%s» col·lideix amb un submòdul amb "
"el mateix nom. Ometent-lo."
-#: submodule.c:921
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
-#: submodule.c:1006
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1» "
-"en el submòdul %s"
+"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1»"
+" en el submòdul %s"
-#: submodule.c:1129
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "ha fallat el procés per al submòdul «%s»"
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
-#: submodule.c:1169
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "S'està pujant el submòdul «%s»\n"
-#: submodule.c:1172
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "No s'ha pogut pujar el submòdul «%s»\n"
-#: submodule.c:1464
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "S'està obtenint el submòdul %s%s\n"
-#: submodule.c:1498
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "No s'ha pogut accedir al submòdul «%s»\n"
-#: submodule.c:1653
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8810,61 +9109,63 @@
"Errors durant l'obtenció de submòduls:\n"
"%s"
-#: submodule.c:1678
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» no reconegut com un repositori git"
-#: submodule.c:1695
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "No s'ha pogut executar «git status --porcelain=2» en el submòdul %s"
-#: submodule.c:1736
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "«git status --porcelain=2» ha fallat en el submòdul %s"
-#: submodule.c:1811
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
-#: submodule.c:1824
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no s'ha pogut executar «git status» al submòdul «%s»"
-#: submodule.c:1839
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
+msgstr ""
+"No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
+msgstr ""
+"s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
-#: submodule.c:1887
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "no s'ha pogut restablir l'índex del submòdul"
-#: submodule.c:1929
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1981
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "No s'ha pogut actualitzar el submòdul «%s»."
-#: submodule.c:2049
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "submodule git dir «%s» està dins git dir «%.*s»"
-#: submodule.c:2070
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8872,17 +9173,17 @@
"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:2086
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "s'ha refusat moure «%s» a un directori git existent"
-#: submodule.c:2093
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8893,11 +9194,11 @@
"«%s» a\n"
"«%s»\n"
-#: submodule.c:2221
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2261
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
@@ -8919,7 +9220,7 @@
msgstr "valor desconegut «%s» per a la clau «%s»"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
@@ -8934,11 +9235,11 @@
msgid "could not read input file '%s'"
msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "no s'ha pogut llegir des de stdin"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
@@ -9006,7 +9307,7 @@
msgid "error while running fast-import"
msgstr "error en executar la importació ràpida"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "no s'ha pogut llegir la referència %s"
@@ -9024,7 +9325,7 @@
msgid "invalid remote service path"
msgstr "el camí del servei remot no és vàlid"
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "opció no admesa pel protocol"
@@ -9033,77 +9334,75 @@
msgid "can't connect to subservice %s"
msgstr "no es pot connectar al subservei %s"
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
+#, fuzzy
msgid "--negotiate-only requires protocol v2"
-msgstr ""
+msgstr "--negotiate-only requereix el protocol v2"
#: transport-helper.c:755
-#, fuzzy
msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' sense una directiva 'ok/error' coincident"
+msgstr "«option» sense una directiva «ok/error» coincident"
#: transport-helper.c:798
#, fuzzy, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\""
-#: transport-helper.c:855
+#: transport-helper.c:859
#, fuzzy, c-format
msgid "helper reported unexpected status of %s"
msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, fuzzy, c-format
msgid "helper %s does not support dry-run"
msgstr "els ajudants no donen suport a l'execució seca"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, fuzzy, c-format
msgid "helper %s does not support --signed"
msgstr "els ajudants per cents no són compatibles --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, fuzzy, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "l'ajudant per cents no admet --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, fuzzy, c-format
msgid "helper %s does not support --atomic"
msgstr "els ajudants no admeten --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, fuzzy, c-format
msgid "helper %s does not support --%s"
msgstr "els ajudants per cents no són compatibles --signed"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, fuzzy, c-format
msgid "helper %s does not support 'push-option'"
msgstr "els ajudants no donen suport a «push-option»"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
#, fuzzy
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"remot-helper no permet prémer; es necessiten especificacions de referència"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, fuzzy, c-format
msgid "helper %s does not support 'force'"
msgstr "els ajudants no donen suport a «force»"
-#: transport-helper.c:1112
-#, fuzzy
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar «fast-export»"
+msgstr "no s'ha pogut executar l'exportació ràpida"
-#: transport-helper.c:1117
-#, fuzzy
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "error en executar l'exportació ràpida"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, fuzzy, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9112,52 +9411,52 @@
"No hi ha referències en comú i no n'hi ha cap especificat. Potser hauríeu "
"d'especificar una branca com ara «master»."
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, fuzzy, c-format
msgid "unsupported object format '%s'"
msgstr "objecte mal format a «%s»"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, fuzzy, c-format
msgid "malformed response in ref list: %s"
msgstr "resposta mal formada en la llista de referències"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, fuzzy, c-format
msgid "read(%s) failed"
msgstr "ha fallat read(%)"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, fuzzy, c-format
msgid "write(%s) failed"
msgstr "ha fallat l(%)"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "%s ha fallat el fil"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, fuzzy, c-format
msgid "%s thread failed to join: %s"
msgstr "el fil per cents no s'ha pogut unir als percentatges"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "no es pot iniciar el fil per copiar les dades: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "el procés %s no ha pogut esperar"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "el procés %s ha fallat"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "no es pot iniciar el fil per copiar dades"
@@ -9171,51 +9470,47 @@
msgid "could not read bundle '%s'"
msgstr "no s'ha pogut llegir el paquet «%s»"
-#: transport.c:220
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:272
-#, fuzzy
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
-msgstr "vegeu protocol.version a «git help config» per a més detalls"
+msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
-#: transport.c:273
-#, fuzzy
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
-#: transport.c:400
-#, fuzzy
+#: transport.c:407
msgid "server does not support wait-for-done"
-msgstr "El servidor no admet --deepen"
+msgstr "el servidor no admet «wait-for-done»"
-#: transport.c:751
-#, fuzzy
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
-#: transport.c:826
-#, fuzzy
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
-msgstr "encara no s'ha implementat la implementació del protocol v2"
+msgstr ""
+"encara no s'ha implementat la compatibilitat amb la versió v2 del protocol"
-#: transport.c:960
-#, fuzzy, c-format
+#: transport.c:967
+#, c-format
msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut per config «%s»%s"
+msgstr "valor desconegut per al config «%s»': %s"
-#: transport.c:1026
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "no es permet el transport «%s»"
-#: transport.c:1079
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ja no s'admet"
-#: transport.c:1181
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9224,7 +9519,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:1185
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9250,11 +9545,11 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:1193
+#: transport.c:1197
msgid "Aborting."
msgstr "S'està avortant."
-#: transport.c:1340
+#: transport.c:1344
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "no s'ha pogut prémer tots els submòduls necessaris"
@@ -9281,8 +9576,7 @@
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
#: unpack-trees.c:117
@@ -9291,8 +9585,7 @@
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
"%%s"
#: unpack-trees.c:120
@@ -9301,8 +9594,7 @@
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
#: unpack-trees.c:122
@@ -9311,8 +9603,7 @@
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
"%%s"
#: unpack-trees.c:125
@@ -9348,8 +9639,7 @@
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:138
@@ -9358,8 +9648,7 @@
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en agafar:\n"
"%%s"
#: unpack-trees.c:141
@@ -9368,8 +9657,7 @@
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:143
@@ -9378,8 +9666,7 @@
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
"%%s"
#: unpack-trees.c:146
@@ -9403,23 +9690,19 @@
#: unpack-trees.c:154
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:156
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
"%%s"
#: unpack-trees.c:159
@@ -9428,8 +9711,7 @@
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:161
@@ -9438,8 +9720,7 @@
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
"%%s"
#: unpack-trees.c:164
@@ -9448,8 +9729,7 @@
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
#: unpack-trees.c:166
@@ -9458,8 +9738,7 @@
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%s"
#: unpack-trees.c:174
@@ -9479,8 +9758,7 @@
#: unpack-trees.c:180
#, fuzzy, c-format
msgid ""
-"The following paths are not up to date and were left despite sparse "
-"patterns:\n"
+"The following paths are not up to date and were left despite sparse patterns:\n"
"%s"
msgstr ""
"Els camins següents no estan actualitzats i es van deixar a pesar que s'han "
@@ -9491,14 +9769,12 @@
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
-msgstr ""
-"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
#: unpack-trees.c:184
#, fuzzy, c-format
msgid ""
-"The following paths were already present and thus not updated despite sparse "
-"patterns:\n"
+"The following paths were already present and thus not updated despite sparse patterns:\n"
"%s"
msgstr ""
"Els camins següents ja estaven presents i, per tant, no s'han actualitzat "
@@ -9534,17 +9810,18 @@
"minúscules) i només un del mateix grup de col·lisió es troba a l'arbre de "
"treball"
-#: unpack-trees.c:1519
+#: unpack-trees.c:1620
#, fuzzy
msgid "Updating index flags"
msgstr "Actualitzant els indicadors d’índex"
-#: unpack-trees.c:2608
-#, c-format
+#: unpack-trees.c:2772
+#, fuzzy, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
+"l'arbre de treball i la comissió no seguida tenen entrades duplicades: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
#, fuzzy
msgid "expected flush after fetch arguments"
msgstr "s'esperava una neteja després de les capacitats"
@@ -9582,114 +9859,126 @@
msgid "Fetching objects"
msgstr "S'estan obtenint objectes"
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir «%s»"
-#: worktree.c:304
+#: worktree.c:303
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "«%s» a l'arbre de treball principal no és al directori del repositori"
-#: worktree.c:315
+#: worktree.c:314
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"El fitxer «%s» no conté el camí absolut a la ubicació de l'arbre de treball"
-#: worktree.c:327
+#: worktree.c:326
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» no existeix"
-#: worktree.c:333
+#: worktree.c:332
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "«%s» no és un fitxer .git, codi d'error %d"
-#: worktree.c:342
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "«%s» no assenyala de tornada a «%s»"
-#: worktree.c:608
+#: worktree.c:603
msgid "not a directory"
msgstr "no és en un directori"
-#: worktree.c:617
+#: worktree.c:612
msgid ".git is not a file"
msgstr ".git no és un fitxer"
-#: worktree.c:619
+#: worktree.c:614
msgid ".git file broken"
msgstr "fitxer .git malmès"
-#: worktree.c:621
+#: worktree.c:616
msgid ".git file incorrect"
msgstr "fitxer .git malmès"
-#: worktree.c:727
+#: worktree.c:722
msgid "not a valid path"
msgstr "no és un camí vàlid"
-#: worktree.c:733
+#: worktree.c:728
msgid "unable to locate repository; .git is not a file"
msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
-#: worktree.c:737
+#: worktree.c:732
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un repositori"
+msgstr ""
+"no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un "
+"repositori"
-#: worktree.c:741
+#: worktree.c:736
msgid "unable to locate repository; .git file broken"
msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
-#: worktree.c:747
+#: worktree.c:742
msgid "gitdir unreadable"
msgstr "gitdir illegible"
-#: worktree.c:751
+#: worktree.c:746
msgid "gitdir incorrect"
msgstr "gitdir incorrecte"
-#: worktree.c:776
+#: worktree.c:771
msgid "not a valid directory"
msgstr "no és en un directori vàlid"
-#: worktree.c:782
+#: worktree.c:777
msgid "gitdir file does not exist"
msgstr "el fitxer gitdir no existeix"
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
-#: worktree.c:806
+#: worktree.c:801
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
-#: worktree.c:814
+#: worktree.c:809
msgid "invalid gitdir file"
msgstr "fitxer gitdir no vàlid"
-#: worktree.c:822
+#: worktree.c:817
msgid "gitdir file points to non-existent location"
msgstr "el fitxer gitdir indica una ubicació no existent"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, fuzzy, c-format
+msgid "could not setenv '%s'"
+msgstr "no s'ha pogut establir «%s»"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a «%s»"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
@@ -9704,7 +9993,8 @@
#: wt-status.c:190 wt-status.c:222
#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr " (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
+msgstr ""
+" (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
@@ -9724,11 +10014,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu «git rm <fitxer>...» per a senyalar resolució)"
-#: wt-status.c:211 wt-status.c:1075
+#: wt-status.c:211 wt-status.c:1125
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1134
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
@@ -9741,10 +10031,10 @@
msgstr " (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)"
#: wt-status.c:241
-msgid ""
-" (use \"git restore <file>...\" to discard changes in working directory)"
+msgid " (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (useu «git restore <file>...» per a descartar els canvis en el directori de treball)"
+" (useu «git restore <file>...» per a descartar canvis en el directori "
+"de treball)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
@@ -9828,22 +10118,22 @@
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:908
+#: wt-status.c:958
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "L'«stash» té actualment %d entrada"
msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:939
+#: wt-status.c:989
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:941
+#: wt-status.c:991
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:1023
+#: wt-status.c:1073
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9851,7 +10141,7 @@
"No modifiqueu ni elimineu la línia de dalt.\n"
"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1115
+#: wt-status.c:1165
#, c-format
msgid ""
"\n"
@@ -9862,108 +10152,109 @@
"S'ha trigat un %.2f segons a calcular els valors de la branca d'endavant i darrere.\n"
"Podeu utilitzar «--no-ahead-behind» per a evitar-ho.\n"
-#: wt-status.c:1145
+#: wt-status.c:1195
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1148
+#: wt-status.c:1198
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu «git commit»)"
-#: wt-status.c:1150
+#: wt-status.c:1200
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu «git merge --abort» per a avortar la fusió)"
-#: wt-status.c:1154
+#: wt-status.c:1204
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1157
+#: wt-status.c:1207
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu «git commit» per a concloure la fusió)"
-#: wt-status.c:1166
+#: wt-status.c:1216
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1169
+#: wt-status.c:1219
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1173
+#: wt-status.c:1223
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu «git am --continue»)"
-#: wt-status.c:1175
+#: wt-status.c:1225
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu «git am --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1177
+#: wt-status.c:1227
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu «git am --abort» per a restaurar la branca original)"
-#: wt-status.c:1310
+#: wt-status.c:1360
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
-#: wt-status.c:1312
+#: wt-status.c:1362
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1315
+#: wt-status.c:1365
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Última ordre feta (%d ordre feta):"
msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
-#: wt-status.c:1326
+#: wt-status.c:1376
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1331
+#: wt-status.c:1381
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1334
+#: wt-status.c:1384
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Ordre següent a fer (manca %d ordre):"
msgstr[1] "Ordres següents a fer (manquen %d ordres):"
-#: wt-status.c:1342
+#: wt-status.c:1392
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu «git rebase --edit-todo» per a veure i editar)"
-#: wt-status.c:1354
+#: wt-status.c:1404
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
-#: wt-status.c:1359
+#: wt-status.c:1409
msgid "You are currently rebasing."
msgstr "Actualment esteu fent «rebase»."
-#: wt-status.c:1372
+#: wt-status.c:1422
msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (arregleu els conflictes i després executeu «git rebase --continue»)"
+msgstr ""
+" (arregleu els conflictes i després executeu «git rebase --continue»)"
-#: wt-status.c:1374
+#: wt-status.c:1424
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu «git rebase --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1376
+#: wt-status.c:1426
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (useu «git rebase --abort» per a agafar la branca original)"
-#: wt-status.c:1383
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
-#: wt-status.c:1387
+#: wt-status.c:1437
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9971,160 +10262,165 @@
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1392
+#: wt-status.c:1442
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un «rebase»."
-#: wt-status.c:1395
+#: wt-status.c:1445
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu «git "
"rebase --continue»)"
-#: wt-status.c:1399
+#: wt-status.c:1449
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1404
+#: wt-status.c:1454
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
-#: wt-status.c:1407
+#: wt-status.c:1457
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu «git commit --amend» per a esmenar la comissió actual)"
-#: wt-status.c:1409
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: wt-status.c:1459
+msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (useu «git rebase --continue» una vegada que estigueu satisfet amb els "
"vostres canvis)"
-#: wt-status.c:1420
+#: wt-status.c:1470
msgid "Cherry-pick currently in progress."
msgstr "Hi ha «cherry pick» actualment en curs."
-#: wt-status.c:1423
+#: wt-status.c:1473
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-#: wt-status.c:1430
+#: wt-status.c:1480
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu «git cherry-pick --continue»)"
-#: wt-status.c:1433
+#: wt-status.c:1483
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (executeu «git cherry-pick --continue» per a continuar)"
-#: wt-status.c:1436
+#: wt-status.c:1486
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-" (tots els conflictes estan arreglats: executeu «git cherry-pick --"
-"continue»)"
+" (tots els conflictes estan arreglats: executeu «git cherry-pick "
+"--continue»)"
-#: wt-status.c:1438
+#: wt-status.c:1488
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1440
+#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (useu «git cherry-pick --abort» per a cancel·lar l'operació de «cherry "
"pick»)"
-#: wt-status.c:1450
+#: wt-status.c:1500
msgid "Revert currently in progress."
msgstr "Una reversió està actualment en curs."
-#: wt-status.c:1453
+#: wt-status.c:1503
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1459
+#: wt-status.c:1509
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu «git revert --continue»)"
-#: wt-status.c:1462
+#: wt-status.c:1512
msgid " (run \"git revert --continue\" to continue)"
msgstr " (executeu «git revert --continue» per a continuar)"
-#: wt-status.c:1465
+#: wt-status.c:1515
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu «git revert --continue»)"
-#: wt-status.c:1467
+#: wt-status.c:1517
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (useu «git revert --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1469
+#: wt-status.c:1519
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1479
+#: wt-status.c:1529
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
-#: wt-status.c:1483
+#: wt-status.c:1533
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1486
+#: wt-status.c:1536
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:1497
+#: wt-status.c:1547
+#, fuzzy
+msgid "You are in a sparse checkout."
+msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
+
+#: wt-status.c:1550
#, fuzzy, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Esteu en una baixada del pagament amb un 1% d'arxius seguits presents."
+msgstr ""
+"Esteu en una baixada del pagament amb un 1% d'arxius seguits presents."
-#: wt-status.c:1736
+#: wt-status.c:1794
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1743
+#: wt-status.c:1801
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
-#: wt-status.c:1745
+#: wt-status.c:1803
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
-#: wt-status.c:1750
+#: wt-status.c:1808
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.c:1752
+#: wt-status.c:1810
msgid "HEAD detached from "
msgstr "HEAD separat des de "
-#: wt-status.c:1755
+#: wt-status.c:1813
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1772
+#: wt-status.c:1830
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1773
+#: wt-status.c:1831
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara"
-#: wt-status.c:1787
+#: wt-status.c:1845
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1789
+#: wt-status.c:1847
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1793
+#: wt-status.c:1851
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10136,30 +10432,30 @@
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"«git help status»)."
-#: wt-status.c:1799
+#: wt-status.c:1857
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1801
+#: wt-status.c:1859
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1807
+#: wt-status.c:1865
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1812
+#: wt-status.c:1870
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "no hi ha canvis afegits a cometre (useu «git add» o «git commit -a»)\n"
-#: wt-status.c:1816
+#: wt-status.c:1874
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1820
+#: wt-status.c:1878
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10168,88 +10464,87 @@
"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
"per a seguir-los)\n"
-#: wt-status.c:1824
+#: wt-status.c:1882
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
-#: wt-status.c:1828
+#: wt-status.c:1886
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hi ha res a cometre (creeu/copieu fitxers i useu «git add» per a seguir-"
"los)\n"
-#: wt-status.c:1832 wt-status.c:1838
+#: wt-status.c:1890 wt-status.c:1896
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1835
+#: wt-status.c:1893
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
+msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1840
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
-#: wt-status.c:1945
+#: wt-status.c:2003
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
-#: wt-status.c:1949
+#: wt-status.c:2007
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1980
+#: wt-status.c:2038
msgid "different"
msgstr "diferent"
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2040 wt-status.c:2048
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2043 wt-status.c:2046
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2569
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2517
+#: wt-status.c:2575
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2519
+#: wt-status.c:2577
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "no s'ha pogut enviar l'ordre IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "no s'ha pogut llegir la resposta IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "no s'ha pogut començar un fil «accept_thread» «%s»"
-#: compat/simple-ipc/ipc-unix-socket.c:874
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, fuzzy, c-format
msgid "could not start worker[0] for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
@@ -10258,137 +10553,133 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/add.c:61
-#, fuzzy, c-format
+#: builtin/add.c:64
+#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "no es pot canviar de directori a «%s»"
+msgstr "no es pot fer chmod %cx «%s»"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "elimina «%s»\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir «%s» per a escriptura."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:343
+#: builtin/add.c:351
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"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "fer una prova"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:371
-#, fuzzy
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet que el camí s'afegirà més tard"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-"comproveu si els fitxers, fins i tot els absents, s'ignoren en fer una "
-"prova"
+"comproveu si els fitxers, fins i tot els absents, s'ignoren en fer una prova"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#, fuzzy
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "inicialitza el «sparse-checkout» en mode con"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "avisa'm quan s'afegeixi un repositori incrustat"
-#: builtin/add.c:386
-#, fuzzy
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
-msgstr "backend per a «git stash -p»"
+msgstr "rerefons per a «git stash -p»"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10419,12 +10710,12 @@
"\n"
"Vegeu «git help submodule» per a més informació."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "s'està afegint un repositori incrustat: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10434,51 +10725,51 @@
"Desactiveu aquest missatge executant\n"
"«git config advice.addIgnoredFile false»"
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run és incompatible amb --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file és incompatible amb --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file és incompatible amb --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»"
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul requereix --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10488,111 +10779,111 @@
"Desactiveu aquest missatge executant\n"
"«git config advice.addEmptyPathspec false»"
-#: builtin/am.c:364
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:454
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:496
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:534
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:560
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:748
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:813
+#: builtin/am.c:815
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:861
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:873
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "desplaçament del fus horari no vàlid"
-#: builtin/am.c:966
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:976
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1125
+#: builtin/am.c:1127
#, 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:1126
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si preferiu ometre aquest pedaç, executeu «%s --skip» en lloc d'això."
-#: builtin/am.c:1127
+#: builtin/am.c:1129
#, 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»."
+"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s "
+"--abort»."
-#: builtin/am.c:1222
-#, fuzzy
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1224
+msgid ""
+"Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-"Pedaç enviat amb format=flux; es pot perdre espai al final de les línies."
+"Pedaç enviat amb format=flowed; es pot perdre l'espai al final de les línies."
-#: builtin/am.c:1250
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "El pedaç està buit."
-#: builtin/am.c:1315
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "manca la línia d'autor en la comissió %s"
-#: builtin/am.c:1318
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1537
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
-"vies."
+"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió "
+"de 3 vies."
-#: builtin/am.c:1539
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1558
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10600,67 +10891,65 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1564
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
-#: builtin/am.c:1590
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1622
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1696
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. 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:1706
+#: builtin/am.c:1708
#, c-format
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:1752 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1756
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1796 builtin/am.c:1864
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1813
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1819
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1823
-#, fuzzy
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Utilitzeu 'git am --show-current-patch=diff' per veure el pedaç fallit"
+msgstr "Useu «git am --show-current-patch=diff» per veure el pedaç que ha fallat"
-#: builtin/am.c:1867
+#: builtin/am.c:1868
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10670,30 +10959,27 @@
"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1874
+#: builtin/am.c:1875
msgid ""
"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Encara teniu camins sense fusionar a l'índex.\n"
-"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los "
-"com a tal.\n"
-"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel "
-"fitxer."
+"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los com a tal.\n"
+"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel fitxer."
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:2033
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2077
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10701,165 +10987,160 @@
"Sembla que heu mogut HEAD després de l'última fallada de «am».\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2184
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2226
-#, fuzzy, c-format
+#: builtin/am.c:2229
+#, c-format
msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor no vàlid per --show-current-patch%s"
+msgstr "Valor no vàlid per --show-current-patch: %s"
-#: builtin/am.c:2230
-#, fuzzy, c-format
+#: builtin/am.c:2233
+#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s és incompatible amb --show-current-patch=%s"
-#: builtin/am.c:2261
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2262
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2268
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2270
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2272
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2275
-#, fuzzy
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/am.c:2278
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2280
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2282
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2284
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2286
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2289
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
-#: builtin/am.c:2292
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2294
-#, fuzzy
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
-msgstr "passa-ho a través de git-apply"
+msgstr "passa-ho a través del git-mailinfo"
-#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306
-#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318
-#: builtin/am.c:2324
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2321
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2327
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2329
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2332
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2335
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2338
-#, fuzzy
-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:2341
-#, fuzzy
-msgid "abort the patching operation but keep HEAD where it is"
-msgstr "avorta l'operació de pedaç però manté HEAD on és."
+msgid "restore the original branch and abort the patching operation"
+msgstr "restaura la branca original i interromp l'operació d'apedaçament"
-#: builtin/am.c:2345
-#, fuzzy
+#: builtin/am.c:2344
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "interromp l'operació d'apedaçament però manté HEAD on és"
+
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "mostra el pedaç que s'està aplicant"
-#: builtin/am.c:2350
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2352
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2358
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2376
+#: builtin/am.c:2379
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."
@@ -10867,18 +11148,18 @@
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. No l'useu més."
-#: builtin/am.c:2383
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2398
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2422
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10887,12 +11168,11 @@
"S'ha trobat un directori %s extraviat.\n"
"Useu «git am --abort» per a eliminar-lo."
-#: builtin/am.c:2428
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
-#: builtin/am.c:2438
-#, fuzzy
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
@@ -10900,129 +11180,126 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "no s'ha pogut redirigir la sortida"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Remot sense URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: %s NACK"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: error de protocol"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: s'esperava una neteja"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<comissió>]"
-#: builtin/bisect--helper.c:24
-#, fuzzy
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <goodterm> <badterm> [<term>]"
-
#: builtin/bisect--helper.c:25
-#, fuzzy
msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+"--term-new]"
msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-bad | --term-new]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+"--term-new]"
#: builtin/bisect--helper.c:26
-#, fuzzy
msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
msgstr ""
-"git bisect--helper --bisect-start [---term-{oldgood}=<term> --term-{newbad}"
-"=<term>][--no-checkout] [<bad> [<good>]] [-] [<paths>]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
#: builtin/bisect--helper.c:28
-#, fuzzy
msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-next"
#: builtin/bisect--helper.c:29
-#, fuzzy
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
#: builtin/bisect--helper.c:30
-#, fuzzy
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
#: builtin/bisect--helper.c:31
-#, fuzzy
msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-replay <filename>"
#: builtin/bisect--helper.c:32
-#, fuzzy
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-#: builtin/bisect--helper.c:107
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <ordre>..."
+
+#: builtin/bisect--helper.c:109
+#, c-format
msgid "cannot open file '%s' in mode '%s'"
-msgstr "no es pot copiar «%s» a «%s»"
+msgstr "no es pot obrir el fitxer «%s» en mode «%s»"
-#: builtin/bisect--helper.c:114
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:116
+#, c-format
msgid "could not write to file '%s'"
-msgstr "no s'ha pogut escriure el fitxer: «%s»"
+msgstr "no s'ha pogut escriure el fitxer «%s»"
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no es pot obrir «%s» per a lectura"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "«%s» no és un terme vàlid"
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no es pot usar l'ordre interna «%s» com a terme"
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no es pot canviar el significat del terme «%s»"
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
-msgstr "useu dos termes distintes"
+msgstr "useu dos termes diferents"
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
#, fuzzy, c-format
msgid "We are not bisecting.\n"
msgstr "No estem bisecant."
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "«%s» no és una comissió vàlida"
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
#, fuzzy, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11030,27 +11307,27 @@
"no s'ha pogut comprovar l'original HEAD «%s». Proveu «git bisect reset "
"<commit>»."
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
#, fuzzy, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Arguments de bisectriu incorrectes"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»"
-#: builtin/bisect--helper.c:271
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:288
+#, c-format
msgid "couldn't open the file '%s'"
msgstr "no s'ha pogut obrir el fitxer «%s»"
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
#, fuzzy, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ordre no vàlida esteu actualment en un percentatge/%s bisect"
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
#, fuzzy, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11059,7 +11336,7 @@
"Heu de donar-me com a mínim un per cents i un per cents de revisió. Podeu "
"utilitzar «git bisectrius» i «git bisectris» per a això."
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
#, fuzzy, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11067,10 +11344,9 @@
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
"Heu de començar per «git bisect start». \n"
-"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu "
-"utilitzar «git bisect %s» i «git bisect %s» per a això."
+"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu utilitzar «git bisect %s» i «git bisect %s» per a això."
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "bisecant amb només una comissió %s"
@@ -11078,16 +11354,15 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "cap terme definit"
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
#, fuzzy, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11096,7 +11371,7 @@
"Els seus actuals termes són percentatges per al vell Estat i percentatges "
"per al nou Estat."
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11105,174 +11380,219 @@
"argument no vàlid %s per a «git bisect terms».\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
#, fuzzy
msgid "revision walk setup failed\n"
msgstr "la configuració del passeig per revisions ha fallat"
-#: builtin/bisect--helper.c:519
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:536
+#, c-format
msgid "could not open '%s' for appending"
-msgstr "no s'ha pogut obrir «%s» per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a afegir-hi"
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
-#, fuzzy
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "«%s» no és un terme vàlid"
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opció no reconeguda: «%s»"
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "«%s» no sembla ser una revisió vàlida"
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorrecte - Cal un HEAD"
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»."
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: builtin/bisect--helper.c:735
-#, fuzzy
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorrecte - referència simbòlica estranya"
-#: builtin/bisect--helper.c:755
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:772
+#, c-format
msgid "invalid ref: '%s'"
-msgstr "ref '%s' no és vàlid"
+msgstr "referència no és vàlida: «%s»"
-#: builtin/bisect--helper.c:813
-#, fuzzy
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
-msgstr "Cal començar per «git bisect start»"
+msgstr "Cal començar per «git bisect start»\n"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vostè [Y/n]? "
-#: builtin/bisect--helper.c:842
-#, fuzzy
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Si us plau crideu `--bisect-state` amb almenys un argument"
+msgstr "Executeu «--bisect-state» amb almenys un argument"
-#: builtin/bisect--helper.c:855
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:872
+#, c-format
msgid "'git bisect %s' can take only one argument."
-msgstr "«git bisect $TERM_BAD» pot acceptar només un argument."
+msgstr "«git bisect %s» només pot acceptar un argument."
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#, c-format
msgid "Bad rev input: %s"
-msgstr "Introducció de revisió errònia: $arg"
+msgstr "Entrada amb revisió errònia: %s"
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
#, fuzzy, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Introducció de revisió errònia: $arg"
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "No estem bisecant."
-#: builtin/bisect--helper.c:969
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:986
+#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "?? de què parleu?"
+msgstr "«%s»? Què voleu dir?"
-#: builtin/bisect--helper.c:981
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:998
+#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "no es pot llegir $file per a reproducció"
+msgstr "no es pot llegir «%s» per a reproducció"
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "s'està executant %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, fuzzy, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"el pas de bisecció ha fallat:\n"
+"el codi de sortida $res de «$command» és < 0 o bé >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "no es pot obrir «%s» per a escriptura"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "el pas de bisecció no pot continuar més"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "pas de bisecció reeixit"
+
+#: builtin/bisect--helper.c:1157
+#, fuzzy, c-format
+msgid "bisect found first bad commit"
+msgstr "bisecant amb només una comissió %s"
+
+#: builtin/bisect--helper.c:1160
+#, fuzzy, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"el pas de bisecció ha fallat:\n"
+"«bisect_state $state» ha sortit amb el codi d'error $res"
+
+#: builtin/bisect--helper.c:1192
#, fuzzy
msgid "reset the bisection state"
msgstr "restableix l'estat de la bisecció"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
#, fuzzy
msgid "check whether bad or good terms exist"
msgstr "comprova si existeixen termes incorrectes o bons"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimeix els termes de la bisectriu"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
#, fuzzy
msgid "start the bisect session"
msgstr "inicia la sessió bisect"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
#, fuzzy
msgid "find the next bisection commit"
msgstr "no es pot esmenar una comissió no existent"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
#, fuzzy
msgid "mark the state of ref (or refs)"
msgstr "marca l'estat de ref (o refs)"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
#, fuzzy
msgid "list the bisection steps so far"
msgstr "restableix l'estat de la bisecció"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
+#, fuzzy
msgid "replay the bisection process from the given file"
-msgstr ""
+msgstr "torna a reproduir el procés de bisecció des del fitxer donat"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
#, fuzzy
msgid "skip some commits for checkout"
msgstr "la branca o entrega a agafar"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+#, fuzzy
+msgid "visualize the bisection"
+msgstr "inicia la sessió bisect"
+
+#: builtin/bisect--helper.c:1212
+#, fuzzy
+msgid "use <cmd>... to automatically bisect."
+msgstr "no cometis automàticament"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "no hi ha registre per a BISECT_WRITE"
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
#, fuzzy
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset no requereix cap argument ni una comissió"
-#: builtin/bisect--helper.c:1092
-#, fuzzy
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requereix 2 o 3 arguments"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requereix 0 o 1 argument"
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next no requereix cap argument"
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
#, fuzzy
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-next no requereix cap argument"
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
#, fuzzy
msgid "no logfile given"
msgstr "Cap fitxer de registre donat"
@@ -11285,180 +11605,174 @@
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:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "s'esperava un color: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "ha d'acabar amb un color"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color «%s» no vàlid en «color.blame.repeatedLines»"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "valor no vàlid per a «blame.coloring»"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "no s'ha pogut trobar la revisió %s per ignorar"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
#, fuzzy
msgid "show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
#, fuzzy
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
#, fuzzy
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:870
-#, fuzzy
+#: builtin/blame.c:866
msgid "show work cost statistics"
-msgstr "Mostra les estadístiques de preu de treball"
+msgstr "mostra les estadístiques de preu de treball"
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
#, fuzzy
msgid "show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
#, fuzzy
msgid "show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
#, fuzzy
msgid "show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
#, fuzzy
msgid "show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
#, fuzzy
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:877
+#: builtin/blame.c:873
#, fuzzy
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:878
+#: builtin/blame.c:874
#, fuzzy
msgid "show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
#, fuzzy
msgid "show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
#, fuzzy
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:881
+#: builtin/blame.c:877
#, fuzzy
msgid "show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
"desactivat)"
-#: builtin/blame.c:882
-#, fuzzy
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
#, fuzzy
msgid "ignore <rev> when blaming"
msgstr "Ignora <rev> en culpar"
-#: builtin/blame.c:884
-#, fuzzy
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
-msgstr "Ignora les revisions de <file>"
+msgstr "Ignora les revisions de <fitxer>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
#, fuzzy
msgid "color redundant metadata from previous line differently"
-msgstr "color les metadades redundants de la línia anterior de manera diferent"
+msgstr ""
+"color les metadades redundants de la línia anterior de manera diferent"
-#: builtin/blame.c:886
-#, fuzzy
+#: builtin/blame.c:882
msgid "color lines by age"
-msgstr "coloreja les línies per edat"
+msgstr "acoloreix les línies per antiguitat"
-#: builtin/blame.c:887
-#, fuzzy
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
-msgstr "Gasta cicles extres per a trobar una coincidència millor"
+msgstr "gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:888
-#, fuzzy
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
+msgstr "usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:889
-#, fuzzy
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
-msgstr "Usa els continguts de <fitxer> com a la imatge final"
+msgstr "usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:890
-#, fuzzy
+#: builtin/blame.c:886
msgid "find line copies within and across files"
-msgstr "Troba còpies de línia dins i a través dels fitxers"
+msgstr "troba còpies delínia dins i a través dels fitxers"
-#: builtin/blame.c:891
-#, fuzzy
+#: builtin/blame.c:887
msgid "find line movements within and across files"
-msgstr "Troba moviments de línia dins i a través dels fitxers"
+msgstr "troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "rang"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
#, fuzzy
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -11470,19 +11784,18 @@
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
-#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "el fitxer %s té només %lu línia"
msgstr[1] "el fitxer %s té només %lu línies"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
@@ -11585,78 +11898,78 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "no s'ha pogut analitzar la cadena de format"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "no s'ha pogut resoldre HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fora de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "no es pot copiar branca actual mentre no s'és a cap."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
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:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "La còpia de la branca ha fallat"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, 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:579
+#: builtin/branch.c:580
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:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branca està copiada, però l'actualització del fitxer de configuració ha "
"fallat"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11667,221 +11980,221 @@
" %s\n"
"S'eliminaran les línies que comencin amb «%c».\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:633
-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:634
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "mostra el hash i l'assumpte, doneu dues vegades per a la branca font"
+
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:640
-#, fuzzy
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "treu la informació de la font"
-#: builtin/branch.c:641
-msgid "use colored output"
-msgstr "usa sortida colorada"
-
#: builtin/branch.c:642
+msgid "use colored output"
+msgstr "usa sortida amb colors"
+
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
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:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "copia una branca i el seu registre de referència"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "copia una branca, encara que el destí existeixi"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "mostra el nom de la branca actual"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
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:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "hi ha massa arguments per a una operació de canvi de nom"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "hi ha massa arguments per a establir una nova font"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, 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."
+"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap "
+"branca."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "no existeix la branca «%s»"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca «%s» no existeix"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "hi ha massa arguments per a desassignar la font"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca «%s» no té informació de font"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
#, fuzzy
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar -"
-"a|-r --list <pattern>?"
+"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar "
+"-a|-r --list <pattern>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11889,33 +12202,33 @@
"L'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
"upstream-to»."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "versió de git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "informació del compilador: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "Informació de la libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
#, fuzzy
msgid "not run from a git repository - no hooks to show\n"
msgstr "no és un repositori de git: %s"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
#, fuzzy
msgid ""
"Thank you for filling out a Git bug report!\n"
@@ -11939,204 +12252,193 @@
"que passés l'error? (Pas per reproduir el vostre problema) Què espereu que "
"passi? (Comportament explotat) Què ha passat? (Comportament real) Què és "
"diferent entre el que s'esperava i què ha passat? Qualsevol altra cosa que "
-"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar "
-"qualsevol línia que vulgueu."
+"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar"
+" qualsevol línia que vulgueu."
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "especifiqueu una destinació per al fitxer d'informe d'error"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
#, fuzzy
msgid "specify a strftime format suffix for the filename"
msgstr "especifiqueu un sufix de format strftime per al nom de fitxer"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, fuzzy, c-format
msgid "could not create leading directories for '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Informació del sistema"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
#, fuzzy
msgid "Enabled Hooks"
msgstr "no s'ha pogut bifurcar"
-#: builtin/bugreport.c:177
-#, fuzzy, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no s'ha pogut crear el fitxer «%s»"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: builtin/bugreport.c:190
-#, fuzzy, c-format
+#: builtin/bugreport.c:159
+#, c-format
msgid "Created new report at '%s'.\n"
-msgstr "S'ha netejat el directori «%s»\n"
+msgstr "S'ha creat un nou informe a «%s».\n"
#: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git pack create [<opcions>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opcions>] <fitxer> <git-rev-list args>"
#: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
msgid "git bundle verify [<options>] <file>"
-msgstr "git pack verify [<opcions>] <file>"
+msgstr "git bundle verify [<opcions>] <fitxer>"
#: builtin/bundle.c:17 builtin/bundle.c:33
-#, fuzzy
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git pack list-heads <file> [<refname>]"
+msgstr "git bundle list-heads <fitxer> [<refname>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
-#, fuzzy
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle <file> [<refname>]"
+msgstr "git bundle unbundle <fitxer> [<refname>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/bundle.c:76
-#, fuzzy
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "especifica la versió del format del paquet"
+msgstr "especifica la versió del format del farcell"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "Cal un repositori per a fer un farcell."
+msgstr "Cal un repositori per a crear un farcell."
#: builtin/bundle.c:107
-#, fuzzy
msgid "do not show bundle details"
-msgstr "no mostris els detalls del paquet"
+msgstr "no mostris els detalls del farcell"
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s està bé\n"
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Cal un repositori per a desfer un farcell."
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+#: builtin/bundle.c:185
+#, fuzzy
+msgid "Unbundling objects"
+msgstr "S'estan indexant objectes"
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:599
-#, fuzzy
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:620
-#, fuzzy
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "només es pot especificar una opció per lots"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
-msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
+msgstr ""
+"en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr ""
"en els objectes de blob, executa els filtres en el contingut de l'objecte"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
+"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-"
+"check)"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
-#: builtin/cat-file.c:666
-#, fuzzy
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
-msgstr "no ordenar la sortida --batch-all-objects"
+msgstr "no ordenar la sortida de --batch-all-objects"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12154,7 +12456,7 @@
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer de stdin"
@@ -12162,8 +12464,8 @@
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:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
@@ -12217,14 +12519,14 @@
msgstr "no hi ha contactes especificats"
#: builtin/checkout--worker.c:110
-#, fuzzy
msgid "git checkout--worker [<options>]"
-msgstr "git checkout [<opcions>] <branca>"
+msgstr "git checkout--worker [<opcions>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "cadena"
@@ -12319,121 +12621,121 @@
msgid "Unable to add merge result for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: builtin/checkout.c:414
-#, fuzzy, c-format
+#: builtin/checkout.c:411
+#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Conflicte de fusió recreat en un 1%"
-msgstr[1] "Conflictes de fusió recreats en un 1%"
+msgstr[0] "Recreat un conflicte de fusió"
+msgstr[1] "Recreats %d conflictes de fusió"
-#: builtin/checkout.c:419
-#, fuzzy, c-format
+#: builtin/checkout.c:416
+#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
-msgstr[0] "Camí actualitzat d'un 1% des d'un 1%"
-msgstr[1] "Camins actualitzats a un 1% des d'un 1%"
+msgstr[0] "S'ha actualitzat %d camí des de %s"
+msgstr[1] "S'han actualitzat %d camins des de %s"
-#: builtin/checkout.c:426
+#: builtin/checkout.c:423
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "S'ha actualitzat un camí des de l'índex"
msgstr[1] "S'ha actualitzat %d camins des de l'índex"
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» no es pot usar amb actualització de camins"
-#: builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:459 builtin/checkout.c:462
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» no es pot usar amb %s"
-#: builtin/checkout.c:469
+#: builtin/checkout.c:466
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
-#: builtin/checkout.c:473
+#: builtin/checkout.c:470
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "no s'ha especificat ni «%s» ni «%s»"
-#: builtin/checkout.c:477
-#, fuzzy, c-format
+#: builtin/checkout.c:474
+#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»"
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:479 builtin/checkout.c:484
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "«%s» o «%s» no poden utilitzar-se amb %s"
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:558 builtin/checkout.c:565
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:793
-#, fuzzy, c-format
+#: builtin/checkout.c:786
+#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-"no es poden continuar amb els canvis «staged» als fitxers següents "
-"percentatges"
+"no es pot continuar amb els canvis «staged» als fitxers següents:\n"
+"%s"
-#: builtin/checkout.c:886
+#: builtin/checkout.c:879
#, 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:928
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:939
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja esteu en «%s»\n"
-#: builtin/checkout.c:943
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12456,7 +12758,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12483,19 +12785,19 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1177
#, fuzzy, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12504,7 +12806,7 @@
"\"%s\" podria ser tant un fitxer local com una branca de seguiment. Si us "
"plau useu -- (i opcionalment --no-gues) per a desambiguar"
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1184
#, fuzzy
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
@@ -12517,83 +12819,82 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
"Si voleu comprovar una branca de seguiment remota p. ex. «origen» podeu fer-"
-"ho classificant completament el nom amb l'opció --track git checkout --track "
-"origin/<name> Si voleu tenir sempre agafades d'un ambigu <name> preferiu un "
-"remot p. ex. el paràmetre remot 'origin' considereu agafar."
-"defaultRemote=origin a la vostra configuració."
+"ho classificant completament el nom amb l'opció --track git checkout --track"
+" origin/<name> Si voleu tenir sempre agafades d'un ambigu <name> preferiu un"
+" remot p. ex. el paràmetre remot 'origin' considereu "
+"agafar.defaultRemote=origin a la vostra configuració."
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "només s'esperava una referència"
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»"
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "s'espera una branca, s'ha obtingut «%s»"
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
-#: builtin/checkout.c:1412
-#, fuzzy
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca mentre es fusiona «git merge --quit» o «git "
-"worktree add»."
+"no es pot canviar de branca mentre es fusiona\n"
+"Considereu usar «git merge --quit» o «git worktree add»."
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1409
#, fuzzy
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca al mig d'una sessió am Considereu \"git am --quit"
-"\" o \"git worktree add\"."
+"no es pot canviar de branca al mig d'una sessió am Considereu \"git am "
+"--quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1413
#, fuzzy
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o "
-"«git worktree add»."
+"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o"
+" «git worktree add»."
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1417
#, fuzzy
msgid ""
"cannot switch branch while cherry-picking\n"
@@ -12602,7 +12903,7 @@
"no es pot canviar de branca mentre «cherry pick» considera «git cherry-pick "
"--quit» o «git worktree add»."
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12610,140 +12911,140 @@
"no es pot canviar de branca mentre s'està revertint\n"
"Considereu «git revert --quit» o «git worktree add»."
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1425
#, fuzzy
msgid "you are switching branch while bisecting"
msgstr "s'està canviant la branca mentre es bisect"
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "«%s» no pot prendre <start-point>"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1468
#, 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:1482
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "manca branca o argument de comissió"
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1527
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1540
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1542
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:1562
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c i --orphan són mútuament excloents"
-#: builtin/checkout.c:1628
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p i --overlay són mútuament excloents"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "falta el nom de la branca; proveu -%c"
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "no es pot resoldre %s"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
"comissió"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un argument de camí «%s»"
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file és incompatible amb --detach"
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file és incompatible amb --patch"
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12751,73 +13052,74 @@
"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
"agafar de l'índex."
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "heu d'especificar el camí o camins a restaurar"
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1787
#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "segon conjectura «git checkout <no-such-branch>» (per defecte)"
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "utilitza el mode de superposició (per defecte)"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "crea i canvia a una branca nova"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "crea/restableix i canvia a una branca"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1837
#, fuzzy
msgid "second guess 'git switch <no-such-branch>'"
msgstr "segon conjectura «git switch <no-such-branch>»"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "descarta les modificacions locals"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1873
#, fuzzy
msgid "which tree-ish to checkout from"
msgstr "de quin arbre agafar"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "restaura l'índex"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "restaura l'arbre de treball (per defecte)"
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignora les entrades sense fusionar"
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "utilitza el mode de superposició"
@@ -12852,7 +13154,7 @@
msgid "could not lstat %s\n"
msgstr "no s'ha pogut fer lstat %s\n"
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12865,7 +13167,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12886,33 +13188,33 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:693
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:714
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:789
+#: builtin/clean.c:786
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12930,60 +13232,60 @@
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:825
+#: builtin/clean.c:822
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:841
+#: builtin/clean.c:838
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:903
+#: builtin/clean.c:900
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:905
+#: builtin/clean.c:902
msgid "force"
msgstr "força"
-#: builtin/clean.c:906
+#: builtin/clean.c:903
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:908
+#: builtin/clean.c:905
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:910
+#: builtin/clean.c:907
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:911
+#: builtin/clean.c:908
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:913
+#: builtin/clean.c:910
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:929
+#: builtin/clean.c:925
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
+" clean"
msgstr ""
"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:932
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12991,7 +13293,7 @@
"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:944
+#: builtin/clean.c:940
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
@@ -13008,7 +13310,7 @@
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "crea un repositori nu"
@@ -13040,27 +13342,28 @@
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repositori de referència"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nom"
@@ -13076,7 +13379,7 @@
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
#: builtin/pull.c:208
msgid "depth"
msgstr "profunditat"
@@ -13085,17 +13388,17 @@
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
#: builtin/pull.c:211
msgid "time"
-msgstr "hora"
+msgstr "data"
#: builtin/clone.c:133
msgid "create a shallow clone since a specific time"
-msgstr "crea un clon superficial des d'una hora específica"
+msgstr "crea un clon superficial des d'una data específica"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
msgid "revision"
msgstr "revisió"
@@ -13103,8 +13406,8 @@
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
@@ -13117,11 +13420,11 @@
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
@@ -13134,28 +13437,29 @@
msgstr "estableix la configuració dins del repositori nou"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "específic al servidor"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opció a transmetre"
#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
#: builtin/clone.c:154
msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
+msgstr ""
+"qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
@@ -13163,50 +13467,42 @@
"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
"l'arrel"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No s'ha pogut endevinar cap nom de directori.\n"
-"Especifiqueu un directori en la línia d'ordres"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, fuzzy, c-format
msgid "failed to start iterator over '%s'"
msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "no s'ha pogut iterar sobre «%s»"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
#, fuzzy
msgid ""
"Clone succeeded, but checkout failed.\n"
@@ -13214,153 +13510,157 @@
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"El clonatge ha tingut èxit però ha fallat. Podeu inspeccionar el que s'ha "
-"comprovat amb «git status» i tornar-ho a provar amb «git restore --"
-"source=HEAD /»"
+"comprovat amb «git status» i tornar-ho a provar amb «git restore "
+"--source=HEAD /»"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, 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:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Hi ha massa arguments."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un repositori per a clonar."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "el repositori «%s» no existeix"
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és un nombre positiu"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, 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:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository 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:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, 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:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al repositori nu «%s»...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
msgstr ""
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» no és un nom de remot vàlid"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
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:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "el repositori font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "el transport remot ha informat d'un error"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, 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:1348
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un repositori buit."
@@ -13377,141 +13677,138 @@
msgstr "disposició a usar"
#: builtin/column.c:30
-#, fuzzy
msgid "maximum width"
-msgstr "Amplada màxima"
+msgstr "amplada màxima"
#: builtin/column.c:31
-#, fuzzy
msgid "padding space on left border"
-msgstr "Espai d'encoixinada en el marge esquerre"
+msgstr "espai de farciment al marge esquerre"
#: builtin/column.c:32
-#, fuzzy
msgid "padding space on right border"
-msgstr "Espai d'encoixinada en el marge dret"
+msgstr "espai de farciment al marge dret"
#: builtin/column.c:33
-#, fuzzy
msgid "padding space between columns"
-msgstr "Espai d'encoixinada entre columnes"
+msgstr "espai de farciment entre columnes"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "directori"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
-#, fuzzy
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
-msgstr "El directori d'objectes per a emmagatzemar el gràfic"
+msgstr "el directori d'objectes a emmagatzemar al graf"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"si el graf de comissions està dividit només, verifica el fitxer de consell"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No s'ha pogut obrir el graf de comissions «%s»"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argument --split no reconegut, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, fuzzy, c-format
msgid "unexpected non-hex object ID: %s"
msgstr ""
"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
"percentatges d'escombraries"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "comença a caminar en totes les referències"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "explora els índexs del paquet llistats per a stdin per a comissions"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
#, fuzzy
msgid "start walk at commits listed by stdin"
msgstr "comença a caminar a les comissions llistades per a stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "inclou ja totes les comissions al fitxer del graf de comissions"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "habilita la computació per als camins canviats"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permet escriure un fitxer de graf de comissions incrementals"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
#, fuzzy
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "nombre màxim de comissions en un graf de comissions no basat"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "fes caducar els objectes més antics que l'hora i data donades"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
#, fuzzy
msgid "maximum number of changed-path Bloom filters to compute"
msgstr ""
"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
#, fuzzy
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "usa com a màxim un dels --reachable --stdin-commits o --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:283
msgid "Collecting commits from input"
msgstr "S'estan recollint les comissions de l'entrada"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, fuzzy, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomandes no reconeguts"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13525,70 +13822,65 @@
msgid "duplicate parent %s ignored"
msgstr "s'han ignorat el pare %s duplicat"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "no és un nom d'objecte vàlid %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: ha fallat en obrir «%s»"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: ha fallat en llegir «%s»"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: ha fallat en tancar «%s»"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "pare"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id d'un objecte de comissió pare"
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "missatge"
-#: builtin/commit-tree.c:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "llegeix el missatge de registre de comissió des d'un fitxer"
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "ha de donar exactament un arbre"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: ha fallat en llegir"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13598,7 +13890,7 @@
"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:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13606,23 +13898,21 @@
" git commit --allow-empty\n"
"\n"
msgstr ""
-"El «cherry pick» previ està ara buit, possiblement a causa de resolució de "
-"conflictes.\n"
+"El «cherry pick» previ està ara buit, possiblement a causa de resolució de conflictes.\n"
"Si el voleu cometre de totes maneres, useu:\n"
"\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Altrament si us plau useu «git rebase --skip»\n"
+msgstr "Altrament, si us plau useu «git rebase --skip»\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Altrament si us plau useu «git cherry-pick --skip»\n"
+msgstr "Altrament, si us plau useu «git cherry-pick --skip»\n"
-#: builtin/commit.c:69
-#, fuzzy
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13634,77 +13924,83 @@
" git cherry-pick --skip\n"
"\n"
msgstr ""
-"i després utilitzeu git cherry-pick --continue per tornar a seleccionar les "
-"comissions restants. Si voleu ometre aquesta publicació utilitzeu git cherry-"
-"pick --skip"
+"i després utilitzeu:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"per continuar seleccionant les comissions restants.\n"
+"Si voleu ometre aquesta comissió, useu:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file amb -a no té sentit"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "no es pot fer una comissió parcial durant un «rebase»."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13712,43 +14008,83 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut cercar la comissió %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
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:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:801
-#, fuzzy, c-format
+#: builtin/commit.c:802
+#, c-format
msgid "cannot combine -m with --fixup:%s"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
+msgstr "no es pot combinar -m amb --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
+#: builtin/commit.c:894
+#, fuzzy, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
+"comissió buit avorta la comissió.\n"
+
+#: builtin/commit.c:896
+#, 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 ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
+"comissió buit avorta la comissió.\n"
+
#: builtin/commit.c:900
+#, 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"
+msgstr ""
+"Introduïu el missatge de comissió pels vostres canvis. Es mantindran\n"
+"les línies que comencin amb «%c»; podeu eliminar-les si voleu.\n"
+
+#: builtin/commit.c:904
+#, 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 ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n"
+"mateixos si voleu. Un missatge buit avorta la comissió.\n"
+
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13762,7 +14098,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:905
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13776,200 +14112,181 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:915
-#, 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 ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
-"comissió buit avorta la comissió.\n"
-
-#: builtin/commit.c:923
-#, 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 ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
-"vosaltres\n"
-"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:948
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:955
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:973
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
#, fuzzy
msgid "unable to pass trailers to --trailers"
msgstr "no s'ha pogut analitzar la capçalera de %s"
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode d'ignorància no vàlid «%s»"
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1188
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
#, fuzzy
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
#, fuzzy
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
-#: builtin/commit.c:1224
+#: builtin/commit.c:1232
#, fuzzy, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1234
+#, fuzzy
msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+"reword option of --fixup is mutually exclusive with "
+"--patch/--interactive/--all/--include/--only"
msgstr ""
+"l'opció de reparaula de --fixup és mútuament excloent amb "
+"--patch/--interactive/--all/--include/--only"
-#: builtin/commit.c:1245
+#: builtin/commit.c:1253
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:1254
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1257
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1259
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
-#: builtin/commit.c:1261
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1274
+#: builtin/commit.c:1280
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:1276
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
-#: builtin/commit.c:1285
+#: builtin/commit.c:1291
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:1303
+#: builtin/commit.c:1309
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:1331
-#, fuzzy, c-format
+#: builtin/commit.c:1337
+#, c-format
msgid "unknown option: --fixup=%s:%s"
-msgstr "opció desconeguda: %s\n"
+msgstr "opció desconeguda: --fixup=%s:%s"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "els camins «%s ...» amb -a no tenen sentit"
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1491 builtin/commit.c:1658
#, fuzzy
msgid "compute full ahead/behind values"
msgstr "calcula els valors complets endavant/darrere"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1493
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
-msgstr "sortida llegible per màquina"
+msgstr "sortida llegible per una màquina"
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1493 builtin/commit.c:1656
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1497
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13977,11 +14294,11 @@
"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
"(Per defecte: traditional, matching, no.)"
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13989,77 +14306,77 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "no detectis canvis de noms"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
-msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
+msgstr ""
+"detecta canvis de noms, i opcionalment estableix un índex de semblança"
-#: builtin/commit.c:1525
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"No s'admet la combinació d'arguments d'ignorància i de fitxers no seguits"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "data"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
-#.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1633
#, fuzzy
msgid "[(amend|reword):]commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1633
#, fuzzy
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
@@ -14067,120 +14384,121 @@
"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
"especificada"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
"especificada"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "remolc"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1636
+#, fuzzy
msgid "add custom trailer(s)"
-msgstr ""
+msgstr "afegeix un(s) tràiler(s) personalitzat(s)"
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
#: builtin/pull.c:145 builtin/revert.c:110
#, fuzzy
msgid "add a Signed-off-by trailer"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els lligams de precomissió i missatge de comissió"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1654
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1655
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1765
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1772
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1777
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1803
#, fuzzy, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1824
+#: builtin/commit.c:1839
#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
@@ -14188,8 +14506,8 @@
"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"s'ha actualitzat el repositori però no s'ha pogut escriure el fitxer "
-"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i "
-"després «git restitueix --staged /» per recuperar-se."
+"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i"
+" després «git restitueix --staged /» per recuperar-se."
#: builtin/config.c:11
msgid "git config [<options>]"
@@ -14369,19 +14687,18 @@
msgstr "valor"
#: builtin/config.c:167
-#, fuzzy
msgid "with --get, use default value when missing entry"
-msgstr "amb --get utilitza el valor per defecte quan falta una entrada"
+msgstr "amb --get utilitza el valor per defecte quan falti una entrada"
#: builtin/config.c:181
-#, fuzzy, c-format
+#, c-format
msgid "wrong number of arguments, should be %d"
-msgstr "el nombre d'arguments és erroni"
+msgstr "nombre d'arguments erroni, ha de ser %d"
#: builtin/config.c:183
-#, fuzzy, c-format
+#, c-format
msgid "wrong number of arguments, should be from %d to %d"
-msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre."
+msgstr "nombre d'arguments erroni, ha de ser %d a %d"
#: builtin/config.c:339
#, c-format
@@ -14392,7 +14709,8 @@
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
+"s'ha produït un error en formatar el valor per defecte de la configuració: "
+"%s"
#: builtin/config.c:441
#, c-format
@@ -14444,9 +14762,8 @@
msgstr "--blob només es pot usar dins d'un repositori git"
#: builtin/config.c:662
-#, fuzzy
msgid "--worktree can only be used inside a git repository"
-msgstr "--blob només es pot usar dins d'un repositori git"
+msgstr "--worktree només es pot usar dins d'un repositori git"
#: builtin/config.c:684
msgid "$HOME not set"
@@ -14477,8 +14794,8 @@
#: builtin/config.c:767
msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
+"--list"
msgstr ""
"--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
@@ -14487,9 +14804,8 @@
msgstr "--default només és aplicable a --get"
#: builtin/config.c:806
-#, fuzzy
msgid "--fixed-value only applies with 'value-pattern'"
-msgstr "--fixed-value només s'aplica amb 'value-pattern'"
+msgstr "--fixed-value només s'aplica amb «value-pattern»"
#: builtin/config.c:822
#, c-format
@@ -14554,16 +14870,16 @@
msgstr "imprimeix els missatges de depuració a stderr"
#: builtin/credential-cache--daemon.c:316
-#, fuzzy
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-"credencial-cache-daemon no disponible; no hi ha compatibilitat amb sòcols "
-"unix"
+"credential-cache--daemon no disponible; no hi ha compatibilitat amb sòcols "
+"d'unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
-"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix"
+"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols "
+"d'unix"
#: builtin/credential-store.c:66
#, fuzzy, c-format
@@ -14737,12 +15053,10 @@
msgstr "--broken és incompatible amb les comissions"
#: builtin/diff-tree.c:155
-#, fuzzy
msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
+msgstr "--stdin i --merge-base són mútuament excloents"
#: builtin/diff-tree.c:157
-#, fuzzy
msgid "--merge-base only works with two commits"
msgstr "--merge-base només funciona amb dues comissions"
@@ -14765,7 +15079,7 @@
msgid "Not a git repository"
msgstr "No és un repositori de git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
@@ -14789,114 +15103,116 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "ha fallat: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no es pot llegir l'objecte %s per l'enllaç simbòlic %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
+#, fuzzy
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"els formats de diff combinats («-c» i «--cc») no s'admeten\n"
"en el mode diff per directoris («-d» i «--dir-diff»)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a «%s»."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:700
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "ha fallat: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "usa «diff.guitool» en lloc de «diff.tool»"
-#: builtin/difftool.c:702
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:704
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:706
msgid "tool"
msgstr "eina"
-#: builtin/difftool.c:711
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb «--tool»"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:712
+#, fuzzy
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
"sortida diferent de zero"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "especifiqueu una ordre personalitzada per veure diffs"
-#: builtin/difftool.c:720
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "passa-ho a «diff»"
-#: builtin/difftool.c:735
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool requereix worktree o --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff és incompatible amb --no-index"
-#: builtin/difftool.c:745
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool and --extcmd són mútuament excloents"
-#: builtin/difftool.c:753
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>"
-#: builtin/difftool.c:760
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
@@ -14904,7 +15220,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "tipus"
@@ -14920,14 +15236,15 @@
#: builtin/env--helper.c:67
#, fuzzy, c-format
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgid ""
+"option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
#: builtin/env--helper.c:82
#, fuzzy, c-format
msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
+"option `--default' expects an unsigned long value with `--type=ulong`, not "
+"`%s`"
msgstr ""
"`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`"
@@ -14935,130 +15252,120 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:868
-#, fuzzy
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-"Error no es poden exportar les etiquetes niades a menys que s'especifiqui --"
-"mark-tags."
+"Error: no es poden exportar les etiquetes imbricades a menys que "
+"s'especifiqui --mark-tags."
-#: builtin/fast-export.c:1177
-#, fuzzy
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
-msgstr "--anonymize-map token no pot estar buit"
+msgstr "el testimoni de --anonymize-map no pot estar buit"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:1205
-#, fuzzy
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"selecciona la gestió dels missatges de publicació en una codificació "
"alternativa"
-#: builtin/fast-export.c:1208
-#, fuzzy
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
-msgstr "Bolca les marques a aquest fitxer"
+msgstr "bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:1210
-#, fuzzy
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
-msgstr "Importa les marques d'aquest fitxer"
+msgstr "importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:1214
-#, fuzzy
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
-msgstr "Importa marques d'aquest fitxer si existeix"
+msgstr "importa marques d'aquest fitxer si existeix"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
#, fuzzy
msgid "fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
-#: builtin/fast-export.c:1218
-#, fuzzy
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
-msgstr "Imprimeix l'arbre complet de cada comissió"
+msgstr "imprimeix l'arbre complet de per a cada comissió"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
#, fuzzy
msgid "use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
#, fuzzy
msgid "skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1223
-#, fuzzy
-msgid "apply refspec to exported refs"
-msgstr "Aplica l'especificació de referència a les referències exportades"
-
#: builtin/fast-export.c:1224
+msgid "apply refspec to exported refs"
+msgstr "aplica l'especificació de referència a les referències exportades"
+
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
#, fuzzy
msgid "from:to"
msgstr "des de"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "converteix <from> a <to> en una sortida anònima"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
#, fuzzy
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"Referència pares que no estan en flux d'exportació ràpida per identificador "
"d'objecte"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
#, fuzzy
msgid "show original object ids of blobs/commits"
msgstr "Mostra els ID dels objectes originals dels blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
#, fuzzy
msgid "label tags with mark ids"
-msgstr "Etiquetes amb els identificadors de marca"
+msgstr "etiquetes amb els identificadors de marca"
-#: builtin/fast-export.c:1256
-#, fuzzy
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--trailer amb --only-input no té sentit"
+msgstr "--anonymize-map sense --anonymize no té sentit"
-#: builtin/fast-export.c:1271
-#, fuzzy
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "No es poden passar tant --import-marks com --import-marks-if-exists"
+msgstr "No es poden passar alhora --import-marks i --import-marks-if-exists"
#: builtin/fast-import.c:3088
-#, fuzzy, c-format
+#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr "Subjecting submodule '%s'"
+msgstr "Falten les marques «from» per al submòdul «%s»"
#: builtin/fast-import.c:3090
-#, fuzzy, c-format
+#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
+msgstr "Falten les marques per al submòdul «%s»"
#: builtin/fast-import.c:3225
#, c-format
@@ -15090,7 +15397,8 @@
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr ""
+"git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
@@ -15113,7 +15421,6 @@
msgstr "obtén de tots els remots"
#: builtin/fetch.c:147 builtin/pull.c:245
-#, fuzzy
msgid "set upstream for git pull/fetch"
msgstr "estableix la font per a git pull/fetch"
@@ -15151,8 +15458,11 @@
msgstr "nombre de submòduls obtinguts en paral·lel"
#: builtin/fetch.c:164
+#, fuzzy
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
+"modifica l'especificació de referència per col·locar totes les referències "
+"dins de refs/prefetch/"
#: builtin/fetch.c:166 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
@@ -15193,7 +15503,7 @@
#: builtin/fetch.c:183 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
-msgstr "aprofundeix la història d'un clon superficial basat en temps"
+msgstr "aprofundeix la història d'un clon superficial basat en una data"
#: builtin/fetch.c:189 builtin/pull.c:221
msgid "convert to a complete repository"
@@ -15208,8 +15518,8 @@
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
-"els fitxers de configuració)"
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que"
+" els fitxers de configuració)"
#: builtin/fetch.c:199 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
@@ -15224,23 +15534,25 @@
msgstr "específica l'obtenció del mapa de referències"
#: builtin/fetch.c:208 builtin/pull.c:240
-#, fuzzy
msgid "report that we have only objects reachable from this object"
msgstr "informa que només hi ha objectes abastables des d'aquest objecte"
#: builtin/fetch.c:210
+#, fuzzy
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
+"no obtinguis un fitxer de paquet; en canvi, imprimeix els avantpassats dels "
+"consells de negociació"
#: builtin/fetch.c:213 builtin/fetch.c:215
-#, fuzzy
msgid "run 'maintenance --auto' after fetching"
-msgstr "executa «gc --auto» després d'obtenir"
+msgstr "executa «maintenance --auto» després d'obtenir"
#: builtin/fetch.c:217 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr ""
-"comprova si hi ha actualitzacions forçades a totes les branques actualitzades"
+"comprova si hi ha actualitzacions forçades a totes les branques "
+"actualitzades"
#: builtin/fetch.c:219
msgid "write the commit-graph after fetching"
@@ -15255,103 +15567,100 @@
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuració fetch.output conté un valor no vàlid %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
#, fuzzy
msgid "would clobber existing tag"
msgstr "es tancaria l'etiqueta existent"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:1065
-#, fuzzy
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-"L'obtenció normalment indica quines branques tenien una actualització "
-"forçada però aquesta comprovació s'ha desactivat. Per tornar a habilitar "
-"utilitzeu l'indicador «--show-forced-updates» o executeu «git config fetch."
-"showForcedUpdates true»."
+"L'obtenció normalment indica quines branques tenien una actualització forçada,\n"
+"però aquesta comprovació s'ha desactivat. Per tornar a habilitar-la, utilitzeu\n"
+"«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»."
-#: builtin/fetch.c:1069
-#, fuzzy, c-format
+#: builtin/fetch.c:1074
+#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
-"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
-"false'\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
" to avoid this check.\n"
msgstr ""
-"S'ha trigat segons de 9% a comprovar les actualitzacions forçoses. Podeu "
-"utilitzar «--no-show-forced-updates» o executar «git config fetch."
-"showForcedUpdates false» per evitar aquesta comprovació."
+"S'ha trigat %.2f segons a comprovar les actualitzacions forçades. Podeu\n"
+"utilitzar «--no-show-forced-updates» o executar «git config \n"
+"fetch.showForcedUpdates false» per evitar aquesta comprovació.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:1129
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/fetch.c:1134
+#, fuzzy, c-format
+msgid "rejected %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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15361,57 +15670,62 @@
" intenteu executar «git remote prune %s» per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un repositori no nu"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, 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:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció «%s» per a %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, fuzzy, c-format
+msgid "the object %s does not exist"
+msgstr "el camí «%s» no existeix"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
"no s'està configurant la font per a una branca remota amb seguiment remot"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "no s'està configurant la font d'una etiqueta remota"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "tipus de branca desconegut"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15419,22 +15733,22 @@
"no s'ha trobat cap branca d'origen.\n"
"Heu d'especificar exactament una branca amb l'opció --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "no s'ha pogut obtenir «%s» (codi de sortida: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15442,65 +15756,69 @@
"Cap repositori remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1995
+#: builtin/fetch.c:2009
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only necessita un o més --negotiate-tip=*"
+
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
-#: builtin/fetch.c:2002
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un repositori complet no té sentit"
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un argument de repositori"
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:2032
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existeix un remot ni un grup remot: %s"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
-#: builtin/fetch.c:2055
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "s'ha de subministrar el remot en usar --negotiate-only"
-#: builtin/fetch.c:2060
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+msgstr "El protocol no admet --negotiate-only, se surt."
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2097
msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
msgstr ""
-"--filter només es pot utilitzar amb el remot configurat en extensions."
-"partialclone"
+"--filter només es pot utilitzar amb el remot configurat en "
+"extensions.partialclone"
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2101
#, fuzzy
msgid "--atomic can only be used when fetching from one remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2105
#, fuzzy
msgid "--stdin can only be used when fetching from one remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
@@ -15570,7 +15888,7 @@
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "respecta els colors del format"
@@ -15598,20 +15916,20 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=<config> <command-args>"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "config"
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
#, fuzzy
msgid "config key storing a list of repository paths"
msgstr "clau de configuració emmagatzemant una llista de camins de repositori"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "falta --config=<config>"
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
msgstr "desconegut"
@@ -15627,229 +15945,240 @@
msgid "warning in %s %s: %s"
msgstr "avís en %s %s: %s"
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
msgstr "enllaç trencat de %7s %s"
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
msgid "wrong object type in link"
msgstr "tipus d'objecte incorrecte en l'enllaç"
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
#, fuzzy, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr "enllaç trencat del 7% al 7%"
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
msgstr "manca %s %s"
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
msgstr "inabastable %s %s"
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
#, fuzzy, c-format
msgid "dangling %s %s"
msgstr "per cent"
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
#, fuzzy
msgid "could not create lost-found"
msgstr "no s'ha pogut crear el trobat perdut"
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
msgstr "S'està comprovant %s"
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "S'està comprovant la connectivitat (%d objectes)"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
msgstr "S'està comprovant %s %s"
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
msgid "broken links"
msgstr "enllaços trencats"
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
#, c-format
msgid "root %s"
msgstr "arrel %s"
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
#, fuzzy, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "percentatges marcats"
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecte corrupte o no trobat"
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: entrada de referència no vàlida %s"
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
msgstr "S'està comprovant reflog %s->%s"
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: punter %s sha1 no vàlid"
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
msgstr "%s: no és una comissió"
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
msgid "notice: No default references"
msgstr "avís: no hi ha referències per defecte"
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, fuzzy, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "el resum no coincideix %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objecte corrupte o no trobat: %s"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, fuzzy, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "l'objecte %s té un identificador de tipus %d desconegut"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "fitxer sha1 malmès: %s"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "S'està comprovant el directori d'objecte"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "S'està comprovant l'enllaç %s"
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/fsck.c:683
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a una cosa estranya (%s)"
-#: builtin/fsck.c:689
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: el HEAD separat no apunta a res"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "avís: %s apunta a una branca no nascuda (%s)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "S'està comprovant l'arbre de la memòria cau"
-#: builtin/fsck.c:710
+#: builtin/fsck.c:743
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "percentatges d'apuntador sha1 no vàlid a l'arbre de la memòria cau"
-#: builtin/fsck.c:719
+#: builtin/fsck.c:752
#, fuzzy
msgid "non-tree in cache-tree"
msgstr "no arbre en l'arbre de la memòria cau"
-#: builtin/fsck.c:750
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:756
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
-msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
+msgstr ""
+"fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:766
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:768
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:860 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/fsck.c:855
+#: builtin/fsck.c:888
#, c-format
msgid "%s: object missing"
msgstr "%s: falta l'objecte"
-#: builtin/fsck.c:866
+#: builtin/fsck.c:899
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»"
@@ -15873,16 +16202,16 @@
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
#: builtin/gc.c:503
-#, c-format
+#, fuzzy, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -15907,17 +16236,17 @@
#: builtin/gc.c:557
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"
+msgstr ""
+"força l'execució de gc encara que hi pugui haver un altre gc executant"
#: builtin/gc.c:560
-#, fuzzy
msgid "repack all other packs except the largest pack"
msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
#: builtin/gc.c:576
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges"
+msgstr "no s'ha pogut analitzar el valor %s de gc.logexpiry"
#: builtin/gc.c:587
#, fuzzy, c-format
@@ -15947,14 +16276,16 @@
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si "
+"no)"
#: builtin/gc.c:705
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"There are too many unreachable loose objects; run 'git prune' to remove "
+"them."
msgstr ""
-"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
-"los."
+"Hi ha massa objectes solts inabastables; executeu «git prune» per a "
+"eliminar-los."
#: builtin/gc.c:715
msgid ""
@@ -15971,172 +16302,217 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "argument --schedule no reconegut, «%s»"
-#: builtin/gc.c:869
-#, fuzzy
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "s'ha produït un error en escriure el graf de comissions"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
#, fuzzy
msgid "failed to prefetch remotes"
msgstr "s'ha produït un error en omplir els remots"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
#, fuzzy
msgid "failed to start 'git pack-objects' process"
msgstr "no s'ha pogut iniciar el pack-objects"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
#, fuzzy
msgid "failed to finish 'git pack-objects' process"
msgstr "no s'ha pogut finalitzar el pack-objects"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1089
#, fuzzy
msgid "failed to write multi-pack-index"
msgstr "no s'han pogut netejar els percentatges multi-paquet"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1105
#, fuzzy
msgid "'git multi-pack-index expire' failed"
msgstr "l'índex múltiple és massa petit"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1164
#, fuzzy
msgid "'git multi-pack-index repack' failed"
msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1173
#, fuzzy
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-"s'està ometent la tasca de reempaquetar incremental perquè core."
-"multiPackIndex està desactivat"
+"s'està ometent la tasca de reempaquetar incremental perquè "
+"core.multiPackIndex està desactivat"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1277
#, fuzzy, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1307
#, c-format
msgid "task '%s' failed"
msgstr "la tasca «%s» ha fallat"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1389
#, fuzzy, c-format
msgid "'%s' is not a valid task"
msgstr "«%s» no és un terme vàlid"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1394
#, fuzzy, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "«%s» no es pot usar amb %s"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1409
#, fuzzy
msgid "run tasks based on the state of the repository"
msgstr "executa les tasques basades en l'estat del repositori"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1410
msgid "frequency"
msgstr "freqüència"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1411
msgid "run tasks based on frequency"
msgstr "executa les tasques basant-se en freqüència"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1414
#, fuzzy
msgid "do not report progress or other information over stderr"
msgstr "no informeu sobre el progrés o altra informació sobre stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1415
msgid "task"
msgstr "tasca"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1416
msgid "run a specific task"
msgstr "executa una tasca específica"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1433
#, fuzzy
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "usa com a màxim un de --auto i --schedule=<frequency>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1476
#, fuzzy
msgid "failed to run 'git config'"
msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1628
#, fuzzy, c-format
msgid "failed to expand path '%s'"
msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1655 builtin/gc.c:1693
#, fuzzy
msgid "failed to start launchctl"
msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
-#: builtin/gc.c:1613
+#: builtin/gc.c:1768 builtin/gc.c:2221
#, fuzzy, c-format
msgid "failed to create directories for '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1795
#, fuzzy, c-format
msgid "failed to bootstrap service %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1888
#, fuzzy
msgid "failed to create temp xml file"
msgstr "no s'han pogut crear els fitxers de sortida"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1978
#, fuzzy
msgid "failed to start schtasks"
msgstr "s'ha produït un error en fer stat a %s"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2047
#, fuzzy
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre "
"«cron»"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2064
#, fuzzy
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2068
#, fuzzy
msgid "failed to open stdin of 'crontab'"
msgstr "s'ha produït un error en obrir «%s»"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2110
msgid "'crontab' died"
msgstr "«crontab» ha mort"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2175
+#, fuzzy
+msgid "failed to start systemctl"
+msgstr "s'ha produït un error en fer stat a %s"
+
+#: builtin/gc.c:2185
+#, fuzzy
+msgid "failed to run systemctl"
+msgstr "no s'ha pogut executar «%s»"
+
+#: builtin/gc.c:2194 builtin/gc.c:2199 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "s'ha produït un error en suprimir «%s»"
+
+#: builtin/gc.c:2379
+#, fuzzy, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argument --schedule no reconegut, «%s»"
+
+#: builtin/gc.c:2404
+#, fuzzy
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni els temporitzadors de systemd ni el crontab estan disponibles"
+
+#: builtin/gc.c:2419
+#, fuzzy, c-format
+msgid "%s scheduler is not available"
+msgstr "%s no és disponible"
+
+#: builtin/gc.c:2433
#, fuzzy
msgid "another process is scheduling background maintenance"
msgstr "un altre procés és planificar el manteniment en segon pla"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2455
+#, fuzzy
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git manteniment start ---scheduler=<scheduler>]"
+
+#: builtin/gc.c:2464
+#, fuzzy
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2465
+#, fuzzy
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador per activar l'execució de manteniment del git"
+
+#: builtin/gc.c:2479
#, fuzzy
msgid "failed to add repo to global config"
msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2488
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcommand> [<options>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2507
#, fuzzy, c-format
msgid "invalid subcommand: %s"
msgstr "comissió no vàlida %s"
@@ -16145,12 +16521,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
@@ -16158,368 +16534,379 @@
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no s'admeten fils, s'ignorarà %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/grep.c:739
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:838
+#: builtin/grep.c:851
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:840
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant «.gitignore»"
-#: builtin/grep.c:846
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "case insensitive matching"
-msgstr "coincidència insensible a majúscula i minúscula"
+msgstr "coincidència no distingeix entre majúscules i minúscules"
-#: builtin/grep.c:853
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:855
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:857
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:860
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "cerca als subdirectoris (per defecte)"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:868
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:871
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:881
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "mostra el nombre de columna de la primera coincidència"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:883
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
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:889
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:892
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:894
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:897
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "mostra només les parts de coincidents de la línia"
-#: builtin/grep.c:899
+#: builtin/grep.c:912
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:900
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:902
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:904
+#: builtin/grep.c:917
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:907
+#: builtin/grep.c:920
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:910
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:912
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:914
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:915
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:918
+#: builtin/grep.c:931
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:920
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:923
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:925
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:927
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:939
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:941
+#: builtin/grep.c:954
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:944
+#: builtin/grep.c:957
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:944
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:948
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "no s'ha donat cap patró"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no s'admet amb --recurse-submodules"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "no s'admeten fils, s'ignorarà --threads"
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
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:1158
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no es pot usar amb --no-index"
-#: builtin/grep.c:1161
-#, fuzzy
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
-msgstr "--cached o --untracked no es pot usar amb --no-index"
+msgstr "--untracked no es pot usar amb --cached"
-#: builtin/grep.c:1167
-#, fuzzy
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
+msgstr ""
+"--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
#, fuzzy
msgid "both --cached and trees are given"
msgstr "es donen ambdós --cached i arbres"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
-"[--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin]"
+" [--] <fitxer>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "tipus d'objecte"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "llegeix l'objecte des de stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "imprimeix totes les ordres disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "exclou guies"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "imprimeix la llista de guies útils"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimeix tots els noms de les variables de configuració"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "mostra la pàgina de manual"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "mostra la pàgina de manual en el navegador web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "mostra la pàgina d'informació"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "imprimeix la descripció de l'ordre"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "imprimeix la llista de guies útils"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "imprimeix tots els noms de les variables de configuració"
+
+#: builtin/help.c:78
+#, fuzzy
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
-#: builtin/help.c:163
+#: builtin/help.c:80
+#, fuzzy
+msgid "git help [-g|--guides]"
+msgstr "git help --g|--guides]"
+
+#: builtin/help.c:81
+#, fuzzy
+msgid "git help [-c|--config]"
+msgstr "git help --c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut «%s»"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
-msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+msgstr "S'ha produït un error en iniciar emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16528,7 +16915,7 @@
"«%s»: camí a un visualitzador de manuals no compatible.\n"
"Considereu usar «man.<eina>.cmd» en lloc d'això."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16537,129 +16924,124 @@
"«%s»: ordre per a un visualitzador de manuals compatible.\n"
"Considereu usar «man.<eina>.path» en lloc d'això."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:453
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:461
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:520 builtin/help.c:531 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:534 git.c:380
+#: builtin/help.c:565 git.c:380
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "àlies incorrecte.%s string%s"
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:581
+#, fuzzy
+msgid "this option doesn't take any other arguments"
+msgstr "fetch --all no accepta un argument de repositori"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:577
+#: builtin/help.c:624
#, fuzzy
msgid "'git help config' for more information"
msgstr "'git help config' per a més informació"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
-msgstr[1] "no es pot omplir %d octets"
+msgstr[1] "no es poden omplir %d octets"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet «%s»"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr ""
"desbordament de valor de desplaçament per a l'objecte base de diferències"
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer empaquetat"
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16667,204 +17049,201 @@
msgstr[1] ""
"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "fsck error en un objecte empaquetat"
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No tots els objectes fills de %s són abastables"
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "s'ha completat amb %d objecte local"
msgstr[1] "s'ha completat amb %d objectes locals"
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d diferència no resolta"
msgstr[1] "El paquet té %d diferències no resoltes"
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
#, fuzzy, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "el nom del fitxer de paquet «%s» no acaba amb «.pack»"
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no es pot escriure «%s» al fitxer «%s»"
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "no s'ha pogut tancar l'arxiu «%s» per escrit"
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, fuzzy, c-format
+msgid "unable to rename temporary '*.%s' file to '%s"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "error en tancar el fitxer empaquetat"
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "no es pot emmagatzemar el fitxer empaquetat"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "no es pot emmagatzemar el fitxer d'índex"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorrecte"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense diferències: %d objecte"
msgstr[1] "sense diferències: %d objectes"
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algorisme hash desconegut «%s»"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un repositori git"
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format no es pot usar sense --stdin"
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "error fsck als objectes del paquet"
@@ -16908,100 +17287,99 @@
msgid "not copying templates from '%s': %s"
msgstr "no s'estan copiant plantilles de «%s»: %s"
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "nom de branca inicial no vàlid: «%s»"
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:372
-#, fuzzy
+#: builtin/init-db.c:373
msgid "attempt to reinitialize repository with different hash"
msgstr "s'ha intentat reinicialitzar el repositori amb un hash diferent"
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:431
-#, fuzzy, c-format
+#: builtin/init-db.c:432
+#, c-format
msgid "re-init: ignored --initial-branch=%s"
-msgstr "reinicialització ignorada --initial-branch=%"
+msgstr "reinicialització: s'ha ignorat --initial-branch=%s"
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el repositori existent del Git en %s%s\n"
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n"
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
+"[--shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
-"shared[=<permisos>]] [<directori>]"
+"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] "
+"[--shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
-msgstr "especifica que el repositori de git es compartirà entre diversos usuaris"
+msgstr ""
+"especifica que el repositori de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:550
-#, fuzzy
+#: builtin/init-db.c:551
msgid "override the name of the initial branch"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+msgstr "sobreescriu el nom de la branca inicial"
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
msgstr "hash"
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "especifiqueu l'algorisme de resum a usar"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:560
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--separate-git-dir i --bare són mútuament excloents"
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17010,15 +17388,14 @@
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball «%s»"
-#: builtin/init-db.c:683
-#, fuzzy
+#: builtin/init-db.c:684
msgid "--separate-git-dir incompatible with bare repository"
-msgstr "--separate-git-dir és incompatible amb --bisect"
+msgstr "--separate-git-dir és incompatible amb un repositori nu"
#: builtin/interpret-trailers.c:16
msgid ""
@@ -17098,9 +17475,8 @@
msgstr "mostra la font"
#: builtin/log.c:181
-#, fuzzy
msgid "use mail map file"
-msgstr "Usa el fitxer de mapa de correu"
+msgstr "usa el fitxer de mapa de correu"
#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
@@ -17128,87 +17504,87 @@
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "%s: %s no es pot usar amb %s"
-#: builtin/log.c:303
+#: builtin/log.c:306
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:568
+#: builtin/log.c:571
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:586 builtin/log.c:676
#, c-format
msgid "could not read object %s"
msgstr "no s'ha pogut llegir l'objecte %s"
-#: builtin/log.c:698
+#: builtin/log.c:701
#, c-format
msgid "unknown type: %d"
msgstr "tipus desconegut: %d"
-#: builtin/log.c:843
+#: builtin/log.c:846
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: cobertura no vàlida des del mode descripció"
-#: builtin/log.c:850
+#: builtin/log.c:853
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:979
+#: builtin/log.c:982
#, c-format
msgid "cannot open patch file %s"
msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
-#: builtin/log.c:996
+#: builtin/log.c:999
msgid "need exactly one range"
msgstr "necessita exactament un interval"
-#: builtin/log.c:1006
+#: builtin/log.c:1009
msgid "not a range"
msgstr "no és un interval"
-#: builtin/log.c:1170
+#: builtin/log.c:1173
#, fuzzy
msgid "cover letter needs email format"
msgstr "la lletra de la portada necessita un format de correu electrònic"
-#: builtin/log.c:1176
+#: builtin/log.c:1179
#, fuzzy
msgid "failed to create cover-letter file"
msgstr "no s'ha pogut crear el fitxer de portada"
-#: builtin/log.c:1263
+#: builtin/log.c:1266
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1290
+#: builtin/log.c:1293
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1348
+#: builtin/log.c:1351
msgid "two output directories?"
msgstr "dos directoris de sortida?"
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
#, c-format
msgid "unknown commit %s"
msgstr "comissió desconeguda %s"
-#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
-#: builtin/log.c:1519
+#: builtin/log.c:1522
msgid "could not find exact merge base"
msgstr "no s'ha pogut trobar la base exacta de la fusió"
-#: builtin/log.c:1529
+#: builtin/log.c:1532
#, fuzzy
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
@@ -17217,423 +17593,431 @@
msgstr ""
"no s'ha pogut obtenir la font si voleu registrar la comissió base "
"automàticament si us plau useu la branca git --set-upstream-to per al "
-"seguiment d'una branca remota. O podeu especificar la comissió base per --"
-"base=<base-commit-id> manualment"
+"seguiment d'una branca remota. O podeu especificar la comissió base per "
+"--base=<base-commit-id> manualment"
-#: builtin/log.c:1552
+#: builtin/log.c:1555
msgid "failed to find exact merge base"
msgstr "no s'ha pogut trobar la base exacta de la fusió"
-#: builtin/log.c:1569
+#: builtin/log.c:1572
msgid "base commit should be the ancestor of revision list"
msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
-#: builtin/log.c:1579
+#: builtin/log.c:1582
msgid "base commit shouldn't be in revision list"
msgstr "la comissió base no ha de ser en la llista de revisions"
-#: builtin/log.c:1637
+#: builtin/log.c:1640
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1700
+#: builtin/log.c:1703
#, fuzzy
msgid "failed to infer range-diff origin of current series"
msgstr "no s'ha pogut inferir l'interval-diferències"
-#: builtin/log.c:1702
+#: builtin/log.c:1705
#, fuzzy, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "utilitzant «%s» com a origen de rang-diferencia de la sèrie actual"
-#: builtin/log.c:1746
+#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1749
+#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1753
+#: builtin/log.c:1756
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1755
+#: builtin/log.c:1758
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1757
+#: builtin/log.c:1760
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1758
+#: builtin/log.c:1761
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1759
+#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de «.patch»"
-#: builtin/log.c:1761
+#: builtin/log.c:1764
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1762
+#: builtin/log.c:1765
+#, fuzzy
msgid "reroll-count"
-msgstr ""
+msgstr "reroll-count"
-#: builtin/log.c:1763
+#: builtin/log.c:1766
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1765
+#: builtin/log.c:1768
msgid "max length of output filename"
msgstr "mida màxima del nom del fitxer de sortida"
-#: builtin/log.c:1767
+#: builtin/log.c:1770
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "useu [RFC PATCH] en comptes de [PATCH]"
-#: builtin/log.c:1770
+#: builtin/log.c:1773
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1771
+#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-"genera parts d'una carta de presentació basant-se en la descripció d'una branca"
+"genera parts d'una carta de presentació basant-se en la descripció d'una "
+"branca"
-#: builtin/log.c:1773
+#: builtin/log.c:1776
msgid "use [<prefix>] instead of [PATCH]"
msgstr "useu [<prefix>] en comptes de [PATCH]"
-#: builtin/log.c:1776
+#: builtin/log.c:1779
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1779
+#: builtin/log.c:1782
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1782
+#: builtin/log.c:1785
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1784
+#: builtin/log.c:1787
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1786
+#: builtin/log.c:1789
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:1788
+#: builtin/log.c:1791
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:1790
+#: builtin/log.c:1793
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1791
+#: builtin/log.c:1794
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1792
+#: builtin/log.c:1795
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1796 builtin/log.c:1797
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1793
+#: builtin/log.c:1796
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1794
+#: builtin/log.c:1797
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1795
+#: builtin/log.c:1798
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1796
+#: builtin/log.c:1799
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:1798
+#: builtin/log.c:1801
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1799
+#: builtin/log.c:1802
msgid "make first mail a reply to <message-id>"
msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1803 builtin/log.c:1806
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1801
+#: builtin/log.c:1804
msgid "attach the patch"
msgstr "adjunta el pedaç"
-#: builtin/log.c:1804
+#: builtin/log.c:1807
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1808
+#: builtin/log.c:1811
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1810
+#: builtin/log.c:1813
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1811
+#: builtin/log.c:1814
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1812
+#: builtin/log.c:1815
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1813
+#: builtin/log.c:1816
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
-#: builtin/log.c:1816
+#: builtin/log.c:1819
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1817
+#: builtin/log.c:1820
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1819
+#: builtin/log.c:1822
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
-#: builtin/log.c:1821
+#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç"
-#: builtin/log.c:1824
+#: builtin/log.c:1827
#, fuzzy
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-"mostra els canvis contra <refspec> a la lletra de la portada o a un sol pedaç"
+"mostra els canvis contra <refspec> a la lletra de la portada o a un sol "
+"pedaç"
-#: builtin/log.c:1826 builtin/range-diff.c:28
+#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "percentatge pel qual la creació és ponderada"
-#: builtin/log.c:1913
+#: builtin/log.c:1916
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1928
+#: builtin/log.c:1931
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k són mútuament excloents"
-#: builtin/log.c:1930
+#: builtin/log.c:1933
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k són mútuament excloents"
-#: builtin/log.c:1938
+#: builtin/log.c:1941
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1940
+#: builtin/log.c:1943
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1942
+#: builtin/log.c:1945
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1964
-#, fuzzy
+#: builtin/log.c:1967
msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
+msgstr "--stdout, --output, i --output-directory són mútuament excloents"
-#: builtin/log.c:2087
+#: builtin/log.c:2089
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:2091
+#: builtin/log.c:2093
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:2092
+#: builtin/log.c:2094
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:2098
+#: builtin/log.c:2100
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requereix --range-diff"
-#: builtin/log.c:2102
+#: builtin/log.c:2104
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:2110
+#: builtin/log.c:2112
#, fuzzy
msgid "Range-diff:"
msgstr "Diferència-interval"
-#: builtin/log.c:2111
+#: builtin/log.c:2113
#, fuzzy, c-format
msgid "Range-diff against v%d:"
msgstr "Diferència de l'interval contra el v%d"
-#: builtin/log.c:2122
+#: builtin/log.c:2124
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:2158
+#: builtin/log.c:2160
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
-#: builtin/log.c:2202
-#, fuzzy
+#: builtin/log.c:2204
msgid "failed to create output files"
msgstr "no s'han pogut crear els fitxers de sortida"
-#: builtin/log.c:2261
+#: builtin/log.c:2263
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:2315
+#: builtin/log.c:2317
#, c-format
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"Could not find a tracked remote branch, please specify <upstream> "
+"manually.\n"
msgstr ""
"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
"manualment.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "separa els camins amb el caràcter NUL"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers «assume unchanged»"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr ""
"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris «other»"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
+#: builtin/ls-files.c:652
-#: builtin/ls-files.c:657
+msgid "read exclude patterns from <file>"
+msgstr "llegeix els patrons des de <file>"
+
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"pretén que els camins eliminats després de <arbre> encara siguin presents"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "mostra les dades de depuració"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "suprimeix les entrades duplicades"
#: builtin/ls-remote.c:9
+#, fuzzy
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs]\n"
" [--upload-pack=<executable>] [-q | --quiet]\n"
@@ -17644,7 +18028,7 @@
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "executable"
@@ -17725,8 +18109,9 @@
msgstr "retén els objectes inabastables"
#: builtin/mailinfo.c:60
+#, fuzzy
msgid "keep non patch brackets in subject"
-msgstr ""
+msgstr "mantén els parèntesis sense pedaços en el tema"
#: builtin/mailinfo.c:62
#, fuzzy
@@ -17734,39 +18119,44 @@
msgstr "edita el missatge de comissió"
#: builtin/mailinfo.c:64
+#, fuzzy
msgid "re-code metadata to i18n.commitEncoding"
-msgstr ""
+msgstr "torna a codificar les metadades a i18n.commitEncoding"
#: builtin/mailinfo.c:67
+#, fuzzy
msgid "disable charset re-coding of metadata"
-msgstr ""
+msgstr "inhabilita la codificació del joc de caràcters de les metadades"
#: builtin/mailinfo.c:69
+#, fuzzy
msgid "encoding"
-msgstr ""
+msgstr "codificació"
#: builtin/mailinfo.c:70
+#, fuzzy
msgid "re-code metadata to this encoding"
-msgstr ""
+msgstr "torna a codificar les metadades a aquesta codificació"
#: builtin/mailinfo.c:72
msgid "use scissors"
-msgstr ""
+msgstr "usa les tisores"
#: builtin/mailinfo.c:73
-#, fuzzy
msgid "<action>"
-msgstr "acció"
+msgstr "<acció>"
#: builtin/mailinfo.c:74
+#, fuzzy
msgid "action when quoted CR is found"
-msgstr ""
+msgstr "acció quan es troba la CR citada"
#: builtin/mailinfo.c:77
+#, fuzzy
msgid "use headers in message's body"
-msgstr ""
+msgstr "utilitza les capçaleres en el cos del missatge"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
@@ -17810,15 +18200,16 @@
#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
+"troba on <comissió> s'ha bifurcat del registre de referències de "
+"<referència>"
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
-"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
-"<fitxer-original> <fitxer2>"
+"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1>"
+" <fitxer-original> <fitxer2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
@@ -17883,154 +18274,145 @@
msgid "Merging %s with %s\n"
msgstr "S'està fusionant %s amb %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "l'opció «m» requereix un valor"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "l'opció «%s» requereix un valor"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
-"de fusió"
+"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió"
+" de fusió"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:154
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:172
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
#, fuzzy
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "evita els ganxos pre-combinació i missatge de comissió"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:400
-#, fuzzy
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
-msgstr " (res a fer «squash»)"
+msgstr "Ja està actualitzat. (res a fer «squash»)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
@@ -18040,52 +18422,51 @@
msgid "'%s' does not point to a commit"
msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:602
+#: builtin/merge.c:603
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c:728
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "No s'està gestionant res a part de la fusió de dos caps."
-#: builtin/merge.c:741
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opció desconeguda de merge-recursive: -X%s"
+#: builtin/merge.c:743
+#, fuzzy, c-format
+msgid "unknown strategy option: -X%s"
+msgstr "opció desconeguda: %s\n"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:812
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:821
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No s'està cometent la fusió; useu «git commit» per a completar la fusió.\n"
-#: builtin/merge.c:827
-#, fuzzy
+#: builtin/merge.c:829
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"
msgstr ""
-"Introduïu un missatge de comissió per explicar per què aquesta fusió és "
-"necessària especialment si fusiona una font actualitzada en una branca de "
-"tema."
+"Introduïu un missatge de comissió per explicar per què aquesta fusió és\n"
+"necessària, especialment si es fusiona una branca amb funcionalitat\n"
+"nova.\n"
-#: builtin/merge.c:832
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Un missatge buit interromp la comissió.\n"
-#: builtin/merge.c:835
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18094,74 +18475,74 @@
"Les línies que comencen amb «%c» seran ignorades i un missatge buit "
"interromp la comissió.\n"
-#: builtin/merge.c:888
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:903
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:964
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:1003
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:1005
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
-#: builtin/merge.c:1012
+#: builtin/merge.c:1016
#, c-format
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:1069
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-#: builtin/merge.c:1172
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort no espera cap argument"
-#: builtin/merge.c:1320
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit no espera cap argument"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue no espera cap argument"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-#: builtin/merge.c:1371
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18169,7 +18550,7 @@
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1378
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18177,99 +18558,96 @@
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1381
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1395
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1397
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "No podeu combinar --squash amb --commit."
-#: builtin/merge.c:1413
+#: builtin/merge.c:1418
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:1430
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1437
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 HEAD buit"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar només una comissió a un HEAD buit"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "No és possible avançar ràpidament, s'està avortant."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1655
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1718
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-
#: builtin/merge.c:1732
#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "S'està usant l'estratègia %s per a preparar la resolució a mà.\n"
+
+#: builtin/merge.c:1746
+#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
"demanat\n"
#: builtin/mktag.c:10
+#, fuzzy
msgid "git mktag"
-msgstr ""
+msgstr "tag mktag"
#: builtin/mktag.c:27
#, fuzzy, c-format
@@ -18277,14 +18655,14 @@
msgstr "avís: «:include:» no s'admet: %s\n"
#: builtin/mktag.c:38
-#, c-format
+#, fuzzy, c-format
msgid "error: tag input does not pass fsck: %s"
-msgstr ""
+msgstr "error: l'entrada d'etiqueta no passa fsck: %s"
#: builtin/mktag.c:41
-#, c-format
+#, fuzzy, c-format
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr ""
+msgstr "%d (FSCKIGNORE?) no hauria d'activar aquesta crida de retorn"
#: builtin/mktag.c:56
#, fuzzy, c-format
@@ -18296,16 +18674,19 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "l'objecte %s és %s, no pas %s"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
+#, fuzzy
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
+"l'etiqueta a l'entrada estàndard no ha passat la comprovació estricta del "
+"fsck"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
#, fuzzy
msgid "tag on stdin did not refer to a valid object"
msgstr "%s no apunta a un objecte vàlid"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
@@ -18327,43 +18708,58 @@
#: builtin/multi-pack-index.c:10
#, fuzzy
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
"size=<size>)"
-#: builtin/multi-pack-index.c:13
-#, fuzzy
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] verify"
-#: builtin/multi-pack-index.c:16
-#, fuzzy
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] expire"
-#: builtin/multi-pack-index.c:19
-#, fuzzy
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
#, fuzzy
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"directori de l'objecte que conté el conjunt de parells packfile i pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
+#, fuzzy
msgid "preferred-pack"
-msgstr ""
+msgstr "paquet preferit"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
+#, fuzzy
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
+"empaqueta per a reutilitzar quan es calcula un mapa de bits multi-paquet"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+#, fuzzy
+msgid "write multi-pack bitmap"
+msgstr "no s'han pogut netejar els percentatges multi-paquet"
+
+#: builtin/multi-pack-index.c:105
+#, fuzzy
+msgid "write multi-pack index containing only given indexes"
+msgstr "git multi-pack-index [<opcions>] verify"
+
+#: builtin/multi-pack-index.c:107
+#, fuzzy
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "instantània de refs per seleccionar entregues de mapa de bits"
+
+#: builtin/multi-pack-index.c:202
#, fuzzy
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
@@ -18372,11 +18768,6 @@
"durant el reempaquetament dels fitxers de recollida de paquets de mida més "
"petita en un lot que és més gran que aquesta mida"
-#: builtin/multi-pack-index.c:180
-#, fuzzy, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomandes no reconeguts"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opcions>] <origen>... <destí>"
@@ -18405,72 +18796,72 @@
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "el destí «%s» no és un directori"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "origen incorrecte"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "el directori d'origen està buit"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflicte"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "s'està sobreescrivint «%s»"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "múltiples orígens per al mateix destí"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
@@ -18526,8 +18917,8 @@
#: builtin/notes.c:29
msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>"
+" | (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18539,8 +18930,8 @@
#: builtin/notes.c:31
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
+" (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18651,97 +19042,96 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "S'ha produït un error en finalitzar «show» per a l'objecte «%s»"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir «%s»"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "línia d'entrada mal formada: «%s»."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "hi ha massa arguments"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18750,45 +19140,44 @@
"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu «-f» per a sobreescriure les notes existents"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "llegeix els objectes des de stdin"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:517
-#, fuzzy
+#: builtin/notes.c:515
msgid "too few arguments"
-msgstr "hi ha massa arguments"
+msgstr "massa pocs arguments"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
+" existing notes"
msgstr ""
"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu «-f» per a sobreescriure les notes existents"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18797,287 +19186,294 @@
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre «edit».\n"
"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
"s'ha produït un error en eliminar l'arbre de treball de «git notes merge»"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"resolve notes conflicts using the given strategy "
+"(manual/ours/theirs/union/cat_sort_uniq)"
msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusió de notes a %s ja està en curs a %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
"actual (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
+" 'git notes merge --commit', or abort the merge with 'git notes merge "
+"--abort'.\n"
msgstr ""
"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
"cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb "
"«git notes merge --abort».\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "l'intent d'eliminar una nota no existent no és un error"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:440
-#, c-format
+#: builtin/pack-objects.c:572
+#, fuzzy, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
"pack %s"
msgstr ""
+"Writereuseobject: no s'ha pogut localitzar %s, s'esperava a la posició "
+"%<PRIuMAX> al paquet %s"
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "objecte CRC mal empaquetat per a percentatges"
-#: builtin/pack-objects.c:459
-#, fuzzy, c-format
+#: builtin/pack-objects.c:591
+#, c-format
msgid "corrupt packed object for %s"
-msgstr "objecte empaquetat corrupte durant els percentatges"
+msgstr "objecte empaquetat corrupte per a %s"
-#: builtin/pack-objects.c:590
-#, fuzzy, c-format
+#: builtin/pack-objects.c:722
+#, c-format
msgid "recursive delta detected for object %s"
-msgstr "delta recursiu detectat per a objectes percentuals"
+msgstr "diferència recursiva detectada per a l'objecte %s"
-#: builtin/pack-objects.c:801
-#, fuzzy, c-format
+#: builtin/pack-objects.c:941
+#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
-msgstr "s'esperava un objecte d'un 1% <PRIu32>"
+msgstr "ordenats %u objectes, s'esperaven %<PRIu32>"
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
#, fuzzy, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
-"a causa de pack.packSizeLimit"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets"
+" a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "s'ha produït un error en fer stat a %s"
-#: builtin/pack-objects.c:1141
-#, fuzzy, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr "va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>"
+#: builtin/pack-objects.c:1268
+#, fuzzy
+msgid "failed to write bitmap index"
+msgstr "escriu índex de mapa de bits"
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1294
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "escrits %<PRIu32> objectes mentre s'esperaven %<PRIu32>"
+
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
-"s'empaqueten"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no"
+" s'empaqueten"
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
#, fuzzy, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "desplaçament de base delta desbordament en paquet de percentatges"
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
#, fuzzy, c-format
msgid "delta base offset out of bound for %s"
msgstr "decalatge de base de delta fora d'enllaç per un percentatge"
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "no s'ha pogut analitzar la capçalera de l'objecte dels percentatges"
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "no es poden llegir els objectes percentuals"
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, fuzzy, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "objecte%s longitud d'objecte inconsistent (%<PRIuMAX> vs%<PRIuMAX>)"
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
#, fuzzy
msgid "suboptimal pack - out of memory"
msgstr "paquet subòptim - sense memòria"
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compressió de diferències usant fins a %d fils"
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
-msgstr "no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
+msgstr ""
+"no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
-#: builtin/pack-objects.c:2922
-#, fuzzy
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "inconsistència amb el comptador de diferències"
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
#, fuzzy, c-format
msgid ""
-"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
-"hash> <uri>' (got '%s')"
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> "
+"<pack-hash> <uri>' (got '%s')"
msgstr ""
"el valor de uppack.blobpackfileuri ha de ser de la forma '<object-hash> "
"<pack-hash> <uri>' (gotat '%s')"
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
#, fuzzy, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19085,17 +19481,18 @@
"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat "
"'%')"
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
#, fuzzy, c-format
msgid "could not get type of object %s in pack %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, fuzzy, c-format
msgid "could not find pack '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
#, fuzzy, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19104,7 +19501,7 @@
"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
"percentatges d'escombraries"
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19113,284 +19510,288 @@
"s'esperava un ID d'objecte, s'ha rebut brossa:\n"
" %s"
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "valor no vàlid per a --missing"
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
#, fuzzy
msgid "cannot open pack index"
msgstr "no s'ha pogut obrir l'índex del paquet"
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
#, fuzzy, c-format
msgid "loose object at %s could not be examined"
msgstr "no s'han pogut examinar els objectes solts"
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
#, fuzzy
msgid "unable to force loose object"
msgstr "no s'ha pogut forçar l'objecte solt"
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "no és una revisió \"%s\""
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "revisió incorrecte «%s»"
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escriu el fitxer d'índex de paquet en la versió de format d'índex "
"especificada"
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer empaquetat de sortida"
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
-msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+msgstr ""
+"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longitud màxima de la cadena de diferències permesa en el paquet resultant"
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de diferències"
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "llegeix els arguments de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "limita els objectes als quals encara no s'hagin empaquetat"
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
#, fuzzy
msgid "read packs from stdin"
msgstr "llegeix les actualitzacions des de stdin"
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
+"inclou els objectes d'etiqueta que facin referència als objectes a "
+"empaquetar"
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
#, fuzzy
msgid "use the sparse reachability algorithm"
msgstr "utilitza l'algorisme d'accessibilitat dispers"
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
#, fuzzy
msgid "ignore this pack"
msgstr "ignora aquest paquet"
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un índex de mapa de bits, si està disponible, per a accelerar el "
"recompte d'objectes"
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
#, fuzzy
msgid "write a bitmap index if possible"
msgstr "escriu un índex de mapa de bits si és possible"
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
#, fuzzy
msgid "do not pack objects in promisor packfiles"
msgstr "no empaqueta els objectes als fitxers del paquet promisor"
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
#, fuzzy
msgid "respect islands during delta compression"
msgstr "respecta les illes durant la compressió delta"
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
#, fuzzy
msgid "protocol"
msgstr "protocol"
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
#, fuzzy
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
-msgstr "exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
+msgstr ""
+"exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
#, fuzzy, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
"la profunditat de la cadena delta és massa profunda forçant un percentatge"
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
#, fuzzy, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit és massa alt forçant un percentatge"
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
#, fuzzy
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no es pot utilitzar per construir un paquet per a la "
"transferència"
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
#, fuzzy
msgid "minimum pack size limit is 1 MiB"
msgstr "el límit mínim de mida del paquet és 1 MiB"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no es pot utilitzar per construir un paquet indexable"
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c:4073
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i --unpack-unreachable són incompatibles"
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "no es pot utilitzar --filter sense --stdout"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
#, fuzzy
msgid "cannot use --filter with --stdin-packs"
msgstr "no es pot utilitzar --filter sense --stdout"
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
#, fuzzy
msgid "cannot use internal rev list with --stdin-packs"
msgstr "no es poden especificar noms de camí amb --stdin"
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
-"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> diferències), paquets "
-"reusats %<PRIu32>"
+"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> "
+"diferències), paquets reusats %<PRIu32>"
#: builtin/pack-redundant.c:601
+#, fuzzy
msgid ""
"'git pack-redundant' is nominated for removal.\n"
"If you still use this command, please add an extra\n"
@@ -19398,6 +19799,11 @@
"and let us know you still use it by sending an e-mail\n"
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
+".git pack-redundant' és nominat per a la seva supressió.\n"
+"Si encara feu servir aquesta ordre, afegiu-hi un extra\n"
+"opció, «--i-still-use-this», a la línia d'ordres\n"
+"i fem-nos saber que encara l'useu enviant un correu electrònic\n"
+"a <git@vger.kernel.org>to Gràcies."
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
@@ -19432,7 +19838,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limita el trànsit d'objectes fora dels fitxers del paquet promisor"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un repositori d'objectes preciosos"
@@ -19443,7 +19849,8 @@
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr ""
+"git pull [<opcions>] [<repositori> [<especificació-de-referència>...]]"
#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
@@ -19457,14 +19864,13 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:167 parse-options.h:340
-#, fuzzy
+#: builtin/pull.c:167 parse-options.h:339
msgid "automatically stash/stash pop before and after"
-msgstr "«stash»/«stash» automàticament abans i després"
+msgstr "fes «stash» i «stash pop» automàticament abans i després"
#: builtin/pull.c:183
msgid "Options related to fetching"
@@ -19495,7 +19901,8 @@
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 d'obtenir."
+"No hi ha candidats per a fusionar entre les referències que acabeu "
+"d'obtenir."
#: builtin/pull.c:448
msgid ""
@@ -19516,7 +19923,7 @@
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:456 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
@@ -19533,7 +19940,7 @@
msgstr "Vegeu git-pull(1) per a més informació."
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<remot>"
@@ -19541,7 +19948,7 @@
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:471 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
@@ -19549,8 +19956,8 @@
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho"
+" amb:"
#: builtin/pull.c:485
#, c-format
@@ -19570,18 +19977,18 @@
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:930
+#: builtin/pull.c:936
+#, fuzzy
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
" git config pull.ff only # fast-forward only\n"
"\n"
-"You can replace \"git config\" with \"git config --global\" to set a "
-"default\n"
+"You can replace \"git config\" with \"git config --global\" to set a default\n"
"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
@@ -19599,20 +20006,20 @@
"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n"
"per defecte configuració en aquesta execució.\n"
-#: builtin/pull.c:991
+#: builtin/pull.c:1010
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:995
+#: builtin/pull.c:1014
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:996
+#: builtin/pull.c:1015
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:1021
+#: builtin/pull.c:1040
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19623,7 +20030,7 @@
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1046
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19634,22 +20041,31 @@
"to recover."
msgstr ""
"No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
-"de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
"$ git diff %s\n"
"executeu\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:1042
+#: builtin/pull.c:1061
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1066
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1068
+#, fuzzy
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No es pot fer «rebase» sobre múltiples branques."
+
+#: builtin/pull.c:1082
+#, fuzzy
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Cal especificar com conciliar les branques divergents."
+
+#: builtin/pull.c:1096
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -19657,7 +20073,8 @@
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opcions>] [<repositori> [<especificació-de-referència>...]]"
+msgstr ""
+"git push [<opcions>] [<repositori> [<especificació-de-referència>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
@@ -19673,8 +20090,7 @@
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a «git help "
-"config»."
+"Per a triar qualsevol opció permanentment, vegeu push.default a «git help config»."
#: builtin/push.c:167
#, c-format
@@ -19716,7 +20132,7 @@
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:194
+#: builtin/push.c:191
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -19729,13 +20145,20 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:202
+#: builtin/push.c:199
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid ""
+"The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
-#: builtin/push.c:205
+#: builtin/push.c:217
+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:243
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -19746,14 +20169,7 @@
"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:260
-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:267
+#: builtin/push.c:258
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19763,10 +20179,9 @@
"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
"actual està darrere de la seva branca remota corresponent. Integreu\n"
"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 a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:273
+#: builtin/push.c:264
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"
@@ -19777,10 +20192,9 @@
"està darrere de la seva branca remota corresponent. Agafeu aquesta\n"
"branca i integreu els canvis remots (per exemple, «git pull ...»)\n"
"abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:279
+#: builtin/push.c:270
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"
@@ -19793,15 +20207,15 @@
"que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n"
"integrar els canvis remots (per exemple, «git pull ...») abans de\n"
"pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:286
+#: builtin/push.c:277
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."
+"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el "
+"remot."
-#: builtin/push.c:289
+#: builtin/push.c:280
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"
@@ -19812,7 +20226,7 @@
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"«--force».\n"
-#: builtin/push.c:294
+#: builtin/push.c:285
#, fuzzy
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
@@ -19823,110 +20237,108 @@
"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
"actual està darrere de la seva branca remota corresponent. Integreu\n"
"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 a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
-#: builtin/push.c:364
+#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
msgstr "S'està pujant a %s\n"
-#: builtin/push.c:371
+#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha produït un error en pujar algunes referències a «%s»"
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repositori"
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:557
+#: builtin/push.c:548
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:558
+#: builtin/push.c:549
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:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nom-de-referència>:<esperat>"
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "requereix que les actualitzacions remotes s'integrin localment"
-#: builtin/push.c:569
+#: builtin/push.c:560
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:573
+#: builtin/push.c:564
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:576
+#: builtin/push.c:567
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:578
+#: builtin/push.c:569
msgid "bypass pre-push hook"
msgstr "evita el lligam de prepujada"
-#: builtin/push.c:579
+#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:601
+#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:603
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
-#: builtin/push.c:623
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "repositori incorrecte «%s»"
-#: builtin/push.c:624
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
@@ -19935,8 +20347,7 @@
" git push <name>\n"
msgstr ""
"No hi ha cap destí de pujada configurat.\n"
-"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori remot "
-"fent servir\n"
+"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori remot fent servir\n"
"\n"
" git remote add <nom> <url>\n"
"\n"
@@ -19944,36 +20355,34 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:639
+#: builtin/push.c:630
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:641
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:645
+#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:647
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:650
+#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:657
+#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
#: builtin/range-diff.c:9
-#, fuzzy
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>.<new-tip>..<new-"
-"tip>."
+"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>..<new-tip>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
@@ -19988,14 +20397,12 @@
msgstr "utilitza colors simples de diff"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "notes"
msgstr "notes"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "passed to 'git log'"
-msgstr "passa a 'git log'"
+msgstr "passa-ho a «git log»"
#: builtin/range-diff.c:35
#, fuzzy
@@ -20021,85 +20428,86 @@
msgstr "calen dos rangs de comissió"
#: builtin/read-tree.c:41
+#, fuzzy
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>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
+"[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "escriu l'índex resultant al <fitxer>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "només buida l'índex"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "S'està fusionant"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "realitza una fusió a més d'una lectura"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "el mateix que -m, però descarta les entrades no fusionades"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<subdirectori>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "actualitza l'arbre de treball amb el resultat de fusió"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "no comprovis l'arbre de treball després de fusionar"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "no actualitzis l'índex ni l'arbre de treball"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "omet l'aplicació del filtre d'agafament parcial"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
#, fuzzy
msgid "suppress feedback messages"
msgstr "suprimeix els missatges de retroacció"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Primer heu de resoldre l'índex actual"
@@ -20115,238 +20523,67 @@
#: builtin/rebase.c:37
#, fuzzy
msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
#: builtin/rebase.c:39
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "llista per a fer inestable: «%s»"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "no s'ha pogut crear el fitxer temporal %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "no s'ha pogut marcar com a interactiu"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "no s'ha pogut generar la llista per a fer"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
#, fuzzy
msgid "a base commit must be provided with --upstream or --onto"
msgstr "s'ha de proporcionar una comissió base amb --upstream o --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcions>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-#, fuzzy
-msgid "keep commits which start empty"
-msgstr "manté les comissions que comencen en blanc"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "fes «rebase» de les comissions de fusió"
-
-#: builtin/rebase.c:502
-#, fuzzy
-msgid "keep original branch points of cousins"
-msgstr "mantén els punts de branca originals dels cosins"
-
-#: builtin/rebase.c:504
-#, fuzzy
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mou les comissions que comencen amb squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signa les comissions"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "mostra un «diffstat» del que ha canviat a la font"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continua el «rebase»"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "omet la comissió"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "edita la llista a fer"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostra el pedaç actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandeix els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reorganitza les línies «fixup/pick»"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "expandeix les ordres exec en la llista per a fer"
-
-#: builtin/rebase.c:526
-#, fuzzy
-msgid "onto"
-msgstr "sobre"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisió restringida"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict revision"
-msgstr "restringeix la revisió"
-
-#: builtin/rebase.c:531
-#, fuzzy
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-#, fuzzy
-msgid "squash onto"
-msgstr "carabassa a"
-
-#: builtin/rebase.c:534
-#, fuzzy
-msgid "the upstream commit"
-msgstr "la comissió principal"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head-name"
-msgstr "nom-cap"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head name"
-msgstr "nom del cap"
-
-#: builtin/rebase.c:541
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratègia de rebase"
-
-#: builtin/rebase.c:542
-#, fuzzy
-msgid "strategy-opts"
-msgstr "opcions estratègiques"
-
-#: builtin/rebase.c:543
-#, fuzzy
-msgid "strategy options"
-msgstr "opcions d'estratègia"
-
-#: builtin/rebase.c:544
-#, fuzzy
-msgid "switch-to"
-msgstr "canvia a"
-
-#: builtin/rebase.c:545
-#, fuzzy
-msgid "the branch or commit to checkout"
-msgstr "la branca o entrega a agafar"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto-name"
-msgstr "ont-name"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto name"
-msgstr "al nom"
-
-#: builtin/rebase.c:547
-#, fuzzy
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "l'ordre a executar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-#, fuzzy
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "torna a planificar automàticament qualsevol `exec` que falli"
-
-#: builtin/rebase.c:566
-#, fuzzy
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, fuzzy, c-format
msgid "%s requires the merge backend"
msgstr "%s requereix un «rebase» interactiu"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, fuzzy, c-format
msgid "could not get 'onto': '%s'"
msgstr "no s'ha pogut obtenir «onto» «%s»"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, fuzzy, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head '%s' no és vàlid"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, fuzzy, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
msgstr ""
"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --"
-"continue».\n"
+"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
"Alternativament podeu ometre aquesta comissió: executeu «git rebase --skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
-"executeu «git rebase --abort»."
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, fuzzy, c-format
msgid ""
"\n"
@@ -20360,16 +20597,14 @@
"git va trobar un error en preparar els pedaços per a tornar a reproduir "
"aquests revisions per cent. Com a resultat git no pot refer-los."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, fuzzy, c-format
-msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
msgstr ""
"no es reconeix el tipus buit «%s»; els valors vàlids són «drop» «keep» i "
"«ask»."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20386,7 +20621,7 @@
" git rebase '<branca>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20394,202 +20629,208 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:\n"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:\n"
"\n"
" git branch --set-upstream-to=%s/<branca> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
#, fuzzy
msgid "exec commands cannot contain newlines"
msgstr "les ordres exec no poden contenir línies noves"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "ordre exec buida"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
#, fuzzy
msgid "use the merge-base of upstream and branch as the current base"
msgstr "utilitza la base de fusió de la font i la branca com a base actual"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "mostra un «diffstat» del que ha canviat a la font"
+
+#: builtin/rebase.c:1035
#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "no mostris «diffstat» de quina font ha canviat"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
#, fuzzy
msgid "add a Signed-off-by trailer to each commit"
msgstr "afegeix una línia signada per cada entrega"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
#, fuzzy
msgid "make committer date match author date"
msgstr "Agrupa per «comitter» en comptes de per autor"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignora la data de l'autor i utilitza la data actual"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "sinònim de --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "passa-ho a «git apply»"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignora els canvis d'espais en blanc"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "mostra el pedaç que s'està aplicant o fusionant"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "utilitza estratègies d'aplicació per fer «rebase»"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "utilitza estratègies de fusió per fer «rebase»"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "com gestionar les comissions que queden buides"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
#, fuzzy
+msgid "keep commits which start empty"
+msgstr "manté les comissions que comencen en blanc"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
#, fuzzy
msgid "add exec lines after each commit of the editable list"
-msgstr "afegeix línies d'exec després de cada publicació de la llista editable"
+msgstr ""
+"afegeix línies d'exec després de cada publicació de la llista editable"
-#: builtin/rebase.c:1404
-#, fuzzy
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
-msgstr "permet tornar a basar les comissions amb missatges buits"
+msgstr "permet fer «rebase» de les comissions amb missatges buits"
-#: builtin/rebase.c:1408
-#, fuzzy
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
-msgstr "intenta fer «rebase» de les fusions en lloc d'omissió"
+msgstr "intenta fer «rebase» de les fusions en comptes de ometre-les"
-#: builtin/rebase.c:1411
-#, fuzzy
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "usa «merge-base --fork-point» per refinar la font"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "utilitza l'estratègia de fusió donada"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opció"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argument a l'estratègia de fusió"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
#, fuzzy
-msgid "apply all changes, even those already present upstream"
-msgstr "aplica tots els canvis fins i tot els que ja estan a la font principal"
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "torna a planificar automàticament qualsevol `exec` que falli"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1128
+msgid "apply all changes, even those already present upstream"
+msgstr "aplica tots els canvis, fins i tot els que ja estan a la font"
+
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+#: builtin/rebase.c:1180
+#, fuzzy
+msgid "--preserve-merges was replaced by --rebase-merges"
msgstr ""
"git rebase --preserve-merges està en desús. Utilitzeu --rebase-merges en "
"lloc seu."
-#: builtin/rebase.c:1488
-#, fuzzy
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "no es pot combinar «--keep-base» amb «--onto»"
-#: builtin/rebase.c:1490
-#, fuzzy
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "no es pot combinar «--keep-base» amb «--root»"
-#: builtin/rebase.c:1494
-#, fuzzy
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
-msgstr "no es pot combinar «--root» amb «--root»"
+msgstr "no es pot combinar «--root» amb «--fork-point»"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20597,16 +20838,16 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20622,148 +20863,134 @@
"d'un altre rebase. Si és així, si us plau, provi-ho si no és així, si us "
"plau inciti-me."
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "«switch» «c» espera un valor numèric"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
-#: builtin/rebase.c:1759
-#, fuzzy
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, fuzzy, c-format
msgid "Unknown rebase backend: %s"
msgstr "Rebase de system%s desconegut"
-#: builtin/rebase.c:1802
-#, fuzzy
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedulo-failed-exec requereix --exec o --interactive"
+msgstr "--reschedule-failed-exec requereix --exec o --interactive"
-#: builtin/rebase.c:1822
-#, fuzzy
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no es poden combinar «--preserve-merges» amb «--rebase-merges»"
-
-#: builtin/rebase.c:1826
-#, fuzzy
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "No s'ha pogut crear una comissió arrel nova"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, fuzzy, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s' necessita exactament una base de fusió amb branca"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, fuzzy, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s' necessita exactament una base de fusió"
-#: builtin/rebase.c:1893
-#, fuzzy, c-format
+#: builtin/rebase.c:1580
+#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a una comissió vàlida «%s»"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, fuzzy, c-format
-msgid "fatal: no such branch/commit '%s'"
+msgid "no such branch/commit '%s'"
msgstr "fatal no existeix aquesta branca/commit «%s»"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "No s'ha pogut resoldre HEAD a una revisió"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "no s'ha pogut commutar a %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branca actual %s està al dia.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "La branca actual està al dia, «rebase» forçat."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Canvis a %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Canvis de %s a %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
"damunt...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "No s'ha pogut separar HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avanç ràpid %s a %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20794,7 +21021,7 @@
"per defecte, establiu la variable de configuració\n"
"«receive.denyCurrentBranch» a «refuse»."
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20816,23 +21043,23 @@
"\n"
"Per a silenciar aquest missatge, podeu establir-la a «refuse»."
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:2493
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] "
+"[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
+" <refs>..."
msgstr ""
-"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<referències>..."
+"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] "
+"[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
+" <referències>..."
#: builtin/reflog.c:22
msgid ""
@@ -20857,22 +21084,21 @@
msgstr "S'estan marcant els objectes abastables..."
#: builtin/reflog.c:647
-#, fuzzy, c-format
+#, c-format
msgid "%s points nowhere!"
-msgstr "els percentatges no apunten enlloc!"
+msgstr "%s no apunta a enlloc"
-#: builtin/reflog.c:699
-#, fuzzy
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
-msgstr "no s'ha especificat cap registre de referència per suprimir"
+msgstr "no s'ha especificat cap registre de referència per a suprimir"
#: builtin/reflog.c:708
-#, fuzzy, c-format
+#, c-format
msgid "not a reflog: %s"
-msgstr "no és un registre de referència"
+msgstr "no és un registre de referència: %s"
#: builtin/reflog.c:713
-#, fuzzy, c-format
+#, c-format
msgid "no reflog for '%s'"
msgstr "cap registre de referència per a «%s»"
@@ -20891,11 +21117,11 @@
#: builtin/remote.c:18
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nom> <url>"
+"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <nom> <url>"
#: builtin/remote.c:19 builtin/remote.c:39
msgid "git remote rename <old> <new>"
@@ -21019,7 +21245,7 @@
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
@@ -21029,26 +21255,31 @@
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra «%s»"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format, fuzzy
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branca no gestionada.%s.rebase=%s; assumint 'true'"
+
+#: builtin/remote.c:366
#, 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:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(coincident)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:655
-#, fuzzy, c-format
+#: builtin/remote.c:660
+#, c-format
msgid "could not set '%s'"
msgstr "no s'ha pogut establir «%s»"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, fuzzy, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21058,39 +21289,38 @@
"La configuració dels percentatges és remota.pushDefault ins%d ara anomena "
"els \"%s\" remots inexistents"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "No existeix el remot «%s»"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, 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:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
"\t%s\n"
"\tActualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de «%s» ha fallat"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de «%s» ha fallat"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21101,465 +21331,480 @@
"Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
"per a suprimir-la, useu:"
msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
-"eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu «git remote prune» per a eliminar)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, fuzzy, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebases interactivament (amb fusions) en percentatges remots"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " es fusiona amb el remot %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(sense URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " «git push» reflectirà les referències locals"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar la HEAD remota"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot «%s»"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot «%s»"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "suprimeix els URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes "
-"de bits. Useu\n"
-"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
-"writebitmaps."
+"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes de bits. Useu\n"
+"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
#, fuzzy
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"no s'han pogut iniciar pack-objects per tornar a empaquetar els objectes "
"«promissor»"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
#, fuzzy
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"reempaqueta S'esperen línies d'id. de l'objecte hexadecimal complet només "
"des de pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
#, fuzzy
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no s'ha pogut finalitzar el paquet d'objectes per tornar a empaquetar "
"objectes promisor"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, fuzzy, c-format
msgid "cannot open index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
-#: builtin/repack.c:368
-#, c-format
+#: builtin/repack.c:371
+#, fuzzy, c-format
msgid "pack %s too large to consider in geometric progression"
-msgstr ""
+msgstr "el paquet %s és massa gran per considerar en la progressió geomètrica"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
-#, c-format
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#, fuzzy, c-format
msgid "pack %s too large to roll up"
-msgstr ""
+msgstr "el paquet %s és massa gran per enrotllar-lo"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, fuzzy, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: builtin/repack.c:514
+#, fuzzy
+msgid "could not close refs snapshot tempfile"
+msgstr "no s'ha pogut crear el fitxer temporal"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
msgstr "passa --delta-illes a git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "amb -A, no soltis els objectes més vells que aquest"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
#, fuzzy
msgid "do not repack this pack"
msgstr "no reempaqueta aquest paquet"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
+#, fuzzy
msgid "find a geometric progression with factor <N>"
-msgstr ""
+msgstr "troba una progressió geomètrica amb el factor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+#, fuzzy
+msgid "write a multi-pack index of the resulting packs"
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
#, fuzzy
msgid "--geometric is incompatible with -A, -a"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
#, fuzzy
msgid "Nothing new to pack."
msgstr "Res nou per empaquetar."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, fuzzy, c-format
msgid "missing required file: %s"
msgstr "falten els arguments per a %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, fuzzy, c-format
msgid "could not unlink: %s"
msgstr "no s'ha pogut bloquejar «%s»"
@@ -21625,8 +21870,8 @@
"while '%s' points to a replacement object of type '%s'."
msgstr ""
"Els objectes han de ser del mateix tipus. «%s» apunta a un objecte "
-"substituït del tipus «%s» mentre que «%s» apunta a un objecte de substitució "
-"del tipus «%s»."
+"substituït del tipus «%s» mentre que «%s» apunta a un objecte de substitució"
+" del tipus «%s»."
#: builtin/replace.c:229
#, fuzzy, c-format
@@ -21823,18 +22068,19 @@
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registra les resolucions netes en l'índex"
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
#, fuzzy
msgid "'git rerere forget' without paths is deprecated"
msgstr "'git rererere oblid' sense camins està en desús"
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "s'ha pogut generar el diff per a «%s»"
@@ -21882,93 +22128,93 @@
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "registra només el fet que els camins eliminats s'afegiran després"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed amb camins està en desús; useu «git reset -- <camins>» en lloc "
"d'això."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un repositori nu"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, fuzzy, c-format
msgid ""
"\n"
@@ -21976,32 +22222,32 @@
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
"to make this the default.\n"
msgstr ""
-"S'ha trigat segons de 4% a enumerar els canvis sense classificar després del "
-"reinici. Podeu utilitzar «--quiet» per evitar-ho. Establiu el paràmetre de "
+"S'ha trigat segons de 4% a enumerar els canvis sense classificar després del"
+" reinici. Podeu utilitzar «--quiet» per evitar-ho. Establiu el paràmetre de "
"configuració reset.quiet a cert per fer que això sigui el predeterminat."
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:538
+#: builtin/rev-list.c:541
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "el filtratge d'objectes requereix --objects"
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c:679
#, fuzzy
msgid "marked counting is incompatible with --objects"
msgstr "el recompte marcat és incompatible amb --objects"
@@ -22022,6 +22268,21 @@
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
+#: builtin/rev-parse.c:438
+#, fuzzy
+msgid "premature end of input"
+msgstr "error de lectura d'entrada"
+
+#: builtin/rev-parse.c:442
+#, fuzzy
+msgid "no usage string given before the `--' separator"
+msgstr "no s'ha indicat cap cadena d'ús abans del separador «--»"
+
+#: builtin/rev-parse.c:548
+#, fuzzy
+msgid "Needed a single revision"
+msgstr "make_script: s'ha produït un error en preparar les revisions"
+
#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -22034,8 +22295,57 @@
" o bé: git rev-parse --sq-quote [<argument>...]\n"
" o bé: git rev-parse [<opcions>] [<argument>...]\n"
"\n"
-"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer "
-"ús."
+"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer ús."
+
+#: builtin/rev-parse.c:712
+#, fuzzy
+msgid "--resolve-git-dir requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:715
+#, fuzzy, c-format
+msgid "not a gitdir '%s'"
+msgstr "no és una revisió \"%s\""
+
+#: builtin/rev-parse.c:739
+#, fuzzy
+msgid "--git-path requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:749
+#, fuzzy
+msgid "-n requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:763
+#, fuzzy
+msgid "--path-format requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:769
+#, fuzzy, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "Valor no vàlid per a --patch-format: %s"
+
+#: builtin/rev-parse.c:776
+#, fuzzy
+msgid "--default requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:782
+#, fuzzy
+msgid "--prefix requires an argument"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/rev-parse.c:851
+#, fuzzy, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "valor desconegut per a --diff-merges: %s"
+
+#: builtin/rev-parse.c:1023
+#, fuzzy, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "mode de creació d'objecte no vàlid: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -22109,17 +22419,21 @@
#: builtin/revert.c:127
msgid "preserve initially empty commits"
-msgstr "preserva les comissions inicialment buides"
+msgstr "conserva les comissions inicialment buides"
+
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
@@ -22169,73 +22483,72 @@
msgstr[0] "el fitxer següent té modificacions locals:"
msgstr[1] "els fitxers següents tenen modificacions locals:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "no llistis els fitxers eliminats"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "només elimina de l'índex"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "passa per alt la comprovació d'actualitat"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "permet l'eliminació recursiva"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
#, fuzzy
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"No s'ha indicat cap especificació de camí. Quins fitxers haig de suprimir?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"si us plau astaqueu els canvis a .gitmodules o feu un «stash» per continuar"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no s'eliminarà «%s» recursivament sense -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
#: builtin/send-pack.c:20
+#, fuzzy
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
-"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
-"[<màquina>:]<directori> [<referència>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] [<màquina>:]<directori> [<referència>...]\n"
" --all i especificació <referència> explícita són mútuament excloents."
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nom del remot"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "usa el protocol RPC sense estat"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "llegeix les referències des de stdin"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
@@ -22301,16 +22614,17 @@
msgid "group by field"
msgstr "Agrupa per camp"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "hi ha massa arguments donats fora del repositori"
#: builtin/show-branch.c:13
+#, fuzzy
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<quan>] | --no-color] [--sparse]\n"
@@ -22319,7 +22633,8 @@
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
#: builtin/show-branch.c:395
#, c-format
@@ -22328,114 +22643,115 @@
msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "no hi ha referències coincidents amb %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "colora «*!+-» corresponent a la branca"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "omet anomenar cadenes"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevol altra referència"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
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:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+"--reflog is incompatible with --all, --remotes, --independent or --merge-"
+"base"
msgstr ""
"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "l'opció --reflog necessita un nom de branca"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "es pot mostrar només %d entrada a la vegada."
msgstr[1] "es poden mostrar només %d entrades a la vegada."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "no hi ha tal referència %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no es pot gestionar més d'%d revisió."
msgstr[1] "no es poden gestionar més de %d revisions."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» no és una referència vàlida."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no es pot trobar la comissió %s (%s)"
@@ -22452,11 +22768,11 @@
#: builtin/show-ref.c:12
msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"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] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -22510,84 +22826,100 @@
#, fuzzy
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout "
-"no existeixi)"
+"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout"
+" no existeixi)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format, fuzzy
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"el directori '%s' conté fitxers no seguits, però no està en el con de la "
+"verificació dispersa"
+
+#: builtin/sparse-checkout.c:181
+#, fuzzy, c-format
+msgid "failed to remove directory '%s'"
+msgstr "s'ha produït un error en crear el directori «%s»"
+
+#: builtin/sparse-checkout.c:321
#, fuzzy
msgid "failed to create directory for sparse-checkout file"
msgstr "no s'ha pogut crear el directori per al fitxer sparse-checkout"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
#, fuzzy
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-"no s'ha pogut actualitzar el format del repositori per habilitar worktreeConfig"
+"no s'ha pogut actualitzar el format del repositori per habilitar "
+"worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
#, fuzzy
msgid "failed to set extensions.worktreeConfig setting"
msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
#, fuzzy
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
#, fuzzy
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicialitza el «sparse-checkout» en mode con"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
+#, fuzzy
msgid "toggle the use of a sparse index"
-msgstr ""
+msgstr "commuta l'ús d'un índex dispers"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
#, fuzzy
msgid "failed to modify sparse-index config"
msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:507
#, fuzzy, c-format
msgid "could not normalize path %s"
msgstr "no s'ha pogut normalitzar el camí"
-#: builtin/sparse-checkout.c:431
+#: builtin/sparse-checkout.c:519
#, fuzzy
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrons>)"
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:544
#, fuzzy, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "no s'ha pogut treure la cadena de l'estil C «%s»"
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
#, fuzzy
msgid "unable to load existing sparse-checkout patterns"
msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents"
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "llegeix els patrons de l'entrada estàndard"
-#: builtin/sparse-checkout.c:594
+#: builtin/sparse-checkout.c:682
#, fuzzy
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:613
+#: builtin/sparse-checkout.c:701
#, fuzzy
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "s'ha produït un error en actualitzar el directori de treball"
@@ -22613,10 +22945,6 @@
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <nom-de-branca> [<stash>]"
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
#: builtin/stash.c:30
#, fuzzy
msgid ""
@@ -22625,11 +22953,11 @@
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
-"git stash [push [-p|-patch] [-k|-[no-]keep-index] [-q|--quiet] [-u|--include-"
-"untracked] [-a|-all] [-m|-message <message>] [--pathspec-from-file=<file> [--"
-"path-spec-file-nul]]"
+"git stash [push [-p|-patch] [-k|-[no-]keep-index] [-q|--quiet] "
+"[-u|--include-untracked] [-a|-all] [-m|-message <message>] [--pathspec-from-"
+"file=<file> [--path-spec-file-nul]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22659,6 +22987,15 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
" [--] [<pathspec>...]]"
+#: builtin/stash.c:87
+#, fuzzy
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<missatge>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22683,187 +23020,190 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: builtin/stash.c:431
-#, c-format
+#: builtin/stash.c:447
+#, fuzzy, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
" %s -> %s\n"
" to make room.\n"
msgstr ""
+"AVÍS: El fitxer no seguit en el camí del fitxer seguit! S'està reanomenant\n"
+" %s - % %s\n"
+" per fer espai."
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "no es pot aplicar un «stash» enmig d'una fusió"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "no s'ha pogut generar diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
#, fuzzy
msgid "conflicts in index. Try without --index."
msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "no s'ha pogut desar l'arbre d'índex"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "S'està fusionant %s amb %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "L'índex no estava «unstashed»."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "intenta tornar a crear l'índex"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
-msgstr "Descartat %s (%s)"
+msgstr "Descartada %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "«%s» no és una referència «stash»"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
#, fuzzy
msgid "failed to parse tree"
msgstr "s'ha produït un error en analitzar %s"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
#, fuzzy
msgid "failed to unpack trees"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
#, fuzzy
msgid "include untracked files in the stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
#, fuzzy
msgid "only show untracked files in the stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "No es pot actualitzar %s amb %s"
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "missatge «stash»"
-#: builtin/stash.c:960
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "«git stash store» requereix un argument <comissió>"
-#: builtin/stash.c:1175
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: builtin/stash.c:1275
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: builtin/stash.c:1302
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: builtin/stash.c:1311
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "No es poden desar els fitxers no seguits"
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: builtin/stash.c:1359
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: builtin/stash.c:1408
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No es poden usar --patch i --include-untracked o --all a la vegada"
-#: builtin/stash.c:1426
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Heu oblidat de fer «git add»?"
-#: builtin/stash.c:1441
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: builtin/stash.c:1448
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: builtin/stash.c:1463
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: builtin/stash.c:1468
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "S'han desat el directori de treball i l'estat d'índex %s"
-#: builtin/stash.c:1558
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "mantén l'índex"
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: builtin/stash.c:1612 builtin/stash.c:1677
#, fuzzy
msgid "stash in patch mode"
msgstr "stash en mode pedaç"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "mode silenciós"
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "inclou els fitxers ignorats"
-#: builtin/stash.c:1704
+#: builtin/stash.c:1717
#, fuzzy
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
-"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva "
-"entrada a «git help config»."
+"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva"
+" entrada a «git help config»."
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -22882,40 +23222,49 @@
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote no pren cap argument"
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori "
+"és el seu repositori font autoritzat."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "S'està entrant a «%s»\n"
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
#, fuzzy, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22923,93 +23272,83 @@
msgstr ""
"runcommand ha retornat un estat diferent de zero per als percentatges ."
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
#, fuzzy, c-format
msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
+"run_command returned non-zero status while recursing in the nested submodules of %s\n"
"."
msgstr ""
"runcommand ha retornat un estat diferent de zero mentre es repeteix als "
"submòduls niats de percentatges ."
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
#, fuzzy
msgid "suppress output of entering each submodule command"
msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "inclou recursivament els submòduls imbricats"
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori és "
-"el seu repositori font autoritzat."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
"«%s»\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha produït un error en registrar el mode d'actualització per al camí de "
"submòdul «%s»"
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
#, fuzzy
msgid "suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opcions>] [<camí>]"
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, 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:836
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
#, fuzzy
msgid "suppress submodule status output"
msgstr "Suprimeix la sortida de l'estat del submòdul"
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
#, fuzzy
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
@@ -23018,109 +23357,110 @@
"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
"submòdul HEAD"
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
#, fuzzy, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* el %s(blob)->%s(submòdul)"
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
#, fuzzy, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* un %s per cents(submòdul)->%s(blob)"
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
#, fuzzy, c-format
msgid "%s"
msgstr "percentatges"
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
#, fuzzy, c-format
msgid "couldn't hash object from '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
#, fuzzy, c-format
msgid "unexpected mode %o\n"
msgstr "mode inesperat $mod_dst"
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
#, fuzzy
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
"submòdul HEAD"
-#: builtin/submodule--helper.c:1303
+#: builtin/submodule--helper.c:1278
#, fuzzy
-msgid "to compare the commit in the index with that in the submodule HEAD"
+msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
"submòdul HEAD"
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
#, fuzzy
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "omet els submòduls amb el valor «ignoreconfig» establert a «all»"
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
#, fuzzy
msgid "limit the summary size"
msgstr "limita a caps"
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
#, fuzzy
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper init [<opcions>] [<camí>]"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
#, fuzzy
msgid "could not fetch a revision for HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1316
#, fuzzy
msgid "--cached and --files are mutually exclusive"
msgstr "-n i -k són mútuament excloents"
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
+msgstr ""
+"s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
#, fuzzy
msgid "suppress output of synchronizing submodule url"
msgstr "Omet la sortida de la sincronització de l'url del submòdul"
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:1547
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23129,7 +23469,7 @@
"L'arbre de treball de submòdul «%s» conté un directori .git\n"
"(useu «rm -rf» si realment voleu eliminar-lo, incloent tota la seva història)"
-#: builtin/submodule--helper.c:1559
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23138,49 +23478,49 @@
"L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
"per a descartar-les"
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "S'ha esborrat el directori «%s»\n"
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no s'ha pogut crear el directori de submòdul buit %s"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1590
#, fuzzy
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"Elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
"locals"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1591
#, fuzzy
msgid "unregister all submodules"
msgstr "Desregistra recursivament tots els submòduls"
-#: builtin/submodule--helper.c:1631
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
-#: builtin/submodule--helper.c:1645
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu «--all» si realment voleu desinicialitzar tots els submòduls"
-#: builtin/submodule--helper.c:1714
+#: builtin/submodule--helper.c:1655
#, fuzzy
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
@@ -23189,50 +23529,71 @@
"'--reference-if-able' instead of '--reference'."
msgstr ""
"Un càlcul alternatiu d'un superprojecte no és vàlid. Per permetre que Git "
-"cloni sense una alternativa en aquest cas establiu submòdul."
-"alternateErrorStrategy a 'info' o clona equivalentment amb «--reference-if-"
-"able' en lloc de «--reference»."
+"cloni sense una alternativa en aquest cas establiu "
+"submòdul.alternateErrorStrategy a 'info' o clona equivalentment amb "
+"«--reference-if-able' en lloc de «--reference»."
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:1792
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1771
+#, fuzzy, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "refusant crear/usar '%s' en el directori git d'un altre submòdul"
+
+#: builtin/submodule--helper.c:1812
+#, 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:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directori no buit: «%s»"
+
+#: builtin/submodule--helper.c:1829
+#, 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:1861
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "no permetis clonar en un directori no buit"
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1887
#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
@@ -23240,107 +23601,199 @@
"<url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [---reference "
-"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> --"
-"path <path>"
+"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> "
+"--path <path>"
-#: builtin/submodule--helper.c:1874
-#, fuzzy, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "refusant crear/usar '%s' en el directori git d'un altre submòdul"
-
-#: builtin/submodule--helper.c:1885
-#, 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:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "directori no buit: «%s»"
-
-#: builtin/submodule--helper.c:1901
-#, 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:1937
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar «update --init»?"
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2372
+#, fuzzy, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»"
+
+#: builtin/submodule--helper.c:2376
+#, fuzzy, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr ""
+"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
+
+#: builtin/submodule--helper.c:2380
+#, fuzzy, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»"
+
+#: builtin/submodule--helper.c:2384
+#, fuzzy, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr ""
+"L'execució de «$command $sha1» ha fallat en el camí de submòdul "
+"«$displaypath»"
+
+#: builtin/submodule--helper.c:2408
+#, fuzzy, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
+
+#: builtin/submodule--helper.c:2412
+#, fuzzy, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
+
+#: builtin/submodule--helper.c:2416
+#, fuzzy, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
+
+#: builtin/submodule--helper.c:2420
+#, fuzzy, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "El camí de submòdul «%s» no està inicialitzat"
+
+#: builtin/submodule--helper.c:2444
+#, fuzzy, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
+"intentant obtenir directament $sha1:"
+
+#: builtin/submodule--helper.c:2453
+#, fuzzy, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1."
+" L'obtenció directa d'aquella comissió ha fallat."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:2331
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
-#: builtin/submodule--helper.c:2335
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:2341
+#: builtin/submodule--helper.c:2517
#, fuzzy
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:2358
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "valor incorrecte per al paràmetre update"
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2565
+#, fuzzy
+msgid "suppress output for update by rebase or merge"
+msgstr "Omet la sortida d'inicialitzar un submòdul"
+
+#: builtin/submodule--helper.c:2566
+#, fuzzy
+msgid "force checkout updates"
+msgstr "força les actualitzacions"
+
+#: builtin/submodule--helper.c:2568
+#, fuzzy
+msgid "don't fetch new objects from the remote site"
+msgstr "Crea un objecte arbre des de l'índex actual"
+
+#: builtin/submodule--helper.c:2570
+#, fuzzy
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"substitueix el mode d'actualització en cas que el repositori sigui un clon "
+"nou"
+
+#: builtin/submodule--helper.c:2571
+#, fuzzy
+msgid "depth for shallow fetch"
+msgstr "profunditat dels clons superficials"
+
+#: builtin/submodule--helper.c:2581
+#, fuzzy
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+#, fuzzy
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 esperat per superproject"
+
+#: builtin/submodule--helper.c:2584
+#, fuzzy
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+#, fuzzy
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 del CAP del submòdul"
+
+#: builtin/submodule--helper.c:2591
+#, fuzzy
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper init [<opcions>] [<camí>]"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23349,94 +23802,207 @@
"La branca de submòdul (%s) està configurada per a heretar la branca del "
"superprojecte, però el superprojecte no és en cap branca"
-#: builtin/submodule--helper.c:2542
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
-#: builtin/submodule--helper.c:2637
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "comprova si és segur escriure al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2878
#, fuzzy
msgid "unset the config in the .gitmodules file"
msgstr "no s'ha definit la configuració al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2883
#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <name> [<value>]"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2884
#, fuzzy
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <name>"
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, fuzzy, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
+#, fuzzy
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "Assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
-#: builtin/submodule--helper.c:2682
+#: builtin/submodule--helper.c:2920
#, fuzzy
msgid "suppress output for setting url of a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:2686
+#: builtin/submodule--helper.c:2924
#, fuzzy
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:2719
+#: builtin/submodule--helper.c:2957
#, fuzzy
msgid "set the default tracking branch to master"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2959
#, fuzzy
msgid "set the default tracking branch"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2963
#, fuzzy
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c:2964
#, fuzzy
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c:2971
#, fuzzy
msgid "--branch or --default required"
msgstr "cal el nom de branca"
-#: builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:2974
#, fuzzy
msgid "--branch and --default are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3037
+#, fuzzy, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "S'està afegint el repositori existent a «$sm_path» a l'índex"
+
+#: builtin/submodule--helper.c:3040
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "«$sm_path» ja existeix i no és un repositori de git vàlid"
+
+#: builtin/submodule--helper.c:3053
+#, fuzzy, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
+
+#: builtin/submodule--helper.c:3060
+#, fuzzy, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct repo\n"
+"or you are unsure what this means choose another name with the '--name' option."
+msgstr ""
+"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
+" $realrepo\n"
+"useu l'opció «--force». Si el directori de git local no és el repositori correcte\n"
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--name»."
+
+#: builtin/submodule--helper.c:3072
+#, fuzzy, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr ""
+"S'està reactivant el directori de git local per al submòdul «$sm_name»."
+
+#: builtin/submodule--helper.c:3109
+#, fuzzy, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
+
+#: builtin/submodule--helper.c:3148
+#, fuzzy, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, fuzzy, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
+
+#: builtin/submodule--helper.c:3221
+#, fuzzy, c-format
+msgid "'%s' already exists in the index"
+msgstr "«$sm_path» ja existeix en l'índex"
+
+#: builtin/submodule--helper.c:3224
+#, fuzzy, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
+
+#: builtin/submodule--helper.c:3253
+#, fuzzy
+msgid "branch of repository to add as submodule"
+msgstr "la branca o entrega a agafar"
+
+#: builtin/submodule--helper.c:3254
+#, fuzzy
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permet afegir fitxers que d'altra manera s'ignoren"
+
+#: builtin/submodule--helper.c:3256
+#, fuzzy
+msgid "print only error messages"
+msgstr "imprimeix només les referències que s'han fusionat"
+
+#: builtin/submodule--helper.c:3260
+#, fuzzy
+msgid "borrow the objects from reference repositories"
+msgstr ""
+"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+
+#: builtin/submodule--helper.c:3262
+#, fuzzy
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"estableix el nom del submòdul a la cadena donada en lloc de per defecte al "
+"seu camí"
+
+#: builtin/submodule--helper.c:3269
+#, fuzzy
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper init [<opcions>] [<camí>]"
+
+#: builtin/submodule--helper.c:3297
+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"
+
+#: builtin/submodule--helper.c:3305
+#, fuzzy, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL de repositori: «$repo» ha de ser absolut o començar amb ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, fuzzy, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "«%s» no és un nom de remot vàlid"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:2799
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» no és una subordre vàlida de submodule--helper"
@@ -23461,11 +24027,11 @@
msgid "shorten ref output"
msgstr "escurça la sortida de referències"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "raó"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "raó de l'actualització"
@@ -23473,7 +24039,7 @@
#, fuzzy
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -23485,13 +24051,10 @@
#: builtin/tag.c:28
#, fuzzy
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
-"[<pattern>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
-"[--points-at <objecte>]\n"
+"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-at <objecte>]\n"
"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
#: builtin/tag.c:30
@@ -23527,14 +24090,12 @@
"\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"
+"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr ""
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
-"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
-"mateix si voleu.\n"
+"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós mateix si voleu.\n"
#: builtin/tag.c:241
msgid "unable to sign the tag"
@@ -23548,138 +24109,138 @@
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-"Heu creat una etiqueta niada. L'objecte al qual fa referència la vostra nova "
-"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte que apunta per "
+"Heu creat una etiqueta niada. L'objecte al qual fa referència la vostra nova"
+" etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte que apunta per "
"utilitzar l'etiqueta git -f%s%s perds^{}"
#: builtin/tag.c:275
msgid "bad object type."
msgstr "el tipus d'objecte és incorrecte."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, 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:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "força l'edició del missatge de l'etiqueta"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "es permet l'opció --no-contains només amb mode llista"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta «%s» actualitzada (era %s)\n"
@@ -23693,226 +24254,222 @@
msgid "failed to create directory %s"
msgstr "s'ha produït un error en crear el directori %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "s'ha produït un error en crear el fitxer %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "s'ha produït un error en suprimir el fitxer %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "s'ha produït un error en suprimir el directori %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "S'està provant mtime en «%s» "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"la informació de stat de directori no canvia després d'afegir un fitxer nou"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"la informació de stat de directori no canvia després d'afegir un directori "
"nou"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"la informació de stat de directori canvia després d'actualitzar un fitxer"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"la informació de stat de directori canvia després d'afegir un fitxer dins "
"d'un subdirectori"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"la informació de stat de directori no canvia després de suprimir un fitxer"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-"la informació de stat de directori no canvia després de suprimir un directori"
+"la informació de stat de directori no canvia després de suprimir un "
+"directori"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a «no canviant»"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "esborra el bit assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a «només índex»"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "esborra el bit skip-worktree"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
#, fuzzy
msgid "do not touch index-only entries"
msgstr "no toquis entrades de només índex"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
"d'objectes"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"elimina els camins anomenats encara que estiguin presents en l'arbre de "
"treball"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
#, fuzzy
msgid "write out the index even if is not flagged as changed"
msgstr "escriu l'índex encara que no estigui marcat com a canviat"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "habilita o inhabilita el monitor del sistema de fitxers"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "marca els fitxers com a vàlids pel fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "esborra el bit de validesa del fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
-"voleu habilitar l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment"
+" voleu habilitar l'índex dividit"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
-"voleu inhabilitar l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment"
+" voleu inhabilitar l'índex dividit"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23920,41 +24477,41 @@
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+"core.untrackedCache is set to false; remove or change it, if you really want"
+" to enable the untracked cache"
msgstr ""
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a «%s»"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
"habilitar fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor habilitat"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
"inhabilitar fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor inhabilitat"
@@ -23965,25 +24522,26 @@
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]"
+"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-"
+"antic>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "suprimeix la referència"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "actualitza <nom de referència>, no la que apunti"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin té arguments acabats amb NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des de stdin"
@@ -23999,20 +24557,21 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "surt immediatament després de l'anunci inicial de referència"
+#: builtin/upload-pack.c:26
+#, fuzzy
+msgid "serve up the info/refs for git-http-backend"
+msgstr "serveix la informació/refs per a git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
@@ -24048,72 +24607,67 @@
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcions>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcions>] <camí>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre de treball> <camí-nou>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opcions>] <arbre de treball>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "s'ha produït un error en suprimir «%s»"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, fuzzy, c-format
msgid "Removing %s/%s: %s"
msgstr "S'està eliminant %s"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "informa dels arbres de treball podats"
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "«%s» ja existeix"
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
#, fuzzy, c-format
msgid "unusable worktree destination '%s'"
msgstr "no s'ha pogut fer «stat» a «%s»"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, fuzzy, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-"«%s» és un arbre de treball que manca però bloquejat; useu «add -f -f» per a "
-"sobreescriure o «unlock» i «prune» o «remove» per a netejar"
+"«%s» és un arbre de treball que manca però bloquejat; useu «add -f -f» per a"
+" sobreescriure o «unlock» i «prune» o «remove» per a netejar"
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
#, fuzzy, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24122,144 +24676,160 @@
"'%s' és un arbre de treball que manca però ja està registrat; useu 'add -f' "
"per sobreescriure o 'prune' o 'remove' per netejar"
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+#, fuzzy
+msgid "initializing"
+msgstr "inicialitzant"
+
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
-#: builtin/worktree.c:424
+#: builtin/worktree.c:423
#, fuzzy, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-"Preparant l'arbre de treball (la branca de reestructuració \"%s\"; estava en "
-"percentatges)"
+"Preparant l'arbre de treball (la branca de reestructuració \"%s\"; estava en"
+" percentatges)"
-#: builtin/worktree.c:433
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
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:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:493 builtin/worktree.c:730
+msgid "reason for locking"
+msgstr "raó per bloquejar"
+
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "configura el mode de seguiment (vegeu git-branch(1))"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
-"remot"
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment"
+" remot"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mútuament excloents"
-#: builtin/worktree.c:565
+#: builtin/worktree.c:509
+#, fuzzy
+msgid "--reason requires --lock"
+msgstr "raó per bloquejar"
+
+#: builtin/worktree.c:513
+#, fuzzy
+msgid "added with --lock"
+msgstr "afegit amb --lock"
+
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track només es pot usar si es crea una branca nova"
-#: builtin/worktree.c:682
+#: builtin/worktree.c:692
+#, fuzzy
msgid "show extended annotations and reasons, if available"
-msgstr ""
+msgstr "mostra les anotacions i raons esteses, si està disponible"
-#: builtin/worktree.c:684
+#: builtin/worktree.c:694
#, fuzzy
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:703
#, fuzzy
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "-p i --overlay són mútuament excloents"
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "raó per bloquejar"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:734 builtin/worktree.c:767
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
-#: builtin/worktree.c:739
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:741
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:769
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
-#: builtin/worktree.c:810
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"els arbres de treball que contenen submòduls no es poden moure ni eliminar"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"força el moviment encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
-#: builtin/worktree.c:846
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
-#: builtin/worktree.c:859
+#: builtin/worktree.c:869
#, fuzzy, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-"no es pot moure un bloqueig de l'arbre de treball bloquejat el raon per cent "
-"utilitza «move -f -f» per substituir o desbloquejar primer"
+"no es pot moure un bloqueig de l'arbre de treball bloquejat el raon per cent"
+" utilitza «move -f -f» per substituir o desbloquejar primer"
-#: builtin/worktree.c:861
+#: builtin/worktree.c:871
#, fuzzy
msgid ""
"cannot move a locked working tree;\n"
@@ -24268,38 +24838,38 @@
"no es pot moure un arbre de treball bloquejat; useu primer «move -f -f» per "
"sobreescriure o desbloquejar"
-#: builtin/worktree.c:864
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
-#: builtin/worktree.c:869
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
-#: builtin/worktree.c:915
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/worktree.c:919
+#: builtin/worktree.c:929
#, fuzzy, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' conté fitxers modificats o no seguits useu --force per suprimir-los"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
-#: builtin/worktree.c:947
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"força l'eliminació encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:970
+#: builtin/worktree.c:980
#, fuzzy, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24308,28 +24878,28 @@
"no s'ha pogut eliminar un bloqueig de l'arbre de treball bloquejat perquè "
"els raonadors utilitzen «remove -f -f» per substituir o desbloquejar primer"
-#: builtin/worktree.c:972
+#: builtin/worktree.c:982
#, fuzzy
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-"no es pot eliminar un arbre de treball bloquejat; useu primer «remove -f -f» "
-"per sobreescriure o desbloquejar"
+"no es pot eliminar un arbre de treball bloquejat; useu primer «remove -f -f»"
+" per sobreescriure o desbloquejar"
-#: builtin/worktree.c:975
+#: builtin/worktree.c:985
#, fuzzy, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
"la validació ha fallat no es poden eliminar els percentatges dels arbres de "
"treball"
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1009
#, fuzzy, c-format
msgid "repair: %s: %s"
msgstr "%s no vàlid: «%s»"
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1012
#, fuzzy, c-format
msgid "error: %s: %s"
msgstr "error en %s %s: %s"
@@ -24355,8 +24925,7 @@
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
@@ -24428,8 +24997,8 @@
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-"àlies «%s» canvia variables d'entorn. Podeu utilitzar «!git» a l'àlies per a "
-"fer-ho"
+"àlies «%s» canvia variables d'entorn. Podeu utilitzar «!git» a l'àlies per a"
+" fer-ho"
#: git.c:391
#, fuzzy, c-format
@@ -24453,17 +25022,17 @@
msgid "close failed on standard output"
msgstr "ha fallat el tancament en la sortida estàndard"
-#: git.c:833
+#: git.c:832
#, fuzzy, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "bucle d'àlies detectat expansió de «%s» no acaba%"
-#: git.c:883
+#: git.c:882
#, fuzzy, c-format
msgid "cannot handle %s as a builtin"
msgstr "no es poden gestionar els percentatges com a integrat"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24472,12 +25041,12 @@
"ús: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, fuzzy, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "ha fallat l'expansió de l'àlies '%s'; '%s' no és una ordre git"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
@@ -24529,156 +25098,132 @@
msgid "exit immediately after advertising capabilities"
msgstr "surt immediatament després d'anunciar les funcionalitats"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, fuzzy, c-format
-msgid "could not start server on: '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
+#: t/helper/test-simple-ipc.c:581
#, fuzzy
-msgid "waitpid failed"
-msgstr "«setsid» ha fallat"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-#, fuzzy
-msgid "daemon failed to start"
-msgstr "s'ha produït un error en fer stat a %s"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
-msgstr ""
+msgstr "test-helper simple-ipc is-active [<name>] [<options>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
+#, fuzzy
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-msgstr ""
+msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
+#, fuzzy
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
+#, fuzzy
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
+#, fuzzy
msgid "test-helper simple-ipc send [<name>] [<token>]"
-msgstr ""
+msgstr "Test-helper simple-ipc envia [<name>] [<token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
+#, fuzzy
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-msgstr ""
+msgstr "Test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
+#, fuzzy
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
+"test-helper simple-ipc múltiple [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
+#, fuzzy
msgid "name or pathname of unix domain socket"
-msgstr ""
+msgstr "nom o nom de camí del sòcol de domini unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
+#, fuzzy
msgid "named-pipe name"
-msgstr ""
+msgstr "nom de pila amb nom"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
+#, fuzzy
msgid "number of threads in server thread pool"
-msgstr ""
+msgstr "nombre de fils en la reserva de fils del servidor"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
+#, fuzzy
msgid "seconds to wait for daemon to start or stop"
-msgstr ""
+msgstr "segons a esperar que el dimoni comenci o atura"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
#, fuzzy
msgid "number of bytes"
msgstr "nombre incorrecte d'arguments"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
#, fuzzy
msgid "number of requests per thread"
msgstr "no s'ha pogut crear fil: %s"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
#, fuzzy
msgid "byte"
msgstr "octets"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
+#, fuzzy
msgid "ballast character"
-msgstr ""
+msgstr "caràcter de llast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
+#, fuzzy
msgid "token"
-msgstr ""
+msgstr "testimoni"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
+#, fuzzy
msgid "command token to send to the server"
-msgstr ""
+msgstr "testimoni d'ordres per enviar al servidor"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+#, fuzzy
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr "No s'admet la fixació de clau pública amb cURL < 7.44.0"
-#: http.c:910
+#: http.c:812
#, fuzzy
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPTNOREVOKE no està suportat amb cURL < 7.44.0"
-#: http.c:989
-#, fuzzy
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, fuzzy, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "El dorsal SSL «%s» no està implementat. Els dorsals SSL compatibles"
-#: http.c:1139
+#: http.c:1023
#, fuzzy, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"No s'ha pogut establir el dorsal SSL a «%s» s'ha construït cURL sense "
"dorsals SSL"
-#: http.c:1143
+#: http.c:1027
#, fuzzy, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No s'ha pogut establir el dorsal SSL a «%s» ja establert"
-#: http.c:2035
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24694,145 +25239,149 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "cita no vàlida en el valor de l'opció d'empenta «%s»"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, fuzzy, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "oversinfo/refs no és vàlid és un repositori git?"
-#: remote-curl.c:408
+#: remote-curl.c:405
#, fuzzy
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"la resposta del servidor no és vàlida; el servei esperat ha rebut el paquet "
"de neteja"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, fuzzy, c-format
msgid "invalid server response; got '%s'"
msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "no s'ha trobat el repositori «%s»"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "S'ha produït un error en autenticar per «%s»"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format, fuzzy
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "no es pot accedir a '%s' amb la configuració de http.pinnedPubkey:%s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "no s'ha pogut accedir a «%s»: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
-#: remote-curl.c:642
+#: remote-curl.c:645
#, fuzzy
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "No hauria de tenir EOF quan no sigui suau al EOF"
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "el servidor remot ha enviat un separador sense estat"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remot ha enviat un paquet de final de resposta inesperat"
-#: remote-curl.c:724
+#: remote-curl.c:726
#, fuzzy
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"no s'han pogut rebobinar les dades de publicació rpc - proveu d'augmentar "
"http.postBuffer"
-#: remote-curl.c:754
+#: remote-curl.c:755
#, fuzzy, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: remote-curl.c:756
-#, fuzzy
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
-msgstr "paquet final de resposta inesperat del remot"
+msgstr "remote-curl: paquet final de resposta inesperat"
-#: remote-curl.c:832
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC ha fallat; %s"
-#: remote-curl.c:872
+#: remote-curl.c:873
#, fuzzy
msgid "cannot handle pushes this big"
msgstr "no es pot gestionar empènyer aquest gran"
-#: remote-curl.c:987
+#: remote-curl.c:986
#, fuzzy, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "no es pot desinflar la sol·licitud; zlib deflate error%d"
-#: remote-curl.c:991
+#: remote-curl.c:990
#, fuzzy, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "no es pot desinflar la sol·licitud; error final zlib percentatged"
-#: remote-curl.c:1041
+#: remote-curl.c:1040
#, fuzzy, c-format
msgid "%d bytes of length header were received"
msgstr "s'han rebut bytes percentuals de la capçalera de longitud"
-#: remote-curl.c:1043
+#: remote-curl.c:1042
#, fuzzy, c-format
msgid "%d bytes of body are still expected"
msgstr "encara s'esperen bytes de cos per cent"
-#: remote-curl.c:1132
+#: remote-curl.c:1131
#, fuzzy
msgid "dumb http transport does not support shallow capabilities"
msgstr "el transport ximple http no admet capacitats superficials"
-#: remote-curl.c:1147
+#: remote-curl.c:1146
#, fuzzy
msgid "fetch failed."
msgstr "el fetch ha fallat."
-#: remote-curl.c:1193
+#: remote-curl.c:1192
#, fuzzy
msgid "cannot fetch by sha1 over smart http"
msgstr "no s’ha pogut obtenir per la sha1 a través de l’intel·ligent http"
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
#, fuzzy, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "error de protocol esperat sha/ref s'ha obtingut «%s»"
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
#, fuzzy, c-format
msgid "http transport does not support %s"
msgstr "El transport http no dóna suport als percentatges"
-#: remote-curl.c:1291
+#: remote-curl.c:1290
#, fuzzy
msgid "git-http-push failed"
msgstr "git-http-push ha fallat"
-#: remote-curl.c:1479
+#: remote-curl.c:1478
#, fuzzy
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "ús remot de curl git remote-curl <remote> [<url>]"
-#: remote-curl.c:1511
+#: remote-curl.c:1510
#, fuzzy
msgid "remote-curl: error reading command stream from git"
msgstr "error remot en llegir el flux d'ordres des de git"
-#: remote-curl.c:1518
+#: remote-curl.c:1517
#, fuzzy
msgid "remote-curl: fetch attempted without a local repo"
msgstr "s'ha intentat recuperar el valor remot sense un repositori local"
-#: remote-curl.c:1559
+#: remote-curl.c:1558
#, fuzzy, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "comandament desconegut «%s» del git"
@@ -24855,49 +25404,50 @@
msgid "object filtering"
msgstr "filtratge d'objecte"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "data-de-caducitat"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:310
+#: parse-options.h:309
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:312
+#: parse-options.h:311
msgid "be more quiet"
msgstr "sigues més discret"
-#: parse-options.h:318
+#: parse-options.h:317
#, fuzzy
msgid "use <n> digits to display object names"
msgstr "usa <n> xifres per presentar els SHA-1"
-#: parse-options.h:337
+#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
-#: parse-options.h:338
+#: parse-options.h:337
#, fuzzy
msgid "read pathspec from file"
msgstr "llegeix l'especificació del camí del fitxer"
-#: parse-options.h:339
+#: parse-options.h:338
#, fuzzy
msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
+"with --pathspec-from-file, pathspec elements are separated with NUL "
+"character"
msgstr ""
"amb --pathspec-from-file els elements d'especificació del camí estan "
"separats amb caràcter NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "clau"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
@@ -24957,7 +25507,8 @@
#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
-"Proveeix contingut o informació del tipus i mida per als objectes del repositori"
+"Proveeix contingut o informació del tipus i mida per als objectes del "
+"repositori"
#: command-list.h:62
msgid "Display gitattributes information"
@@ -25173,7 +25724,8 @@
#, fuzzy
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-"Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta IMAP"
+"Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta "
+"IMAP"
#: command-list.h:112
#, fuzzy
@@ -25338,8 +25890,7 @@
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-"Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
+msgstr "Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
#: command-list.h:148
msgid "Reads tree information into the index"
@@ -25499,12 +26050,14 @@
#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
-"Actualitza el nom de l'objecte emmagatzemat en una referència de forma segura"
+"Actualitza el nom de l'objecte emmagatzemat en una referència de forma "
+"segura"
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-"Actualitza el fitxer d'informació auxiliar per a ajudar als servidors ximples"
+"Actualitza el fitxer d'informació auxiliar per a ajudar als servidors "
+"ximples"
#: command-list.h:188
msgid "Send archive back to git-archive"
@@ -25591,8 +26144,9 @@
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
#: command-list.h:209
+#, fuzzy
msgid "Map author/committer names and/or E-Mail addresses"
-msgstr ""
+msgstr "Assigna noms d'autor/comitè i/o adreces de correu electrònic"
#: command-list.h:210
msgid "Defining submodule properties"
@@ -25630,48 +26184,13 @@
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "s'està executant $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"el codi de sortida $res de «$command» és < 0 o bé >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "el pas de bisecció no pot continuar més"
-
-#: git-bisect.sh:111
-#, fuzzy, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"«bisect_state $state» ha sortit amb el codi d'error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "pas de bisecció reeixit"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per"
+" fusionar"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
@@ -25706,98 +26225,18 @@
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-submodule.sh:179
-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:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL de repositori: «$repo» ha de ser absolut o començar amb ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "«$sm_path» ja existeix en l'índex"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "«$sm_path» no té una comissió agafada"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "S'està afegint el repositori existent a «$sm_path» a l'índex"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "«$sm_path» ja existeix i no és un repositori de git vàlid"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
-" $realrepo\n"
-"useu l'opció «--force». Si el directori de git local no és el repositori "
-"correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--"
-"name»."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-"S'està reactivant el directori de git local per al submòdul «$sm_name»."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
#, 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:578
+#: git-submodule.sh:411
#, 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:583
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25806,406 +26245,13 @@
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul «$sm_path»"
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
-"intentant obtenir directament $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. "
-"L'obtenció directa d'aquella comissió ha fallat."
-
-#: git-submodule.sh:614
-#, 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:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
-
-#: git-submodule.sh:625
-#, 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:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"L'execució de «$command $sha1» ha fallat en el camí de submòdul "
-"«$displaypath»"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"S'ha produït un error en recórrer recursivament dins del camí de submòdul "
"«$displaypath»"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "S'ha aplicat l'«autostash»."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No es pot emmagatzemar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
-"Els vostres canvis estan segurs en el «stash».\n"
-"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "S'està fent «rebase» ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Ordres:\n"
-" p, pick <comissió> = usa la comissió\n"
-" r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
-" e, edit <comissió> = usa la comissió, però atura't per a esmenar\n"
-" s, squash <comissió> = usa la comissió, però fusiona-la a la comissió "
-"prèvia\n"
-" f, fixup <comissió> = com a «squash», però descarta el missatge de registre "
-"d'aquesta comissió\n"
-"x, exec <comissió> = executa l'ordre (la resta de la línia) usant "
-"l'intèrpret d'ordres\n"
-"d, drop <comissió> = elimina la comissió\n"
-"l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
-"t, reset <etiqueta> = reinicia HEAD a una etiqueta \n"
-"m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
-". crea una comissió de fusió usant el missatge de la comissió\n"
-". de fusió original (o línia única, si no hi ha cap comissió de fusió "
-"original\n"
-". especificada). Useu -c <comissió> per a reescriure el missatge de "
-"publicació.\n"
-"\n"
-"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podeu esmenar la comissió ara, amb\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no és una comissió que es pugui triar"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de comissió no vàlid: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avanç ràpid a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No es pot avançar ràpidament a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No es pot moure HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error en refer la fusió $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No s'ha pogut triar $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Aquest és el missatge de comissió núm. ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Això és una combinació d'$count comissió."
-msgstr[1] "Això és una combinació de $count comissions."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No es pot escriure $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Això és una combinació de 2 comissions."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No s'ha pogut aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"No s'ha pogut esmenar la comissió després de triar correctament $sha1... "
-"$rest\n"
-"Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
-"precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
-"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
-"comissió."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "S'ha aturat a $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "S'està executant: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'execució ha fallat: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Podeu arreglar el problema, i llavors executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"L'execució ha tingut èxit: $rest\n"
-"però ha deixat canvis a l'índex o l'arbre de treball\n"
-"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Ordre desconeguda: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Teniu canvis «stage» en el vostre arbre de treball.\n"
-"Si aquests canvis són per fer «squash»\n"
-"a la comissió prèvia, executeu:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si són per a formar una comissió nova, executeu:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"En ambdós casos, quan hàgiu terminat, continueu amb:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
-"la comissió"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Teniu canvis no comesos en el vostre arbre de treball. \n"
-"Primer cometeu-los i després executeu «git rebase --continue» de nou."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No s'han pogut cometre els canvis «staged»."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No s'ha pogut executar l'editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No s'ha pogut agafar $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "No hi ha cap HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No s'ha pogut crear el $state_dir temporal"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No s'ha pogut marcar com a interactiu"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tingueu en compte que les comissions buides estan comentades"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No s'han pogut iniciar les comissions reescrites"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -26224,46 +26270,29 @@
msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No es pot $action: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "No s'ha pogut determinar el camí absolut del directori de git"
@@ -26569,17 +26598,14 @@
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
+"add untracked - add contents of untracked files to the staged set of changes\n"
msgstr ""
"status - mostra els camins amb canvis\n"
-"update - afegeix l'estat de l'arbre de treball al conjunt de canvis "
-"«staged»\n"
+"update - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
"patch - selecciona trossos i actualitza'ls selectivament\n"
"diff - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
-"canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
@@ -26598,39 +26624,38 @@
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
-#: git-send-email.perl:138
+#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
-#: git-send-email.perl:222
-#, perl-format
+#: git-send-email.perl:214
+#, fuzzy, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d"
-#: git-send-email.perl:235
+#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:321
+#: git-send-email.perl:316
#, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
+msgid "'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:321
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» conté el correu redactat.\n"
-#: git-send-email.perl:419
+#: git-send-email.perl:450
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:493
+#: git-send-email.perl:525
#, fuzzy
msgid ""
"fatal: found configuration options for 'sendmail'\n"
@@ -26638,14 +26663,15 @@
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
"fatal s'han trobat les opcions de configuració per a git-send-email es "
-"configura amb les opcions sendemail.* -noteu la 'e'. Establiu sendemail."
-"forbidSendmailVariables a false per desactivar aquesta comprovació."
+"configura amb les opcions sendemail.* -noteu la 'e'. Establiu "
+"sendemail.forbidSendmailVariables a false per desactivar aquesta "
+"comprovació."
-#: git-send-email.perl:498 git-send-email.perl:700
+#: git-send-email.perl:530 git-send-email.perl:746
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del repositori\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:533
#, fuzzy
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
@@ -26654,37 +26680,37 @@
"`batch-size` i `relogin` s'han d'especificar junts (a través de la línia "
"d'ordres o l'opció de configuració)"
-#: git-send-email.perl:514
+#: git-send-email.perl:546
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:545
+#: git-send-email.perl:577
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paràmetre --confirm desconegut: «%s»\n"
-#: git-send-email.perl:573
+#: git-send-email.perl:617
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: no s'admet l'àlies de sendmail amb cometes: %s\n"
-#: git-send-email.perl:575
+#: git-send-email.perl:619
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: «:include:» no s'admet: %s\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:621
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions «/file» ni «|pipe» no s'admeten: %s\n"
-#: git-send-email.perl:582
+#: git-send-email.perl:626
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
-#: git-send-email.perl:666
+#: git-send-email.perl:711
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26699,12 +26725,12 @@
" * Dient «./%s» si volíeu especificar un fitxer; o\n"
" * Proporcionant l'opció «--format-patch» si volíeu especificar un rang.\n"
-#: git-send-email.perl:687
+#: git-send-email.perl:732
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error en obrir el directori %s: %s"
-#: git-send-email.perl:720
+#: git-send-email.perl:767
msgid ""
"\n"
"No patch files specified!\n"
@@ -26714,17 +26740,17 @@
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:733
+#: git-send-email.perl:780
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:743
+#: git-send-email.perl:791
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "S'ha produït un error en obrir per escriptura %s: %s"
-#: git-send-email.perl:754
+#: git-send-email.perl:802
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26738,27 +26764,27 @@
"\n"
"Esborreu el contingut del cos si no voleu enviar cap resum.\n"
-#: git-send-email.perl:778
+#: git-send-email.perl:826
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:795
+#: git-send-email.perl:843
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "S'ha produït un error en obrir %s.final: %s"
-#: git-send-email.perl:838
+#: git-send-email.perl:886
msgid "Summary email is empty, skipping it\n"
msgstr "El correu electrònic de resum està buit, s'omet\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:873
+#: git-send-email.perl:935
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esteu segur que voleu usar <%s> [y/N]? "
-#: git-send-email.perl:928
+#: git-send-email.perl:990
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26766,40 +26792,38 @@
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:933
+#: git-send-email.perl:995
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:941
+#: git-send-email.perl:1003
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
msgstr ""
"S'ha refusat a enviar perquè el pedaç\n"
"\t%s\n"
-"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si "
-"realment voleu enviar-ho.\n"
+"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si realment voleu enviar-ho.\n"
-#: git-send-email.perl:960
+#: git-send-email.perl:1022
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
-#: git-send-email.perl:978
+#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:990
+#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
"cap)? "
-#: git-send-email.perl:1048 git-send-email.perl:1056
+#: git-send-email.perl:1114 git-send-email.perl:1122
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
@@ -26807,16 +26831,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1060
+#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1377
+#: git-send-email.perl:1446
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA «%s» no existeix"
-#: git-send-email.perl:1460
+#: git-send-email.perl:1529
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26843,115 +26867,115 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1475
+#: git-send-email.perl:1544
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
-#: git-send-email.perl:1478
+#: git-send-email.perl:1547
msgid "Send this email reply required"
msgstr "Requereix resposta en enviar el correu"
-#: git-send-email.perl:1506
+#: git-send-email.perl:1581
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1553
+#: git-send-email.perl:1628
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1633 git-send-email.perl:1637
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS ha fallat! %s"
-#: git-send-email.perl:1571
+#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
-"useu --smtp-debug."
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i"
+" useu --smtp-debug."
-#: git-send-email.perl:1589
+#: git-send-email.perl:1664
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1606
+#: git-send-email.perl:1688
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1609
+#: git-send-email.perl:1691
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1627
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: git-send-email.perl:1756 git-send-email.perl:1776
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1680
+#: git-send-email.perl:1762
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
-#: git-send-email.perl:1737
+#: git-send-email.perl:1819
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1772
+#: git-send-email.perl:1854
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1883
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1890
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
-#: git-send-email.perl:1894
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
-#: git-send-email.perl:1924
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1932
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "codificació de transferència no vàlida"
-#: git-send-email.perl:1966
+#: git-send-email.perl:2059
#, fuzzy, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26961,12 +26985,12 @@
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1979
+#: git-send-email.perl:2072
#, fuzzy, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26975,15 +26999,598 @@
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:1997
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+#, fuzzy, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Les següents especificacions de camí no coincideixen amb cap camí elegible, però sí que tenen índex de coincidències\n"
+#~ "entrades fora de l'actual pagament dispers:"
+#, fuzzy
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Desactiva o modifica les regles d'esparsitat si teniu la intenció "
+#~ "d'actualitzar aquestes entrades."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "no s'ha pogut establir GIT_DIR a «%s»"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "s'ha produït un error en obrir /dev/null"
+
+#~ 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 ""
+#~ "després de resoldre els conflictes, marqueu els camins\n"
+#~ "corregits amb «git add <camins>» o «git rm <camins>»\n"
+#~ "i cometeu el resultat amb «git commit»"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "s'ha produït un error en obrir /dev/null o dup"
+
+#, fuzzy
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "s'està intentant utilitzar l'índex de dispersió sense el mode de con"
+
+#, fuzzy
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "no s'ha pogut actualitzar l'arbre cau"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "No s'ha pogut obrir «%s» per a escriptura."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
+
+#~ msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+
+#, fuzzy
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check requereix 2 o 3 arguments"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "no s'ha pogut crear el fitxer nou a «%s»"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: ha fallat en obrir «%s»"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "no es pot obrir el fitxer de paquet «%s»"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "no es pot emmagatzemar el fitxer empaquetat"
+
+#~ msgid "cannot store index file"
+#~ msgstr "no es pot emmagatzemar el fitxer d'índex"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Opció desconeguda de merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "llista per a fer inestable: «%s»"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opcions>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "fes «rebase» de les comissions de fusió"
+
+#, fuzzy
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "mantén els punts de branca originals dels cosins"
+
+#, fuzzy
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "mou les comissions que comencen amb squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "signa les comissions"
+
+#~ msgid "continue rebase"
+#~ msgstr "continua el «rebase»"
+
+#~ msgid "skip commit"
+#~ msgstr "omet la comissió"
+
+#~ msgid "edit the todo list"
+#~ msgstr "edita la llista a fer"
+
+#~ msgid "show the current patch"
+#~ msgstr "mostra el pedaç actual"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "escurça els ids de les comissions en la llista per a fer"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "expandeix els ids de les comissions en la llista per a fer"
+
+#~ msgid "check the todo list"
+#~ msgstr "comprova la llista a fer"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "reorganitza les línies «fixup/pick»"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "expandeix les ordres exec en la llista per a fer"
+
+#, fuzzy
+#~ msgid "onto"
+#~ msgstr "sobre"
+
+#, fuzzy
+#~ msgid "restrict-revision"
+#~ msgstr "revisió restringida"
+
+#, fuzzy
+#~ msgid "restrict revision"
+#~ msgstr "restringeix la revisió"
+
+#, fuzzy
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#, fuzzy
+#~ msgid "squash onto"
+#~ msgstr "carabassa a"
+
+#, fuzzy
+#~ msgid "the upstream commit"
+#~ msgstr "la comissió principal"
+
+#, fuzzy
+#~ msgid "head-name"
+#~ msgstr "nom-cap"
+
+#, fuzzy
+#~ msgid "head name"
+#~ msgstr "nom del cap"
+
+#, fuzzy
+#~ msgid "rebase strategy"
+#~ msgstr "estratègia de rebase"
+
+#, fuzzy
+#~ msgid "strategy-opts"
+#~ msgstr "opcions estratègiques"
+
+#, fuzzy
+#~ msgid "strategy options"
+#~ msgstr "opcions d'estratègia"
+
+#, fuzzy
+#~ msgid "switch-to"
+#~ msgstr "canvia a"
+
+#, fuzzy
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "la branca o entrega a agafar"
+
+#, fuzzy
+#~ msgid "onto-name"
+#~ msgstr "ont-name"
+
+#, fuzzy
+#~ msgid "onto name"
+#~ msgstr "al nom"
+
+#, fuzzy
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "l'ordre a executar"
+
+#, fuzzy
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "error: no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
+
+#, fuzzy
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr "git submodule--helper init [<opcions>] [<camí>]"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "s'ha produït un error en crear el fitxer %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "surt immediatament després de l'anunci inicial de referència"
+
+#, fuzzy, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "el sòcol/pipe ja s'està utilitzant: «%s»"
+
+#, fuzzy, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
+
+#, fuzzy
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "no s'ha pogut crear el dimoni en segon pla"
+
+#, fuzzy
+#~ msgid "waitpid failed"
+#~ msgstr "«setsid» ha fallat"
+
+#, fuzzy
+#~ msgid "daemon not online yet"
+#~ msgstr "El dimoni encara no està en línia"
+
+#, fuzzy
+#~ msgid "daemon failed to start"
+#~ msgstr "s'ha produït un error en fer stat a %s"
+
+#, fuzzy
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid està confós"
+
+#, fuzzy
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "El dimoni encara no s'ha apagat"
+
+#, fuzzy
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "s'està executant $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "«$sm_path» no té una comissió agafada"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
+
+#~ msgid "Applied autostash."
+#~ msgstr "S'ha aplicat l'«autostash»."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "No es pot emmagatzemar $stash_sha1"
+
+#~ 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 ""
+#~ "L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
+#~ "Els vostres canvis estan segurs en el «stash».\n"
+#~ "Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "S'està fent «rebase» ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ordres:\n"
+#~ " p, pick <comissió> = usa la comissió\n"
+#~ " r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
+#~ " e, edit <comissió> = usa la comissió, però atura't per a esmenar\n"
+#~ " s, squash <comissió> = usa la comissió, però fusiona-la a la comissió prèvia\n"
+#~ " f, fixup <comissió> = com a «squash», però descarta el missatge de registre d'aquesta comissió\n"
+#~ "x, exec <comissió> = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
+#~ "d, drop <comissió> = elimina la comissió\n"
+#~ "l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
+#~ "t, reset <etiqueta> = reinicia HEAD a una etiqueta \n"
+#~ "m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
+#~ ". crea una comissió de fusió usant el missatge de la comissió\n"
+#~ ". de fusió original (o línia única, si no hi ha cap comissió de fusió original\n"
+#~ ". especificada). Useu -c <comissió> per a reescriure el missatge de publicació.\n"
+#~ "\n"
+#~ "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Podeu esmenar la comissió ara, amb\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: no és una comissió que es pugui triar"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nom de comissió no vàlid: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Avanç ràpid a $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "No es pot avançar ràpidament a $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "No es pot moure HEAD a $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "S'està refusant fer «squash» a una fusió: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Error en refer la fusió $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "No s'ha pogut triar $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Aquest és el missatge de comissió núm. ${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "El missatge de comissió núm. ${n} s'ometrà:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Això és una combinació d'$count comissió."
+#~ msgstr[1] "Això és una combinació de $count comissions."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "No es pot escriure $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Això és una combinació de 2 comissions."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "No s'ha pogut aplicar $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "No s'ha pogut esmenar la comissió després de triar correctament $sha1... $rest\n"
+#~ "Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
+#~ "precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
+#~ "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
+#~ "comissió."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "S'ha aturat a $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "S'està executant: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "L'execució ha fallat: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "i ha fet canvis a l'índex o l'arbre de treball"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Podeu arreglar el problema, i llavors executeu\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "L'execució ha tingut èxit: $rest\n"
+#~ "però ha deixat canvis a l'índex o l'arbre de treball\n"
+#~ "Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Ordre desconeguda: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Corregiu-ho usant «git rebase --edit-todo»."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Teniu canvis «stage» en el vostre arbre de treball.\n"
+#~ "Si aquests canvis són per fer «squash»\n"
+#~ "a la comissió prèvia, executeu:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Si són per a formar una comissió nova, executeu:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "En ambdós casos, quan hàgiu terminat, continueu amb:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
+#~ "la comissió"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Teniu canvis no comesos en el vostre arbre de treball. \n"
+#~ "Primer cometeu-los i després executeu «git rebase --continue» de nou."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "No s'han pogut cometre els canvis «staged»."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "No s'ha pogut executar l'editor"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "No s'ha pogut agafar $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "No hi ha cap HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "No s'ha pogut crear el $state_dir temporal"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "No s'ha pogut marcar com a interactiu"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)"
+#~ msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Tingueu en compte que les comissions buides estan comentades"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "No s'han pogut iniciar les comissions reescrites"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "no s'ha pogut escriure el paquet de separació sense estat"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
+
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "el servidor remot ha enviat un separador sense estat"
diff --git a/po/de.po b/po/de.po
index cad96a0..f00c21d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-05-23 18:32+0200\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-07 19:48+0100\n"
"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
@@ -19,213 +19,213 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: Poedit 2.4.3\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "Index konnte nicht gelesen werden"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "Binär"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "Nichts"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "unverändert"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualisieren"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "Konnte '%s' nicht zum Commit vormerken."
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "konnte Index nicht schreiben"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d Pfad aktualisiert\n"
msgstr[1] "%d Pfade aktualisiert\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revert"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Konnte HEAD^{tree} nicht parsen."
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d Pfad wiederhergestellt\n"
msgstr[1] "%d Pfade wiederhergestellt\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Unversionierte Dateien hinzufügen"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d Pfad hinzugefügt\n"
msgstr[1] "%d Pfade hinzugefügt\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "Ignoriere nicht zusammengeführte Datei: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Diff überprüfen"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "Zeige Pfade mit Änderungen"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "Blöcke und Änderung gezielt auswählen"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "Differenz zwischen HEAD und Index ansehen"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Hilfe für Eingaben:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "Ein einzelnes Element auswählen"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "Eine Reihe von Elementen auswählen"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "Mehrere Reihen auswählen"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "Element basierend auf eindeutigen Präfix auswählen"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "Angegebene Elemente abwählen"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "Alle Elemente auswählen"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(leer) Auswählen beenden"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "Ein nummeriertes Element auswählen"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(leer) nichts auswählen"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Was nun"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "Pfad"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "Index konnte nicht aktualisiert werden"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
@@ -762,7 +762,7 @@
msgid "'git apply' failed"
msgstr "'git apply' schlug fehl"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -771,43 +771,43 @@
"\n"
"Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
"haben."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:270
+#: advice.c:196
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."
@@ -816,40 +816,49 @@
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Vorspulen nicht möglich, breche ab."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Die folgenden Pfadspezifikationen entsprachen keinem geeigneten Pfad, aber\n"
-"entsprechen Index-Einträgen außerhalb des aktuellen partiellen Checkouts:\n"
+"Die folgenden Pfade und/oder Pfadspezifikationen entsprachen keinem Pfad,\n"
+"der außerhalb Ihrer partiellen Checkout-Definition existierte, weshalb\n"
+"diese nicht im Index aktualisiert werden:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Deaktivieren oder verändern Sie die Regeln für partielle Checkouts, wenn Sie "
-"solche Einträge aktualisieren möchten."
+"Wenn Sie beabsichtigen, solche Einträge zu aktualisieren, versuchen Sie es\n"
+"mit einem der folgenden Schritte:\n"
+"* Verwenden Sie die Option --sparse.\n"
+"* Deaktivieren oder ändern Sie die Regeln für partielle Checkouts."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1035,37 +1044,37 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1073,12 +1082,12 @@
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: apply.c:3068
+#: apply.c:3069
#, 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"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1087,25 +1096,25 @@
"bei der Suche nach:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
"umgekehrten Patch-Block auf '%s'"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1113,433 +1122,434 @@
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
"entspricht"
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: apply.c:3208
+#: apply.c:3209
#, 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)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"Dem Repository fehlt der notwendige Blob, um einen 3-Wege-Merge "
"durchzuführen."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Führe 3-Wege-Merge durch...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Fehler beim Durchführen des 3-Wege-Merges...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Ausweichen auf direkte Anwendung...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3976
+#: apply.c:3998
#, 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)"
-#: apply.c:3981
+#: apply.c:4003
#, 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"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
-msgstr "Prüfe Patch %s ..."
+msgstr "Prüfe Patch %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4327
+#: apply.c:4349
#, 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"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4559
+#: apply.c:4581
#, 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..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4937
+#: apply.c:4959
#, 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"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "Anzahl"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"versuche 3-Wege-Merge, weiche auf normalen Patch aus, wenn dies fehlschlägt"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "Aktion"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
@@ -1611,153 +1621,152 @@
msgid "cannot read %s"
msgstr "Kann %s nicht lesen."
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "Referenz nicht gefunden: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "Kein gültiger Objektname: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "Kein Tree-Objekt: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Datei nicht gefunden: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Keine reguläre Datei: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "Format"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "Präfix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "Datei"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "unversionierte Datei zum Archiv hinzufügen"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "Komprimierungsgrad setzen"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "Repository"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "Programm"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr ""
"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s ist kein gültiger Attributname"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s nicht erlaubt: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1765,22 +1774,22 @@
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1789,7 +1798,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1798,7 +1807,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1807,7 +1816,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1818,7 +1827,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1830,36 +1839,36 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1868,7 +1877,7 @@
"Kein testbarer Commit gefunden.\n"
"Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1878,7 +1887,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1901,11 +1910,12 @@
"endgültigen\n"
"Commits"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -2088,8 +2098,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -2147,7 +2157,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
@@ -2189,7 +2199,7 @@
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "ungültige Hash-Version"
@@ -2234,190 +2244,190 @@
msgid "unable to find all commit-graph files"
msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "Konnte Commit %s nicht finden."
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Lade bekannte Commits in Commit-Graph"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Erweitere erreichbare Commits in Commit-Graph"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Lösche Commit-Markierungen in Commit-Graph"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Commit-Graph Generationsnummern berechnen"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Sammle referenzierte Commits"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "Fehler beim Hinzufügen von Paket %s."
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "Fehler beim Öffnen des Index für %s."
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Suche zusätzliche Ränder in Commit-Graph"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Durchsuche zusammengeführte Commits"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Zusammenführen von Commit-Graph"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist "
"deaktiviert"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "zu viele Commits zum Schreiben des Graphen"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
"beschädigt"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "konnte Commit %s von Commit-Graph nicht parsen"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Commit in Commit-Graph überprüfen"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2425,7 +2435,7 @@
"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
"null"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2433,29 +2443,29 @@
"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
"null"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2476,28 +2486,28 @@
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
-#: commit.c:1237
+#: commit.c:1239
#, 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."
-#: commit.c:1241
+#: commit.c:1243
#, 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."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: commit.c:1247
+#: commit.c:1249
#, 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"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2513,7 +2523,7 @@
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2529,38 +2539,38 @@
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
"müssen\n"
"aus Dateien kommen."
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "ungültiges Konfigurationsformat: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
@@ -2570,309 +2580,309 @@
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "leerer Konfigurationsschlüssel"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "falsche Zählung in %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "zu viele Einträge in %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "fehlender Konfigurationsschlüssel %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "fehlender Konfigurationswert %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
"%s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
"%s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
"%s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "Ungültiger Wert für %s."
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
"liegen."
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "mmap für '%s'(%s) fehlgeschlagen"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
@@ -2908,74 +2918,74 @@
msgid "expected flush after capabilities"
msgstr "Erwartete Flush nach Fähigkeiten."
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "Protokollfehler: unerwartetes capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr ""
"Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
"enthalten"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "ungültiges Paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "Protokollfehler: unerwartetes '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ungültige ls-refs Antwort: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "Flush nach Auflistung der Referenzen erwartet"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "Protokoll '%s' wird nicht unterstützt"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Suche nach %s ..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "Fehler bei Suche nach %s (Port %s) (%s)."
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2984,7 +2994,7 @@
"Fertig.\n"
"Verbinde nach %s (Port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2994,77 +3004,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "Fertig."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "Fehler bei der Suche nach %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "Unbekannter Port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "Merkwürdigen Hostnamen '%s' blockiert."
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "Merkwürdigen Port '%s' blockiert."
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "Kann Proxy %s nicht starten."
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "SSH-Variante 'simple' unterstützt kein -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "SSH-Variante 'simple' unterstützt kein -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "kann Prozess nicht starten"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
@@ -3211,17 +3221,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "URL hat kein Schema: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
@@ -3326,23 +3336,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "unbekannter Wert für --diff-merges: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base funktioniert nicht mit Bereichen"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base funktioniert nur mit Commits"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "konnte HEAD nicht bekommen"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "keine Merge-Basis gefunden"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "mehrere Merge-Basen gefunden"
@@ -3358,18 +3368,18 @@
"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
"Arbeitsverzeichnisses zu vergleichen."
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3377,7 +3387,7 @@
"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3386,7 +3396,7 @@
"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3394,12 +3404,12 @@
"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
"Whitespace-Modi kombiniert werden."
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3408,28 +3418,28 @@
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G und --pickaxe-regex schließen sich gegenseitig aus. Benutzen Sie\n"
"--pickaxe-regex mit -S."
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3437,22 +3447,22 @@
"--pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n"
"Sie --pickaxe-all mit -G und -S."
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "Ungültiger --stat Wert: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s erwartet einen numerischen Wert."
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3461,42 +3471,42 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s erwartet die Form <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s erwartet ein Zeichen, '%s' bekommen"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "ungültiges --color-moved Argument: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ungültiger Modus '%s' in --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3504,157 +3514,157 @@
"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "ungültiges Argument für %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "ungültiges --word-diff Argument: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Diff-Optionen zu Ausgabeformaten"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "Patch erzeugen"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "Unterschiede im Rohformat erstellen"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "Synonym für '-p --raw'"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "Synonym für '-p --stat'"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "maschinenlesbare Ausgabe von --stat"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "nur die letzte Zeile von --stat ausgeben"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<Parameter1,Parameter2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"die Verteilung des relativen Umfangs der Änderungen für jedes "
"Unterverzeichnis ausgeben"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "Synonym für --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
"Änderungen der Datei-Rechte"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "nur Dateinamen der geänderten Dateien anzeigen"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<Breite>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<Anzahl>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "farbige Unterschiede anzeigen"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<Art>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3662,7 +3672,7 @@
"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
"Unterschieden hervorheben"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3670,91 +3680,91 @@
"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
"Ausgabefeldern bei --raw oder --numstat nutzen"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<Präfix>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen "
"anzeigen"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<Zeichen>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Diff-Optionen zur Umbenennung"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
"\"erstellen\""
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "Umbenennungen erkennen"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "Preimage für Löschungen weglassen"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "Kopien erkennen"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "Erkennung von Umbenennungen deaktivieren"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3762,164 +3772,164 @@
"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
"für Umbenennungen und Kopien das gegebene Limit überschreitet"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Diff Algorithmus-Optionen"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "die kleinstmöglichen Änderungen erzeugen"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "Änderungen in leeren Zeilen ignorieren"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<Regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr ""
"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
"verschieben"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<Algorithmus>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "einen Algorithmus für Änderungen wählen"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<Text>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<Modus>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "verschobene Codezeilen sind andersfarbig"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "wie Whitespaces in --color-moved ignoriert werden"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Andere Diff-Optionen"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
"zeige relative Pfade an"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "alle Dateien als Text behandeln"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "alle Ausgaben vom Programm deaktivieren"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
"werden"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<wann>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<Format>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "'git add -N' Einträge vom Index verstecken"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "'git add -N' Einträge im Index als echt behandeln"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<Zeichenkette>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3927,7 +3937,7 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
"Zeichenkette verändern"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3935,37 +3945,37 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"regulären Ausdrucks verändern"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr ""
"die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<Pfad>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<Objekt-ID>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3973,33 +3983,33 @@
"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"Objektes verändern"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "Dateien anhand der Art der Änderung wählen"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<Datei>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Ausgabe zu einer bestimmten Datei"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"genaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4012,7 +4022,7 @@
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
@@ -4052,341 +4062,422 @@
msgid "cannot use %s as an exclude file"
msgstr "kann %s nicht als exclude-Filter benutzen"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "konnte Verzeichnis '%s' nicht öffnen"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr ""
"Cache für unversionierte Dateien ist auf diesem System oder\n"
"für dieses Verzeichnis deaktiviert"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Konnte keinen Verzeichnisnamen erraten.\n"
+"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "Index-Datei in Repository %s beschädigt"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtere Inhalt"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "konnte Datei '%s' nicht lesen"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ungültiger Git-Namespace-Pfad \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "konnte GIT_DIR nicht zu '%s' setzen"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "zu viele Argumente angegeben, um %s auszuführen"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "konnte nicht zum Remote schreiben"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "ungültige shallow-Zeile: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "ungültiger Commit %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "gebe auf"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "fertig"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: ungültige index-pack Ausgabe"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Server unterstützt %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow), Klonen "
"zurückgewiesen."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "der Server unterstützt Algorithmus '%s' nicht"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Server unterstützt keine shallow-Anfragen"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Server unterstützt Filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "konnte Anfrage nicht zum Remote schreiben"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "Erwartete Versand einer Packdatei nach 'ready'."
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "unerwartetes wanted-ref: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: Antwort-Endpaket erwartet"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "unerwartetes 'ready' von Remote-Repository"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "Remote-Referenz %s nicht gefunden"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile muss konfiguriert sein und für die Überprüfung "
+"der SSH-Signatur vorhanden sein"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify wird für die Verifizierung der SSH-"
+"Signatur benötigt (verfügbar in openssh Version 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "fehlerhafte/inkompatible Signatur '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "konnte SSH-Fingerabdruck für Schlüssel '%s' nicht bekommen"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"entweder user.signingkey oder gpg.ssh.defaultKeyCommand muss konfiguriert "
+"sein"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand war erfolgreich, gab aber keine Schlüssel zurück: "
+"%s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey muss für die SSH-Signatur gesetzt sein"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüsselpuffers nach '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" wird für die SSH-Signatur benötigt (verfügbar in "
+"openssh Version 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ungültige Farbe '%.*s' in log.graphColors ignoriert"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4394,111 +4485,111 @@
"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
"Punter PCRE v2 unterstützt."
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "Historie erweitern und bearbeiten"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Hauptbefehle"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Nebenbefehle / Manipulationen"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Nebenbefehle / Abfragen"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "mit anderen interagieren"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Systembefehle / Manipulationen"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Systembefehle / Abfragen"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Systembefehle / Repositories synchronisieren"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Systembefehle / Interne Hilfsbefehle"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "Vorhandene Git-Befehle in '%s'"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Die Git-Konzeptanleitungen sind:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
"lesen."
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Externe Befehle"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Alias-Befehle"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4507,32 +4598,37 @@
"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Stattdessen '%s' ausführen? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4546,16 +4642,16 @@
"\n"
"Die ähnlichsten Befehle sind"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4569,6 +4665,16 @@
"\n"
"Haben Sie eines von diesen gemeint?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
+"Sie können diese Warnung mit `git config advice.ignoredHook false` "
+"deaktivieren."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identität des Autors unbekannt\n"
@@ -4631,7 +4737,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
@@ -4729,7 +4835,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "ungültiger Wert '%s' für lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "unerwartete Zeile: '%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
@@ -4737,37 +4848,37 @@
msgid "quoted CRLF detected"
msgstr "angeführtes CRLF entdeckt"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "ungültige Aktion '%s' für '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Hinweis: Spule Submodul %s vor zu %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Fehler beim Zusammenführen von Submodul %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4777,7 +4888,7 @@
"Auflösung des Merges vorhanden:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4794,7 +4905,7 @@
"\n"
"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4804,21 +4915,21 @@
"sind vorhanden:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4829,7 +4940,7 @@
"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
"Pfade dahin zu setzen: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4840,7 +4951,7 @@
"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
"zu setzen: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4851,7 +4962,7 @@
"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
"Ziel die Mehrheit der Dateien erhält."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4860,7 +4971,7 @@
"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
"wurde."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4869,7 +4980,7 @@
"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
"umbenannt wurde in %s; Verschiebe es nach %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4878,7 +4989,7 @@
"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4887,7 +4998,7 @@
"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4897,13 +5008,13 @@
"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
"verschoben werden."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4914,23 +5025,23 @@
"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
"verschachtelten Konfliktmarkierungen führen."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4939,7 +5050,7 @@
"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
"nach %s verschieben."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4949,7 +5060,7 @@
"Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
"kann."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4959,24 +5070,24 @@
"Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
"werden kann."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "Inhalt"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "Submodul"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4985,7 +5096,7 @@
"KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s "
"von %s wurde im Arbeitsbereich gelassen."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4997,13 +5108,13 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
"Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5013,109 +5124,109 @@
"überschrieben werden:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Bereits aktuell."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n"
"Merge wird abgebrochen."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, 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:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, 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:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Spule Submodul %s vor"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
"gefunden)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
"schreibe stattdessen nach %s."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5124,7 +5235,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5133,7 +5244,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich gelassen."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5142,7 +5253,7 @@
"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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5151,46 +5262,46 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Verweigere geänderte Datei bei %s zu verlieren."
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
"ist."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, 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:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
"hinzu"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5199,18 +5310,18 @@
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5223,7 +5334,7 @@
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5232,81 +5343,81 @@
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, 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:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -5314,138 +5425,170 @@
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-index OID fanout hat die falsche Größe"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index-Datei %s ist zu klein."
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index-Version %d nicht erkannt."
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u überein"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "kann Reverse-Index-Datei nicht speichern"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "Zeile konnte nicht geparst werden: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "fehlerhafte Zeile: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "Paket konnte nicht geladen werden"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "konnte Index für %s nicht öffnen"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Packdateien zum multi-pack-index hinzufügen"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "unbekanntes bevorzugtes Paket: '%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "bevorzugtes Paket %s ohne Objekte kann nicht ausgewählt werden"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "bevorzugtes Paket '%s' ist abgelaufen"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "keine Packdateien zum Indizieren."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "Multipack-Bitmap konnte nicht geschrieben werden"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "Fehler beim Löschen des multi-pack-index bei %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "Prüfsumme nicht korrekt"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Suche nach referenzierten Pack-Dateien"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5453,55 +5596,55 @@
"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
"fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "das midx enthält keine oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Sortiere Objekte nach Pack-Datei"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Referenzierte Objekte zählen"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "Konnte 'pack-objects' nicht ausführen"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "Konnte 'pack-objects' nicht beenden"
@@ -5565,265 +5708,265 @@
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "Konnte \"alternates\"-Datei nicht lesen."
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
-#: object-file.c:789
+#: object-file.c:722
#, 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."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap fehlgeschlagen%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "Objektdatei %s ist leer."
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "Fehlerhaftes loses Objekt '%s'."
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "ungültiger Objekt-Typ"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "Konnte %s Kopfbereich nicht entpacken."
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "Konnte %s Kopfbereich nicht parsen."
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "ungültiger Objekt-Typ"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "Konnte %s Kopfbereich nicht entpacken."
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "Header für %s zu lang, überschreitet %d Bytes"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "Ersetzung %s für %s nicht gefunden."
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "Konnte Datei %s nicht schreiben."
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "Fehler beim Schreiben einer Datei."
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "Fehler beim Schließen der Datei für lose Objekte."
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
"Datenbank %s"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "Konnte temporäre Datei nicht erstellen."
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "Kann Objekt für %s nicht lesen."
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "fehlerhafter Commit"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "fehlerhaftes Tag"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "Lesefehler beim Indizieren von '%s'."
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "read() zu kurz beim Indizieren von '%s'."
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: Fehler beim Einfügen in die Datenbank"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: nicht unterstützte Dateiart"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s ist kein gültiges Objekt"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "Konnte mmap nicht auf %s ausführen."
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "Konnte Kopfbereich von %s nicht entpacken."
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "Konnte Kopfbereich von %s nicht parsen."
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "Konnte Inhalt von %s nicht entpacken."
@@ -5955,12 +6098,25 @@
msgid "hash mismatch %s"
msgstr "Hash stimmt nicht mit %s überein."
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "Multipack-Bitmap fehlt erforderlicher Reverse-Index"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: Paket konnte nicht geöffnet werden"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "Konnte Größe von %s nicht bestimmen."
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "konnte %s nicht in Paket %s bei Offset %<PRIuMAX> finden"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "konnte Festplattennutzung von %s nicht bekommen"
@@ -5990,46 +6146,46 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr ""
"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "konnte nicht lesen: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "Fehler beim lesbar machen von %s"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "konnte Promisor-Datei '%s' nicht schreiben"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "Packdatei %s kann nicht gemappt werden%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "Option `%s' erwartet einen numerischen Wert."
@@ -6049,73 +6205,73 @@
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s erfordert einen Wert."
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s ist inkompatibel mit %s."
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibel mit etwas anderem"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s erwartet keinen Wert"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s ist nicht verfügbar."
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
"Suffix"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "Alias für --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "Unbekannte Option: `%s'"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "Unbekannter Schalter `%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
@@ -6123,49 +6279,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "Angabe von 'attr:' darf nicht leer sein"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "Ungültiger Attributname %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
"inkompatibel."
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6173,52 +6353,52 @@
"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
"mit allen anderen Optionen."
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "Zeile enthält falsche Anführungszeichen: %s"
@@ -6239,7 +6419,7 @@
msgid "flush packet write failed"
msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "Protokollfehler: unmöglich lange Zeile"
@@ -6247,7 +6427,7 @@
msgid "packet write with format failed"
msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
@@ -6257,25 +6437,25 @@
msgid "packet write failed: %s"
msgstr "Schreiben des Pakets fehlgeschlagen: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "Lesefehler"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "Die Gegenseite hat unerwartet abgebrochen."
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "Protokollfehler: ungültige Zeilenlänge %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "Fehler am anderen Ende: %s"
@@ -6289,7 +6469,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "Kann Thread für lstat nicht erzeugen: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
@@ -6320,20 +6500,20 @@
msgid "Removing duplicate objects"
msgstr "Lösche doppelte Objekte"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6342,12 +6522,12 @@
"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
"'commit ' an: '%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "Konnte Git-Header '%.*s' nicht parsen."
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
@@ -6377,7 +6557,7 @@
"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
"hinzufügen."
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' hat keinen Commit ausgecheckt"
@@ -6397,16 +6577,16 @@
msgid "unable to stat '%s'"
msgstr "konnte '%s' nicht lesen"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Aktualisiere Index"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6415,7 +6595,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6424,143 +6604,143 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "Ungültige Signatur 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "Ungültige Index-Version %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "Ungültige SHA1-Signatur der Index-Datei."
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "Ignoriere Erweiterung %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "Ungeordnete Stage-Einträge im Index."
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "Ungeordnete Stage-Einträge für '%s'."
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: Kann geöffneten Index nicht lesen."
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: Index-Datei ist kleiner als erwartet."
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: Konnte Index-Datei nicht mappen%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: Kann nicht auf Stufe #0 wechseln."
@@ -6641,7 +6821,7 @@
msgstr[0] "Rebase von %s auf %s (%d Kommando)"
msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6650,7 +6830,7 @@
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6658,7 +6838,7 @@
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6672,7 +6852,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6682,14 +6862,14 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "Konnte '%s' nicht schreiben."
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "Konnte '%s' nicht schreiben."
@@ -6720,12 +6900,10 @@
"Warnungen zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6746,258 +6924,278 @@
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) akzeptiert keine Argumente"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "nicht erkanntes %%(subject) Argument: %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<Wert>) erwartet"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "nicht erkanntes %%(raw) Argument: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positiver Wert erwartet '%s' in %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "nicht erkanntes Argument '%s' in %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "nicht erkannte E-Mail Option: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) akzeptiert keine Argumente"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
-msgstr "Format: %%(end) Atom mehr als einmal verwendet"
+msgstr "Format: %%(else) Atom mehr als einmal verwendet"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "dieser Befehl lehnt Atom ab %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(kein Branch)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "missgebildeter Objektname %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "die Option `%s' muss auf einen Commit zeigen"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s zeigt auf kein gültiges Objekt!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7024,83 +7222,83 @@
"\n"
"\tgit branch -m <Name>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "konnte `%s` nicht abrufen"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "ungültiger Branchname: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "Log für Referenz %s hat eine Lücke nach %s."
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "Log für Referenz %s unerwartet bei %s beendet."
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "Log für %s ist leer."
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existiert; kann '%s' nicht erstellen"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "konnte Referenz %s nicht löschen"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "konnte Referenzen nicht entfernen: %s"
@@ -7414,7 +7612,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "Fehler beim Schreiben von '%s' (%s)."
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "Flush bei '%s' fehlgeschlagen."
@@ -7459,8 +7657,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
@@ -7498,47 +7696,41 @@
msgid "could not determine HEAD revision"
msgstr "Konnte HEAD-Commit nicht bestimmen."
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input ist nicht kompatibel mit --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk ist nicht kompatibel mit --unsorted-input"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "Öffnen von /dev/null fehlgeschlagen"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "Konnte Thread für async nicht erzeugen: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
-"Sie können diese Warnung mit `git config advice.ignoredHook false` "
-"deaktivieren."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
@@ -7557,25 +7749,25 @@
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "Push-Verhandlung fehlgeschlagen; fahre trotzdem mit dem Push fort"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
"die Gegenseite unterstützt nicht den Hash-Algorithmus dieses Repositories"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7583,47 +7775,48 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "Konnte '%s' nicht löschen"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "Revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "Rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7631,54 +7824,78 @@
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
-"'git commit' ein"
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git cherry-pick --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git cherry-pick --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git cherry-pick\" zu\n"
+"gelangen, führen Sie \"git cherry-pick --abort\" aus."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git revert --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git revert --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git revert\" zu gelangen,\n"
+"führen Sie \"git revert --abort\" aus."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -7686,65 +7903,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7775,11 +7992,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7807,7 +8024,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7833,345 +8050,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (Root-Commit)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "ungültige Autor-Identität '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "Die erste Commit-Beschreibung wird übersprungen:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen."
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "Abbrechen eines laufenden \"cherry-pick\""
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "Abbrechen eines laufenden \"revert\""
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "ungültiger Wert für %s: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "unbenutzbares squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "\"revert\" ist bereits im Gange"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "\"cherry-pick\" wird bereits durchgeführt"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "konnte HEAD nicht sperren"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "kann '%s' nicht lesen: %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "unerwartetes Dateiende"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "kein Revert im Gange"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "kein \"cherry-pick\" im Gange"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "Überspringen des Commits fehlgeschlagen"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "nichts zum Überspringen vorhanden"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8180,16 +8402,16 @@
"Haben Sie bereits committet?\n"
"Versuchen Sie \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "kann HEAD nicht lesen"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "konnte '%s' nicht nach '%s' kopieren"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8208,27 +8430,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "konnte '%s' nicht nach '%s' kopieren"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Führe aus: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8244,11 +8466,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8266,91 +8488,91 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "unerlaubter Beschriftungsname: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "kann nicht ohne einen aktuellen Commit mergen"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "konnte '%.*s' nicht parsen"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nichts zum Zusammenführen: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Unerwartete 'stash'-Antwort: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatischen Stash erzeugt: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "konnte 'reset --hard' nicht ausführen"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8361,29 +8583,29 @@
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "konnte HEAD nicht loslösen"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8405,60 +8627,60 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebase (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8469,50 +8691,60 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "zuvor angewendeten Commit %s übersprungen"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"verwenden Sie --reapply-cherry-picks, um übersprungene Commits einzubeziehen"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "Nichts zu tun."
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
@@ -8673,27 +8905,15 @@
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "fork fehlgeschlagen"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid fehlgeschlagen"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "versuche partiellen Index ohne Cone-Modus zu benutzen"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "konnte Cache-Verzeichnis nicht aktualisieren, bleibt voll"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
@@ -8750,13 +8970,13 @@
msgstr[0] "%u Byte/s"
msgstr[1] "%u Bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "Konnte '%s' nicht editieren."
@@ -8782,7 +9002,7 @@
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
@@ -8807,22 +9027,22 @@
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "In nicht ausgechecktem Submodul '%s'."
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "ungültiges --ignore-submodules Argument: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8831,12 +9051,12 @@
"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
"Submodul. Wird übersprungen."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8845,36 +9065,36 @@
"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
"ausführen."
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "Prozess für Submodul '%s' fehlgeschlagen"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Pushe Submodul '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Anfordern des Submoduls %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8883,62 +9103,62 @@
"Fehler während des Anforderns der Submodule:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "konnte Index des Submoduls nicht zurücksetzen"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8946,17 +9166,17 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8967,11 +9187,11 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
@@ -8993,7 +9213,7 @@
msgstr "unbekannter Wert '%s' für Schlüssel %s"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "mehr als ein %s"
@@ -9008,11 +9228,11 @@
msgid "could not read input file '%s'"
msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
@@ -9082,7 +9302,7 @@
msgid "error while running fast-import"
msgstr "Fehler beim Ausführen von 'fast-import'."
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "konnte Referenz %s nicht lesen"
@@ -9101,7 +9321,7 @@
msgid "invalid remote service path"
msgstr "ungültiger Remote-Service Pfad."
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "die Operation wird von dem Protokoll nicht unterstützt"
@@ -9110,7 +9330,7 @@
msgid "can't connect to subservice %s"
msgstr "kann keine Verbindung zu Subservice %s herstellen"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only benötigt Protokoll v2"
@@ -9123,59 +9343,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "Remote-Helper meldete unerwarteten Status von %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "Remote-Helper %s unterstützt kein --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "Remote-Helper %s unterstützt kein --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "Remote-Helper %s unterstützt kein --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "Remote-Helper %s unterstützt kein 'force'."
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "Konnte \"fast-export\" nicht ausführen."
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "Fehler beim Ausführen von \"fast-export\"."
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9184,52 +9404,52 @@
"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
"Vielleicht sollten Sie einen Branch angeben.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "nicht unterstütztes Objekt-Format '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "Ungültige Antwort in Referenzliste: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "Lesen von %s fehlgeschlagen."
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "Schreiben von %s fehlgeschlagen."
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "Thread %s fehlgeschlagen."
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "Fehler beim Beitreten zu Thread %s: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "Fehler beim Warten von Prozess %s."
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "Prozess %s fehlgeschlagen"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "Kann Thread zum Kopieren von Daten nicht starten."
@@ -9243,46 +9463,46 @@
msgid "could not read bundle '%s'"
msgstr "Konnte Paket '%s' nicht lesen."
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige depth Option '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "Server unterstützt nicht 'wait-for-done'"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "Übertragungsart '%s' nicht erlaubt."
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync wird nicht länger unterstützt."
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9291,7 +9511,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9318,11 +9538,11 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Abbruch."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
@@ -9612,17 +9832,17 @@
"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Aktualisiere Index-Markierungen"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"Arbeitsverzeichnis und unversionierter Commit haben doppelte Einträge: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "erwartete Flush nach Abrufen der Argumente"
@@ -9659,7 +9879,7 @@
msgid "Fetching objects"
msgstr "Anfordern der Objekte"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
@@ -9756,17 +9976,27 @@
msgid "gitdir file points to non-existent location"
msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
@@ -10349,25 +10579,25 @@
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "konnte IPC-Befehl nicht senden"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "konnte IPC-Antwort nicht lesen"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "konnte accept_thread nicht für '%s' starten"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "konnte worker[0] nicht für '%s' starten"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -10376,139 +10606,140 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "kann chmod %cx '%s' nicht ausführen"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
"-u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"erlaube das Aktualisieren von Einträgen außerhalb des partiellen Checkouts "
+"im Cone-Modus"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "Backend für `git stash -p`"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10542,12 +10773,12 @@
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10557,52 +10788,52 @@
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run und --interactive/--patch sind inkompatibel"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file und --edit sind inkompatibel"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A und -u sind zueinander inkompatibel"
-#: builtin/add.c:522
+#: builtin/add.c:547
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:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul benötigt --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10612,116 +10843,116 @@
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:814
+#: builtin/am.c:815
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:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, 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:1127
+#: builtin/am.c:1128
#, 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:1128
+#: builtin/am.c:1129
#, 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:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte "
"verloren gehen."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Patch ist leer."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "Autor-Zeile fehlt in Commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "Ungültige Identifikationszeile: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
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:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
-"nachzustellen ..."
+"nachzustellen..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10729,24 +10960,24 @@
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
-msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -10754,35 +10985,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
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:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
@@ -10812,17 +11043,17 @@
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10830,160 +11061,160 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Ungültiger Wert für --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "eine Signed-off-by Zeile der Commit-Beschreibung hinzufügen"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
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:2290
+#: builtin/am.c:2292
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:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "an git-mailinfo weitergeben"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "Format"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "den Patch, der gerade angewendet wird, anzeigen"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10991,16 +11222,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, 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:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11009,11 +11240,11 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
@@ -11021,46 +11252,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "Konnte Archiv-Datei '%s' nicht erstellen."
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "Konnte Ausgabe nicht umleiten."
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Externes Archiv ohne URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: Protokollfehler"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: erwartete eine Spülung (flush)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<Commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> "
-"[<Begriff>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11099,46 +11319,59 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <Programm>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "konnte nicht in Datei '%s' schreiben"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "Datei '%s' kann nicht zum Lesen geöffnet werden"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' ist kein gültiger Begriff"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Keine binäre Suche im Gange.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' ist kein gültiger Commit"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11146,27 +11379,27 @@
"Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Ungültiges \"bisect_write\" Argument: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "konnte die OID der Revision '%s' nicht erhalten"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "konnte die Datei '%s' nicht öffnen"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11175,7 +11408,7 @@
"Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11186,7 +11419,7 @@
"Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "binäre Suche nur mit einem %s Commit"
@@ -11195,15 +11428,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "keine Begriffe definiert"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11212,7 +11445,7 @@
"Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
"und %s für den neuen Zustand.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11221,55 +11454,55 @@
"Ungültiges Argument %s für 'git bisect terms'.\n"
"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "konnte '%s' nicht zum Anhängen öffnen"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' ist kein gültiger Begriff"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "nicht erkannte Option: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' scheint kein gültiger Commit zu sein"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "ungültiger HEAD - HEAD wird benötigt"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
"<gültiger-Branch>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ungültige Referenz: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
@@ -11277,104 +11510,150 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Bitte führen Sie `--bisect-state` mit mindestens einem Argument aus"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' kann nur ein Argument entgegennehmen."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Ungültige Referenz-Eingabe: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Ungültige Referenz-Eingabe (kein Commit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Keine binäre Suche im Gange."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? Was reden Sie da?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "kann Datei '%s' nicht für die Wiederholung lesen"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "Ausführen von %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "'bisect run' fehlgeschlagen: Exit-Code %d von '%s' ist < 0 oder >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "Datei '%s' kann nicht zum Schreiben geöffnet werden"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "'bisect run' erfolgreich ausgeführt"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "binäre Suche fand ersten schlechten Commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit "
+"Fehlercode %d beendet"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "den Zustand der binären Suche zurücksetzen"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "die Begriffe für die binäre Suche ausgeben"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "Sitzung für binäre Suche starten"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "nächsten Commit für die binäre Suche finden"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "den Status der Referenz(en) markieren"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "die bisherigen Schritte der binären Suche auflisten"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "binäre Suche aus der angegebenen Datei wiederholen"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "einige Commits für das Auschecken überspringen"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "binäre Suche visualisieren"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "verwende <Programm>... für die automatische binäre Suche."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "kein Log für BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check benötigt 2 oder 3 Argumente"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms benötigt 0 oder 1 Argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next benötigt 0 Argumente"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log benötigt 0 Argumente"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "keine Log-Datei angegeben"
@@ -11386,155 +11665,157 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "erwarte eine Farbe: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "muss mit einer Farbe enden"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ungültige Farbe '%s' in color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "ungültiger Wert für blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "konnte Commit %s zum Ignorieren nicht finden"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
"den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr ""
"statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "Whitespace-Unterschiede ignorieren"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "Commit"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "ignoriere Commits aus <Datei>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr ""
"mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "Bereich"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
"verarbeiten"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -11548,18 +11829,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "Datei %s hat nur %lu Zeile"
msgstr[1] "Datei %s hat nur %lu Zeilen"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
@@ -11661,81 +11942,81 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
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:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, 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:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11746,181 +12027,181 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "nicht verwenden"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "Zeige aktuellen Branch-Namen."
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column und --verbose sind inkompatibel"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11928,34 +12209,34 @@
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "Branch '%s' nicht gefunden"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr ""
"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
"entfernen"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
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:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11964,7 +12245,7 @@
"verwendet werden.\n"
"Wollten Sie -a|-r --list <Muster> benutzen?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11972,32 +12253,32 @@
"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git Version:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "Compiler Info: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc Info: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12034,38 +12315,33 @@
"Bitte überprüfen Sie den restlichen Teil des Fehlerberichts unten.\n"
"Sie können jede Zeile löschen, die Sie nicht mitteilen möchten.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "Speicherort für die Datei des Fehlerberichts angeben"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "System Info"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Aktivierte Hooks"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "konnte keine neue Datei unter '%s' erstellen"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "konnte nicht nach %s schreiben"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Neuer Bericht unter '%s' erstellt.\n"
@@ -12086,53 +12362,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "Version des Paket-Formats angeben"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "Keine Bundle-Details anzeigen"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s ist in Ordnung\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Entpacken von Objekten"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12140,7 +12416,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -12148,76 +12424,76 @@
"git cat-file (--batch[=<Format>] | --batch-check[=<Format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "Blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
"--batch oder --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "Ausgabe von --batch-all-objects nicht ordnen"
@@ -12237,7 +12513,7 @@
msgid "use .gitattributes only from the index"
msgstr "nur .gitattributes vom Index verwenden"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "Dateinamen von der Standard-Eingabe lesen"
@@ -12245,8 +12521,8 @@
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:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -12304,11 +12580,10 @@
msgstr "git checkout--worker [<Optionen>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "Zeichenkette"
@@ -12463,11 +12738,11 @@
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
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:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12476,50 +12751,50 @@
"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, 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:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12542,7 +12817,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12569,19 +12844,19 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12591,7 +12866,7 @@
"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
"eindeutig voneinander zu unterscheiden."
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12614,51 +12889,51 @@
"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "nur eine Referenz erwartet"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "Ein Branch wird erwartet, '%s' bekommen"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12666,7 +12941,7 @@
"Der Branch kann nicht während eines Merges gewechselt werden.\n"
"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12675,7 +12950,7 @@
"werden.\n"
"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12684,7 +12959,7 @@
"werden.\n"
"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12693,7 +12968,7 @@
"gewechselt werden.\n"
"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12702,140 +12977,140 @@
"werden.\n"
"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "Sie wechseln den Branch während einer binären Suche"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' kann nicht <Startpunkt> bekommen"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "Branch- oder Commit-Argument fehlt"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
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:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p und --overlay schließen sich gegenseitig aus"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track benötigt ein Branchname"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "kein Branchname; versuchen Sie -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "konnte %s nicht auflösen"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, 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:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file und --detach sind inkompatibel"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file und --patch sind inkompatibel"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12843,71 +13118,71 @@
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "benutze Overlay-Modus (Standard)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "einen neuen Branch erzeugen und dahin wechseln"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "lokale Änderungen verwerfen"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "Index wiederherstellen"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignoriere nicht zusammengeführte Einträge"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "benutze Overlay-Modus"
@@ -13047,8 +13322,8 @@
msgstr "ganze Verzeichnisse löschen"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
@@ -13137,19 +13412,20 @@
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "Name"
@@ -13165,8 +13441,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "Tiefe"
@@ -13175,8 +13451,8 @@
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "Zeit"
@@ -13188,18 +13464,18 @@
"erstellen"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
"Ausschluss eines Commits vertiefen"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
@@ -13228,21 +13504,21 @@
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "serverspezifisch"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "Option übertragen"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
@@ -13257,50 +13533,42 @@
"Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
"Root-Verzeichnis einzubeziehen"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Konnte keinen Verzeichnisnamen erraten.\n"
-"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "Fehler beim Starten der Iteration über '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "Fehler beim Iterieren über '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13310,107 +13578,107 @@
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "Fehler beim Initialisieren vom partiellen Checkout."
-#: builtin/clone.c:784
+#: builtin/clone.c:668
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:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, 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:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
"Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "Klone nach '%s' ...\n"
+msgstr "Klone nach '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13418,55 +13686,55 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
"\"."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"\"file://\"."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"\"file://\"."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
"\"."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "Remoteübertragung meldete Fehler"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -13502,14 +13770,14 @@
msgid "--command must be the first argument"
msgstr "--command muss an erster Stelle stehen"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13519,100 +13787,98 @@
"split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "das Objektverzeichnis zum Speichern des Graphen"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Konnte Commit-Graph '%s' nicht öffnen."
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "nicht erkanntes --split Argument, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "ungültiges Objekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "Durchlauf auf allen Referenzen beginnen"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
"befinden"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "Berechnung für veränderte Pfade aktivieren"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maximale Anzahl der zu berechnenden Bloom-Filter für veränderte Pfade"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"benutzen Sie mindestens eine der folgenden Optionen: --reachable, --stdin-"
"commits, oder --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Sammle Commits von der Standard-Eingabe"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "Nicht erkannter Unterbefehl: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13626,70 +13892,65 @@
msgid "duplicate parent %s ignored"
msgstr "doppelter Vorgänger %s ignoriert"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "Kein gültiger Objektname: %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: Fehler beim Öffnen von '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: Fehler beim Lesen von '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: Fehler beim Schließen von '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "Eltern-Commit"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "ID eines Eltern-Commit-Objektes."
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "Commit-Beschreibung von Datei lesen"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "Brauche genau ein Tree-Objekt."
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: Fehler beim Lesen"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13699,7 +13960,7 @@
"machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13714,15 +13975,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13744,74 +14005,74 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
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:491
+#: builtin/commit.c:492
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:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "kann keinen Teil-Commit durchführen, während ein Rebase im Gange ist."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13819,43 +14080,43 @@
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "-m kann nicht mit --fixup:%s kombiniert werden"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13864,7 +14125,7 @@
"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
"die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13874,7 +14135,7 @@
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13884,7 +14145,7 @@
"die mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie\n"
"diese entfernen.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13897,7 +14158,7 @@
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13911,7 +14172,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"aus und versuchen Sie es erneut.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13925,76 +14186,76 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"aus und versuchen Sie es erneut.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "konnte Anhänge nicht an --trailers weitergeben"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1124
#, 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:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long und -z sind inkompatibel"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Ein Merge ist im Gange -- kann Umformulierung nicht durchführen."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "\"cherry-pick\" ist im Gange -- kann Umformulierung nicht durchführen."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
"Option für Umformulierung bei --fixup kann nicht mit Pfad '%s' kombiniert "
"werden"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -14002,105 +14263,105 @@
"Umformulierungsoption von --fixup und --patch/--interactive/--all/--"
"include/--only schließen sich gegenseitig aus"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author und --author können nicht gemeinsam verwendet werden"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Sie haben nichts zum Nachbessern."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
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:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden"
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "unbekannte Option: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14108,11 +14369,11 @@
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14120,195 +14381,195 @@
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]Commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"eine autosquash-formatierte Beschreibung zum Nachbessern/Umformulieren des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine autosquash-formatierte Beschreibung beim \"squash\" des angegebenen "
"Commits verwenden"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "Anhang"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "benutzerdefinierte Anhänge hinzufügen"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "eine Signed-off-by Zeile hinzufügen"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, 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:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14682,7 +14943,7 @@
msgstr ""
"credential-cache--daemon nicht verfügbar; Unix-Socket wird nicht unterstützt"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt"
@@ -14887,7 +15148,7 @@
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
@@ -14911,115 +15172,114 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "fehlgeschlagen: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
-"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
+"kombinierte Diff-Formate ('-c' und '--cc') werden im Verzeichnis-\n"
+"Diff-Modus ('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "fehlgeschlagen: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` statt `diff.tool` benutzen"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "Tool"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem "
-"Rückkehrwert\n"
-"verschieden 0 ausgeführt wurde"
+"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Exit-Code "
+"ungleich 0 ausgeführt wurde"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "an 'diff' übergeben"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
@@ -15027,7 +15287,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "Art"
@@ -15059,100 +15319,100 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Fehler: Verschachtelte Tags können nicht exportiert werden, außer --mark-"
"tags wurde angegeben."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "Token für --anonymize-map kann nicht leer sein"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "Markierungen in diese Datei schreiben"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "Markierungen von dieser Datei importieren"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "von:nach"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
"referenzieren"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "Tags mit Markierungs-IDs beschriften"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
"--import-marks und --import-marks-if-exists können nicht zusammen "
@@ -15212,15 +15472,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kann nicht negativ sein"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "Upstream für \"git pull/fetch\" setzen"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
@@ -15228,7 +15488,7 @@
msgid "use atomic transaction to update references"
msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
@@ -15240,7 +15500,7 @@
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
@@ -15258,7 +15518,7 @@
"Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert "
"werden"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
@@ -15270,7 +15530,7 @@
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "bei-Bedarf"
@@ -15282,7 +15542,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
@@ -15290,20 +15550,20 @@
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) auf "
"Zeitbasis\n"
"vertiefen"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
@@ -15319,19 +15579,19 @@
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
@@ -15347,7 +15607,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
@@ -15363,62 +15623,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15429,7 +15689,7 @@
"aktivieren, nutzen Sie die Option '--show-forced-updates' oder führen\n"
"Sie 'git config fetch.showForcedUpdates true' aus."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15442,24 +15702,24 @@
"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
"zu umgehen.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"%s zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15468,58 +15728,63 @@
"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:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, 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:1403
+#: builtin/fetch.c:1417
#, 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:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "das Objekt %s ist nicht vorhanden"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "Unbekannter Branch-Typ"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15527,22 +15792,22 @@
"Keinen Quell-Branch gefunden.\n"
"Sie müssen bei der Option --set-upstream genau einen Branch angeben."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15551,60 +15816,60 @@
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only benötigt einen oder mehrere --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"--unshallow kann nicht in einem Repository mit vollständiger Historie "
"verwendet werden"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
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"
"von Refspecs verwendet werden."
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "Remote wird benötigt, wenn --negotiate-only benutzt wird"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Protokoll unterstützt --negotiate-only nicht, beende."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15612,13 +15877,13 @@
"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
"die in extensions.partialclone konfiguriert sind"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"--atomic kann nur verwendet werden, wenn nur von einem Remote-Repository "
"abgefragt wird"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository "
@@ -15687,7 +15952,7 @@
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "Formatfarben beachten"
@@ -15843,129 +16108,139 @@
msgid "notice: No default references"
msgstr "Notiz: Keine Standardreferenzen"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: Hash-Pfad stimmt nicht überein, gefunden bei: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: Objekt hat einen unbekannten Typ '%s': %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: Objekt konnte nicht geparst werden: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "Ungültige SHA1-Datei: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Prüfe Objekt-Verzeichnis"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Prüfe %s Verknüpfung"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s zeigt auf etwas seltsames (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: losgelöster HEAD zeigt auf nichts"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Prüfe Cache-Verzeichnis"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "non-tree in Cache-Verzeichnis"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Prüfe Objekte"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: Objekt nicht vorhanden"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
@@ -15989,7 +16264,7 @@
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
@@ -15998,7 +16273,7 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -16091,154 +16366,194 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "nicht erkanntes --schedule Argument '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "Fehler beim Schreiben des Commit-Graph"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "konnte 'git pack-objects' Prozess nicht starten"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "konnte 'git pack-objects' Prozess nicht beenden"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "Fehler beim Schreiben des multi-pack-index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"Überspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex "
"deaktiviert ist"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "Aufgabe '%s' fehlgeschlagen"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' ist keine gültige Aufgabe"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "Häufigkeit"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "Aufgabe"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "eine bestimmte Aufgabe ausführen"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
"nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "Fehler beim Ausführen von 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "Fehler beim Erweitern des Pfades '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "konnte launchctl nicht starten"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "Fehler beim Laden des Services %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "Fehler beim Erstellen der temporären XML-Datei"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "Fehler beim Starten von schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell "
"'cron' nicht"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' "
"nicht"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' abgebrochen"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "Fehler beim Starten von systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "Fehler beim Ausführen von systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "Fehler beim Löschen von '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nicht erkanntes --scheduler Argument '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "weder Timer von systemd, noch crontab ist verfügbar"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s Scheduler ist nicht verfügbar"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "ein anderer Prozess plant die Hintergrundwartung"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<Scheduler>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "Scheduler"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "Scheduler, um \"git maintenance run\" auzuführen"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <Unterbefehl> [<Optionen>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "ungültiger Unterbefehl: %s"
@@ -16247,12 +16562,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -16261,270 +16576,270 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "im Index statt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
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:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "Kein Muster angegeben."
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet "
"werden"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached und --untracked können nicht mit --no-index verwendet werden"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked kann nicht mit --cached verwendet werden"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
"werden"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16532,97 +16847,109 @@
"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
"[--] <Datei>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "Art des Objektes"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "das Objekt in die Objektdatenbank schreiben"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "das Objekt von der Standard-Eingabe lesen"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "Datei wie sie ist speichern, ohne Filter"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
"Fehlersuche in Git, erzeugen"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "alle vorhandenen Befehle anzeigen"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "Anleitungen ausschließen"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "alle Namen der Konfigurationsvariablen ausgeben"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "Handbuch anzeigen"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "Handbuch in einem Webbrowser anzeigen"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "Info-Seite anzeigen"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "Beschreibung des Befehls ausgeben"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "alle Namen der Konfigurationsvariablen ausgeben"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16631,7 +16958,7 @@
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16640,332 +16967,323 @@
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "Für '%s' wurde der Alias '%s' angelegt."
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Ungültiger alias.%s String: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "diese Option akzeptiert keine anderen Argumente"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' für weitere Informationen"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "Paket überschreitet die maximal erlaubte Größe"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "Kann Paketdatei '%s' nicht öffnen"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "abgeschlossen mit %d lokalem Objekt"
msgstr[1] "abgeschlossen mit %d lokalen Objekten"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelösten Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "konnte temporäre Datei '*.%s' nicht zu '%s' umbenennen"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "Kann Paketdatei nicht speichern"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "Kann Indexdatei nicht speichern"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "unbekannter Hash-Algorithmus '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format kann nicht mit --stdin verwendet werden"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "fsck Fehler beim Packen von Objekten"
@@ -17609,134 +17927,138 @@
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "Pfade durch NUL-Zeichen trennen"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "Muster, gelesen von <Datei>, ausschließen"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "Ausschlussmuster aus <Datei> lesen"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "doppelte Einträge unterdrücken"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<Repository> [<Referenzen>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<Repository> [<Referenzen>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "Programm"
@@ -17857,7 +18179,7 @@
msgid "use headers in message's body"
msgstr "nutze Header im Inhalt der Nachricht"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
@@ -17973,145 +18295,145 @@
msgid "Merging %s with %s\n"
msgstr "Führe %s mit %s zusammen\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "Option `%s' erfordert einen Wert."
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
"hinzufügen"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "Hooks pre-merge-commit und commit-msg umgehen"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Bereits auf dem neuesten Stand. (nichts für Squash-Merge vorhanden)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
@@ -18126,33 +18448,33 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Unbekannte Option für merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "unbekannte Strategie-Option: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -18163,11 +18485,11 @@
"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18176,75 +18498,75 @@
"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
"und eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr ""
"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nichts was wir in %s zusammenführen können: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit erwartet keine Argumente"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18252,7 +18574,7 @@
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18260,91 +18582,87 @@
"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:1382
+#: builtin/merge.c:1386
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:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "Sie können --squash nicht mit --commit kombinieren."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
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:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
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:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Vorspulen nicht möglich, breche ab."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
-msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
+msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
-msgstr "Probiere Merge-Strategie %s ...\n"
+msgstr "Probiere Merge-Strategie %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Benutze die Strategie %s, um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18379,16 +18697,16 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "Objekt '%s' als '%s' getaggt, aber ist ein '%s' Typ"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
"Tag von der Standardeingabe für unsere strenge Überprüfung bei fsck ungültig"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "Tag von der Standard-Eingabe verweiste nicht auf gültiges Objekt"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
@@ -18409,36 +18727,52 @@
msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>][--refs-"
+"snapshot=<Pfad>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<Optionen>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<Optionen>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<Optionen>] repack [--batch-size=<Größe>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "bevorzugtes Paket"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
"Paket für die Wiederbenutzung, wenn eine Multi-Pack Bitmap berechnet wird"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "schreibe Multipack-Bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "Multipack-Index schreiben, der nur die gegebenen Indexe enthält"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "Referenzen-Snapshot, um Bitmap-Commits auszuwählen"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18446,11 +18780,6 @@
"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
"einenStapel, welcher größer ist als diese Größe"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "Nicht erkannter Unterbefehl: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
@@ -18480,72 +18809,72 @@
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "in Konflikt"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für dasselbe Ziel"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -18724,48 +19053,48 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F."
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "Konnte Notiz-Objekt nicht schreiben"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "Fehler beim Lesen des Objektes '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
@@ -18773,50 +19102,50 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
"Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
"zurückgewiesen"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "Zu viele Argumente."
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18825,31 +19154,31 @@
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "zu wenige Argumente"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18858,12 +19187,12 @@
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18872,52 +19201,52 @@
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18925,49 +19254,49 @@
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18979,41 +19308,41 @@
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -19066,86 +19395,90 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "Fehler beim Schreiben des Bitmap-Index"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
"Datei\n"
"geschrieben wurden."
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Zähle Objekte"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19154,7 +19487,7 @@
"Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
"Hash> <URI>' vorliegen ('%s' erhalten)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19162,17 +19495,18 @@
"Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
"('%s' erhalten)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "konnte Typ von Objekt %s in Paket %s nicht bestimmen"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "Konnte Paket '%s' nicht finden"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19181,7 +19515,7 @@
"erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19190,263 +19524,263 @@
"erwartete Objekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "ungültiger Wert für --missing"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "kann Paketindex nicht öffnen"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "loses Objekt bei %s konnte nicht untersucht werden"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "konnte loses Objekt nicht erzwingen"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' ist kein Commit"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "ungültiger Commit '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "konnte neuere Objekte nicht hinzufügen"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
"verwenden"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "Pakete von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "Bitmap-Index schreiben, wenn möglich"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "Protokoll"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
"ausschließen"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "kann --filter nicht mit --stdin-packs benutzen"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
"interne Commit-Liste kann nicht gemeinsam mit --stdin-packs verwendet werden"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19504,7 +19838,7 @@
"Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
"Remote-Repositories einschränken"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
@@ -19517,44 +19851,48 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "Benutzung der pre-merge-commit und commit-msg Hooks kontrollieren"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "automatischer Stash/Stash-Pop davor und danach"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19562,14 +19900,14 @@
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19577,7 +19915,7 @@
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19589,38 +19927,38 @@
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
@@ -19628,7 +19966,7 @@
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19638,20 +19976,20 @@
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19663,10 +20001,10 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n"
-"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n"
-"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n"
-"ausgeführt wird:\n"
+"Sie haben abweichende Branches und müssen angeben, wie mit diesen\n"
+"umgegangen werden soll.\n"
+"Sie können dies tun, indem Sie einen der folgenden Befehle vor dem\n"
+"nächsten Pull ausführen:\n"
"\n"
" git config pull.rebase false # Merge (Standard-Strategie)\n"
" git config pull.rebase true # Rebase\n"
@@ -19677,21 +20015,21 @@
"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19701,7 +20039,7 @@
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19718,15 +20056,25 @@
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kann nicht zu mehreren Branches vorspulen."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+"Es muss angegeben werden, wie mit abweichenden Branches umgegangen werden "
+"sollen."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -19917,15 +20265,15 @@
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
@@ -19937,19 +20285,19 @@
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:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<Referenzname>:<Erwartungswert>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
@@ -19957,12 +20305,12 @@
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "'receive pack' Programm"
@@ -19982,11 +20330,11 @@
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
@@ -20099,83 +20447,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
-"[<Commit-Referenz3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<Datei>] (--empty | "
+"<Commit-Referenz1> [<Commit-Referenz2> [<Commit-Referenz3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "resultierenden Index nach <Datei> schreiben"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "nur den Index leeren"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Merge"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<Unterverzeichnis>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "Anwendung des Filters für partielles Auschecken überspringen"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "unpack-trees protokollieren"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "Rückmeldungen unterdrücken"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
@@ -20198,194 +20545,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "Unbenutzbare TODO-Liste: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "Konnte TODO-Liste nicht erzeugen."
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<Optionen>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behalte Commits, die leer beginnen"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "Commits mit leerer Beschreibung erlauben"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "Rebase auf Merge-Commits ausführen"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "originale Branch-Punkte der Cousins behalten"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "Commits signieren"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "Rebase fortsetzen"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "Commit auslassen"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "die TODO-Liste bearbeiten"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "den aktuellen Patch anzeigen"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste verkürzen"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste erweitern"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "die TODO-Liste prüfen"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash-Zeilen umordnen"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "auf"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "der Upstream-Commit"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "Rebase-Strategie"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "wechseln zu"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "der Branch oder Commit zum Auschecken"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "Befehl"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "auszuführender Befehl"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s erfordert das Merge-Backend"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "Konnte 'onto' nicht bestimmen: '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "Ungültiges orig-head: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20401,7 +20598,7 @@
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20421,7 +20618,7 @@
"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
"ausführen."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20430,7 +20627,7 @@
"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und "
"\"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20448,7 +20645,7 @@
" git rebase '<Branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20462,188 +20659,198 @@
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "Leerer \"exec\"-Befehl."
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "Synonym für --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "Whitespace-Änderungen ignorieren"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "fortsetzen"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "Strategien von 'git am' bei Rebase verwenden"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "wie sollen Commits behandelt werden, die leer werden"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "behalte Commits, die leer beginnen"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "Option"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
"alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch "
"vorhanden sind"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
-"rebase-merges'."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges wurde durch --rebase-merges ersetzt"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
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."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20651,16 +20858,16 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20681,147 +20888,135 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr ""
"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
"werden."
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Unbekanntes Rebase-Backend: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
-"kombiniert werden."
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: Branch/Commit '%s' nicht gefunden"
+msgid "no such branch/commit '%s'"
+msgstr "Branch/Commit '%s' nicht gefunden"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "Konnte nicht zu %s wechseln."
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
"anzuwenden...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20853,7 +21048,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20874,11 +21069,11 @@
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
@@ -20919,7 +21114,7 @@
msgid "%s points nowhere!"
msgstr "%s zeigt auf nichts!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "Kein Reflog zum Löschen angegeben."
@@ -21079,7 +21274,7 @@
"die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits."
@@ -21089,25 +21284,30 @@
msgid "Could not setup master '%s'"
msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "unbehandeltes branch.%s.rebase=%s; 'true' wird angenommen"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(übereinstimmend)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "konnte '%s' nicht setzen"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21118,17 +21318,17 @@
"\t%s:%d\n"
"benennt jetzt das nicht existierende Remote-Repository '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Remote-Repository nicht gefunden: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21139,17 +21339,17 @@
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21165,118 +21365,118 @@
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, 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:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, 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:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(keine URL)"
@@ -21284,25 +21484,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(nicht abgefragt)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(unbekannt)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21310,162 +21510,166 @@
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
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:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Remote-Repository '%s' nicht gefunden"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add und --delete können nicht gemeinsam verwendet werden"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "URL nicht gefunden: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21474,148 +21678,161 @@
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht starten."
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht abschließen."
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "konnte Index für %s nicht öffnen"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
"Paket %s zu groß, um es bei der geometrischen Progression zu berücksichtigen"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "Paket %s zu groß zum Aufrollen"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "konnte temporäre Datei '%s' nicht zum Schreiben öffnen"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge "
"limitieren"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "eine geometrische Progression mit Faktor <N> finden"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ein Multipack-Index des resultierenden Pakets schreiben"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric ist inkompatibel mit -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Nichts Neues zum Packen."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "benötigte Datei fehlt: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "konnte nicht löschen: %s"
@@ -21927,93 +22144,93 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, nur Fehler melden"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
"<Pfade>'."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N kann nur mit --mixed benutzt werden"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -22027,12 +22244,12 @@
"das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
"auf \"true\", um das zum Standard zu machen.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
@@ -22215,15 +22432,19 @@
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "Commits mit leerer Beschreibung erlauben"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -22275,74 +22496,73 @@
msgstr[0] "die folgende Datei hat lokale Änderungen:"
msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "keine gelöschten Dateien auflisten"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "nur aus dem Index entfernen"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "die \"up-to-date\" Prüfung überschreiben"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "rekursives Entfernen erlauben"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt "
"werden?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n"
"benutzen Sie \"stash\", um fortzufahren."
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<Host>:]<Verzeichnis> "
-"[<Referenz>...]\n"
-" --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
-"aus."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<Host>:]<Verzeichnis> (--all | <Referenz>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "Name des Remote-Repositories"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "zustandsloses RPC-Protokoll verwenden"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "Referenzen von der Standard-Eingabe lesen"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
@@ -22400,21 +22620,21 @@
msgid "group by field"
msgstr "Gruppieren nach Feld"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "zu viele Argumente außerhalb des Repositories angegeben"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
+" [--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22427,116 +22647,116 @@
msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln"
msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "keine übereinstimmenden Referenzen mit %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
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"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
"base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "die Option --reflog benötigt einen Branchnamen"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden."
msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "Kann nicht mehr als %d Commit behandeln."
msgstr[1] "Kann nicht mehr als %d Commits behandeln."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' ist keine gültige Referenz."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "kann Commit %s (%s) nicht finden"
@@ -22611,74 +22831,88 @@
"dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
"existiert eventuell nicht)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"Verzeichnis '%s' enthält unversionierte Dateien, aber ist nicht innerhalb "
+"des partiellen Checkouts im Cone-Modus"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "Fehler beim Löschen des Verzeichnisses '%s'"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
"Checkouts"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"Repository-Format konnte nicht erweitert werden, um worktreeConfig zu "
"aktivieren"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "initialisiere den partiellen Checkout im Cone-Modus"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "die Nutzung des Sparse-Index umschalten"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "konnte Pfad '%s' nicht normalisieren"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "Muster von der Standard-Eingabe lesen"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
@@ -22714,7 +22948,7 @@
" [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
" [--] [<Pfadspezifikation>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22744,6 +22978,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
" [--] [<Pfadspezifikation>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<Nachricht>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22767,7 +23009,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22779,169 +23021,169 @@
" %s -> %s\n"
" um Platz zu schaffen.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "Konnte keinen Diff erzeugen %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Führe %s mit %s zusammen"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "Versuche Index wiederherzustellen."
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) gelöscht"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Konnte Stash-Eintrag nicht löschen"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' ist keine Stash-Referenz"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr ""
"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
"benötigen."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "Parsen der Tree-Objekte fehlgeschlagen"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "nur unversionierte Dateien im Stash anzeigen"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kann nicht %s mit %s aktualisieren."
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "Stash-Beschreibung"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" erwartet ein Argument <Commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Haben Sie vielleicht 'git add' vergessen?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "behalte Index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "Stash in Patch-Modus"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "weniger Ausgaben"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "ignorierte Dateien einbeziehen"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22967,7 +23209,7 @@
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
@@ -22981,27 +23223,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
+"Repository sein eigenes verbindliches Upstream-Repository ist."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Betrete '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -23010,7 +23260,7 @@
"run_command gab nicht-Null Status für '%s' zurück.\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -23022,177 +23272,168 @@
"nicht-Null Status zurück.\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
-"Repository sein eigenes verbindliches Upstream-Repository ist."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, 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:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul '%s'."
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "Ausgabe des Submodul-Status unterdrücken"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
"den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "unerwarteter Modus %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "den Commit aus dem Index mit dem im Submodul HEAD vergleichen"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"überspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "Größe der Zusammenfassung begrenzen"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "konnte keinen Commit für HEAD holen"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached und --files schließen sich gegenseitig aus"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisiere Submodul-URL für '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23202,7 +23443,7 @@
"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
"löschen möchten)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23211,49 +23452,49 @@
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
"vorliegen"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "alle Submodule austragen"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23266,69 +23507,69 @@
"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
"'--reference-if-able' statt '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n"
"verweigert."
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "Verzeichnis ist nicht leer: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23338,88 +23579,187 @@
"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
"<URL> --path <Pfad>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Konnte '%s' nicht im Submodul-Pfad '%s' auschecken"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Rebase von '%s' in Submodul-Pfad '%s' nicht möglich"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Merge von '%s' in Submodul-Pfad '%s' nicht möglich"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Ausführung von '%s %s' in Submodul-Pfad '%s' fehlgeschlagen"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Submodul-Pfad '%s': '%s' ausgecheckt\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Submodul-Pfad '%s': Rebase in '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Submodul-Pfad '%s': zusammengeführt in '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Submodul-Pfad '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Konnte \"fetch\" in Submodul-Pfad '%s' nicht ausführen. Versuche %s direkt "
+"anzufordern:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"\"fetch\" in Submodul-Pfad '%s' ausgeführt, aber enthielt nicht %s. Direktes "
+"Anfordern dieses Commits ist fehlgeschlagen."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
"bei der angegebenen Anzahl von Commits"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
"Historie (shallow) folgen soll"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für update Parameter"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "Ausgaben bei Aktualisierung durch Rebase oder Merge unterdrücken"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "Checkout-Aktualisierungen erzwingen"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "keine neuen Objekte von Remote abrufen"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"überschreibt den Aktualisierungsmodus, falls es sich bei dem Repository um "
+"einen neuen Klon handelt"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "Tiefe des Abrufens mit unvollständiger Historie (shallow)"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 vom übergeordneten Projekt erwartet"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 vom HEAD des Submoduls"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<Optionen>] <Pfad>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23428,106 +23768,106 @@
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "Konfiguration in der .gitmodules-Datei entfernen"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <name> [<Wert>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <Name>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
"Arbeitsverzeichnis befindet."
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "Standard-Tracking-Branch auf master setzen"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "Standard-Tracking-Branch setzen"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "Option --branch oder --default erforderlich"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch und --default schließen sich gegenseitig aus"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Füge existierendes Repository in '%s' dem Index hinzu\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' existiert bereits und ist kein gültiges Git-Repository"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
"Ein Git-Verzeichnis für '%s' wurde lokal gefunden mit den Remote-"
-"Repositories:"
+"Repositories:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
"von\n"
@@ -23535,40 +23875,89 @@
"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
"Verzeichnis\n"
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
-"wählen Sie einen anderen Namen mit der Option '--name'.\n"
+"wählen Sie einen anderen Namen mit der Option '--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
-msgstr "Kann Submodul '%s' nicht auschecken"
+msgstr "kann Submodul '%s' nicht auschecken"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "Branch des Repositories zum Auschecken beim Klonen"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Fehler beim Registrieren von Submodul '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existiert bereits im Index"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' existiert bereits im Index und ist kein Submodul"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "Branch des Repositories zum Hinzufügen als Submodul"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<Optionen>...] --url <URL> --path <Pfad> --"
-"name <Name>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "nur Fehlermeldungen ausgeben"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "die Objekte von Referenz-Repositories ausleihen"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"legt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt "
+"standardmäßig dessen Pfad zu nehmen"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<Optionen>] [--] <Repository> [<Pfad>]"
+
+#: builtin/submodule--helper.c:3297
+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."
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: '%s' muss absolut sein oder mit ./|../ beginnen"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' ist kein gültiger Submodul-Name"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -23594,21 +23983,21 @@
msgid "shorten ref output"
msgstr "verkürzte Ausgabe der Referenzen"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "Grund"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
-"\t\t<Tagname> [<Commit>]"
+"git tag [-a | -s | -u <Schlüssel-ID>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
+" <Tagname> [<Commit>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23618,12 +24007,12 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--"
"points-at <Objekt>]\n"
-"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
+" [--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
"[<Muster>...]"
#: builtin/tag.c:30
@@ -23690,130 +24079,130 @@
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "die Option -n ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "--contains ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -23827,214 +24216,209 @@
msgid "failed to create directory %s"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "Konnte Datei '%s' nicht erstellen"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "Konnte Verzeichnis '%s' nicht löschen"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
"geändert"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
"Verzeichnisses nicht geändert"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
"Unterverzeichnis geändert"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
"geändert"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
"nicht geändert"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "\"index-only\" Einträge überspringen"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
"Datenbank hinzugefügt"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr ""
"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "Dateien als \"fsmonitor valid\" markieren"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "\"fsmonitor valid\"-Bit löschen"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -24042,7 +24426,7 @@
"core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n"
"wenn sie wirklich das Splitting des Index aktivieren möchten"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -24050,7 +24434,7 @@
"core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich das Splitting des Index deaktivieren möchten"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24058,11 +24442,11 @@
"core.untrackedCache ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24071,23 +24455,23 @@
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich aktivieren möchten"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "Dateisystem-Monitor aktiviert"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
@@ -24095,7 +24479,7 @@
"Monitor\n"
"wirklich deaktivieren möchten."
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "Dateisystem-Monitor deaktiviert"
@@ -24112,19 +24496,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<Optionen>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "diese Referenz löschen"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "<Referenzname> aktualisieren, nicht den Verweis"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "Aktualisierungen von der Standard-Eingabe lesen"
@@ -24140,21 +24524,21 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "nach einem einzigen Request/Response-Austausch beenden"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "direkt nach der initialen Angabe der Commits beenden"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "info/refs für git-http-backend übergeben"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
"ist"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
@@ -24190,63 +24574,58 @@
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "Fehler beim Löschen von '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Entferne %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -24256,7 +24635,7 @@
"Benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n"
"oder 'remove' zum Löschen."
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24266,149 +24645,149 @@
"Benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
"Löschen."
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "initialisiere"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
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:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
"Remote-Tracking-Branch herzustellen"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason benötigt --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "mit --lock hinzugefügt"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
"gesperrt ist"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "Konnte Zielname aus '%s' nicht bestimmen."
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -24418,7 +24797,7 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -24427,40 +24806,40 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force "
"zum Löschen"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
"ist"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24470,7 +24849,7 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24479,17 +24858,17 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "repariere: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "Fehler: %s: %s"
@@ -24617,17 +24996,17 @@
msgid "close failed on standard output"
msgstr "Fehler beim Schließen der Standard-Ausgabe."
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "Kann %s nicht als eingebauten Befehl behandeln."
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24636,12 +25015,12 @@
"Verwendung: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
@@ -24688,65 +25067,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "Socket/Pipe bereits in Benutzung: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "konnte Server nicht starten auf: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "Daemon konnte nicht im Hintergrund erzeugt werden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid fehlgeschlagen"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "Daemon ist noch nicht online"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "Fehler beim Starten des Daemons"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid ist verwirrt"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "Daemon ist noch nicht heruntergefahren"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<Name>] [<Optionen>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<Name>] [<Threads>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<Name>] [<Threads>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<Name>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<Name>] [<Token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<Name>] [<bytecount>] [<Byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24754,86 +25099,82 @@
"test-helper simple-ipc multiple [<Name>] [<Threads>] [<bytecount>] "
"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "Name oder Pfadname des UNIX-Domain-Sockets"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "Name der benannten Pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "Anzahl der Threads im Thread-Pool des Servers"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "Sekunden, um auf Starten oder Stoppen des Daemons zu warten"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "Anzahl von Bytes"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "Anzahl der Anfragen pro Thread"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "Byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "Ballast-Zeichen"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "Token"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "Befehlstoken, der an den Server gesendet werden soll"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr ""
-"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
-"nicht unterstützt."
+"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht "
+"unterstützt"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt."
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24849,45 +25190,52 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "ungültige Serverantwort; '%s' bekommen"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "Repository '%s' nicht gefunden"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Authentifizierung fehlgeschlagen für '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"auf '%s' kann nicht mit Konfiguration http.pinnedPubkey zugegriffen werden: "
+"%s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "Umleitung nach %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
@@ -24897,83 +25245,83 @@
"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
"erhöhen"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: unerwartetes Antwort-Endpaket"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC fehlgeschlagen; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "Kann solche großen Übertragungen nicht verarbeiten."
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d Bytes des Längen-Headers wurden empfangen"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d Bytes des Bodys werden noch erwartet"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "\"fetch\" fehlgeschlagen."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "HTTP-Transport unterstützt nicht %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "\"git-http-push\" fehlgeschlagen"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
@@ -24994,46 +25342,46 @@
msgid "object filtering"
msgstr "Filtern nach Objekten"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "Verfallsdatum"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "Pfadspezifikation aus einer Datei lesen"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "Schüssel"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
@@ -25751,41 +26099,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "führe $command aus"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"Exit-Code $res von '$command' ist < 0 oder >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"'bisect-state $state' wurde mit Fehlerwert $res beendet"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "'bisect run' erfolgreich ausgeführt"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25827,53 +26140,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
-#: git-submodule.sh:179
-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:189
-#, 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:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' hat keinen Commit ausgecheckt"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, 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:542
+#: git-submodule.sh:411
#, 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:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25882,409 +26159,11 @@
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
-"$sha1 direkt anzufordern:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
-"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-
-#: git-submodule.sh:583
-#, 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:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
-"fehlgeschlagen"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Automatischen Stash angewendet."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kann $stash_sha1 nicht speichern."
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Anwendung des automatischen Stash resultierte in Konflikten.\n"
-"Ihre Änderungen sind im Stash sicher.\n"
-"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Führe Rebase aus ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Befehle:\n"
-"p, pick <Commit> = Commit verwenden\n"
-"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
-"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
-"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
-"verwerfen\n"
-"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-"d, drop <Commit> = Commit entfernen\n"
-"l, label <Label> = aktuellen HEAD mit Label versehen\n"
-"t, reset <Label> = HEAD zu einem Label umsetzen\n"
-"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
-". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
-". (oder die eine Zeile, wenn keine originale Merge-Commit-"
-"Beschreibung\n"
-". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
-". Commit-Beschreibung.\n"
-"\n"
-"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
-"ausgeführt.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sie können den Commit nun nachbessern mit:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: kein Commit der gepickt werden kann"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Ungültiger Commit-Name: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Spule vor zu $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kann nicht zu $sha1 vorspulen"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kann HEAD nicht auf $first_parent setzen"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fehler beim Wiederholen des Merges von $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Konnte $sha1 nicht picken"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Das ist Commit-Beschreibung #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Das ist eine Kombination aus $count Commit."
-msgstr[1] "Das ist eine Kombination aus $count Commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kann $fixup_msg nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Das ist eine Kombination aus 2 Commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Konnte $sha1... ($rest) nicht anwenden"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... "
-"$rest\n"
-"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, "
-"oder\n"
-"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
-"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
-"können."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Angehalten bei $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Führe aus: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ausführung fehlgeschlagen: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sie können das Problem beheben, und dann\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-"ausführen."
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Ausführung erfolgreich: $rest\n"
-"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
-"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
-"Führen Sie dann aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Unbekannter Befehl: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem "
-"Arbeitsverzeichnis.\n"
-"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
-"führen Sie aus:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Im Anschluss führen Sie zum Fortfahren aus:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
-"finden"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
-"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' "
-"erneut\n"
-"aus."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Konnte Editor nicht ausführen."
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Konnte $switch_to nicht auschecken."
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Kein HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Konnte nicht als interaktiven Rebase markieren."
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
-msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Leere Commits sind auskommentiert."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -26304,61 +26183,37 @@
"fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
-"sind."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
"Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
-"nicht zum Commit vorgemerkt sind."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
-"Änderungen."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
-"nicht committete Änderungen."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
"Änderungen."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
"ausführen."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
@@ -26809,7 +26664,7 @@
msgstr ""
"Datei '%s' existiert, aber es könnte auch der Bereich von Commits sein,\n"
"für den Patches erzeugt werden sollen. Bitte machen Sie dies eindeutig\n"
-"indem Sie ...\n"
+"indem Sie...\n"
"\n"
" * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
@@ -27026,7 +26881,7 @@
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
@@ -27051,30 +26906,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "Kann Nachricht nicht als 7bit versenden."
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "Ungültiges Transfer-Encoding"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -27085,12 +26940,12 @@
"%s\n"
"Warnung: Es wurden keine Patches gesendet\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "konnte %s nicht öffnen: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27099,13 +26954,13 @@
"fatal: %s:%d ist länger als 998 Zeichen\n"
"Warnung: Es wurden keine Patches gesendet\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
diff --git a/po/es.po b/po/es.po
index d7c555e..ced2eb6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 11:37-0500\n"
+"POT-Creation-Date: 2021-11-04 08:34+0800\n"
+"PO-Revision-Date: 2021-11-07 18:53-0500\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@ -18,214 +18,214 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.0\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "¿Ahh (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "no se pudo leer índice"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binario"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nada"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sin cambios"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualizar"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "no se pudo poner en stage '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "no se pudo escribir índice"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualizada %d ruta\n"
msgstr[1] "actualizadas %d rutas\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry falló para la ruta '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revertir"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "No se pudo analizar HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertida %d ruta\n"
msgstr[1] "revertidas %d rutas\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "No hay archivos sin rastrear.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Agregar no rastreados"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "agregada %d ruta\n"
msgstr[1] "agregadas %d rutas\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorando lo no fusionado: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Actualización del parche"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Revisión de diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "mostrar rutas con cambios"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "revertir conjunto de cambios en stage a la versión de HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "elegir fragmentos y actualizar de forma selectiva"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "ver diff entre HEAD e index"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Mostrar ayuda:"
-#: add-interactive.c:1030
-msgid "select a single item"
-msgstr "selecciona un único objeto"
-
-#: add-interactive.c:1032
-msgid "select a range of items"
-msgstr "selecciona un rango de objetos"
-
#: add-interactive.c:1034
-msgid "select multiple ranges"
-msgstr "selecciona múltiples rangos"
+msgid "select a single item"
+msgstr "seleccionar un único objeto"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1036
+msgid "select a range of items"
+msgstr "seleccionar un rango de objetos"
+
+#: add-interactive.c:1038
+msgid "select multiple ranges"
+msgstr "seleccionar múltiples rangos"
+
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "seleccionar objeto basado en prefijo único"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "quitar objetos especificados"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "escoger todos los objetos"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(vacío) finalizar selección"
-#: add-interactive.c:1079
-msgid "select a numbered item"
-msgstr "selecciona un objeto numerado"
-
#: add-interactive.c:1083
-msgid "(empty) select nothing"
-msgstr "(vacío) selecciona nada"
+msgid "select a numbered item"
+msgstr "seleccionar un objeto numerado"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1087
+msgid "(empty) select nothing"
+msgstr "(vacío) no seleccionar nada"
+
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Ahora qué"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "rastreado"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "no rastreado"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "ruta"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "no se pudo refrescar el índice"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
@@ -255,8 +255,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para el área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para el área de stage."
#: add-patch.c:42
msgid ""
@@ -298,8 +298,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para hacer stash."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para hacer stash."
#: add-patch.c:64
msgid ""
@@ -313,7 +313,8 @@
"n - no hacer stash a este fragmento\n"
"q - quit; no hacer stash a este fragmento o a ninguno de los restantes\n"
"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
-"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo\n"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo\n"
#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
@@ -340,8 +341,8 @@
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente "
-"para sacar del área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para sacar del área de stage."
#: add-patch.c:88
msgid ""
@@ -353,10 +354,12 @@
msgstr ""
"y - sacar desde hunk del área de stage\n"
"n - no sacar este fragmento del area de stage\n"
-"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el "
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
"archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo\n"
#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
@@ -376,7 +379,7 @@
#: add-patch.c:106 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este fragmetno al índice [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar este fragmento al índice [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
@@ -502,7 +505,8 @@
#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
#: add-patch.c:179
msgid ""
@@ -591,7 +595,7 @@
#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
+msgstr "Modo de edición manual de hunk -- mira abajo para una guía rápida.\n"
#: add-patch.c:1086
#, c-format
@@ -614,7 +618,8 @@
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Si esto no aplica de manera limpia, se te da la oportunidad de\n"
-"editar nuevamente. Si todas las líneas del fragmento son eliminadas, entonces\n"
+"editar nuevamente. Si todas las líneas del fragmento son eliminadas, "
+"entonces\n"
"la edición es abortada y el fragmento queda sin cambios.\n"
#: add-patch.c:1133
@@ -668,11 +673,12 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"j - deja este fragmento sin decidir, ver el siguiente fragmento sin decisión\n"
-"J - deja este fragmento sin decidir, ver siguiente fragmento \n"
-"k - deja este fragmento sin decidir, ver fragmento previo sin decidir\n"
-"K - deja este fragmento sin decidir, ver fragmento anterior\n"
-"g - selecciona un fragmento a dónde ir\n"
+"j - dejar este fragmento sin decidir, ver el siguiente fragmento sin "
+"decisión\n"
+"J - dejar este fragmento sin decidir, ver siguiente fragmento \n"
+"k - dejar este fragmento sin decidir, ver fragmento previo sin decidir\n"
+"K - dejar este fragmento sin decidir, ver fragmento anterior\n"
+"g - seleccionar un fragmento a dónde ir\n"
"/ - buscar un fragmento que cumpla con el regex dado\n"
"s - separar el fragmento actual en más pequeños\n"
"e - editar manualmente el fragmento actual\n"
@@ -744,7 +750,7 @@
msgid "'git apply' failed"
msgstr "falló 'git apply'"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -753,38 +759,38 @@
"\n"
"Desactivar este mensaje con \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No es posible %s porque tienes archivos sin fusionar."
-#: advice.c:270
+#: advice.c:196
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."
@@ -792,41 +798,48 @@
"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
"como sea apropiado, para marcar la resolución y realizar un commit."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"El siguiente pathspecs no concuerda con ninguna ruta elegible, pero "
-"concuerda con\n"
-"entradas del índice fuera del checkout sparse actual:\n"
+"La siguiente ruta y/o pathspecs coinciden con rutas existentes\n"
+"fuera de su definición para sparse-checkout, por lo que no\n"
+"se actualizarán en el índice:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Deshabilitar o modificar las reglas de escasez si intenta actualizar dichas "
-"entradas."
+"Si desea actualizar esa entrada, intente lo siguiente:\n"
+"* Use la opción --sparse.\n"
+"* Deshabilite o modifique las reglas de escasez."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1015,49 +1028,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** peligro: el archivo %s está vacío pero no es borrado"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "parche binario corrupto en la línea %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "parche binario no reconocido en la línea %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "parche que solo contiene basura en la línea %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "no es posible leer el enlace simbólico %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "no es posible abrir o leer %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "comienzo inválido de línea: '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1066,23 +1079,24 @@
"mientras se buscaba:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "data perdida en parche binario para '%s'"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"no se puede revertir-aplicar un parche binario sin el fragmento revertido a '%s'"
+"no se puede revertir-aplicar un parche binario sin el fragmento revertido a "
+"'%s'"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1090,289 +1104,290 @@
"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
"actuales."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "la postimagen necesaria %s para '%s' no se puede leer"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el parche binario no aplica para '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el parche binario para '%s' crea un resultado incorrecto (esperando %s, se "
"obtuvo %s)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el parche falló: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "leyendo de '%s' tras un enlace simbólico"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "la ruta %s ha sido renombrada/suprimida"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existe en el índice"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el índice"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"el repositorio carece del blob necesario para realizar un merge de tres vías."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Realizando un merge de tres vías...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no se pueden leer los contenidos actuales de '%s'"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Falló en realizar fusión de tres vías...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Parche aplicado a '%s' con conflictos.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Parche aplicado a '%s' limpiamente\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Retrocediendo a la aplicación...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "parche de eliminación deja contenidos en el archivo"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo incorrecto"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "ruta inválida '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el índice"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' está tras un enlace simbólico"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta información del sha1 o es inútil para el submódulo %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta información sha1 o es inútil (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo añadir %s al índice temporal"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un índice temporal para %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede eliminar %s del índice"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submódulo %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible hacer stat en el archivo recién creado '%s'"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no es posible crear una copia de seguridad para el archivo recién creado %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "falló escribir a '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "error interno"
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Hunk #%d rechazado."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "no es posible leer el archivo índice"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco silenciado"
msgstr[1] "%d errores de espacios en blanco silenciados"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línea agrega errores de espacios en blanco."
msgstr[1] "%d líneas agregan errores de espacios en blanco."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1381,139 +1396,139 @@
msgstr[1] ""
"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "num"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el número de líneas agregadas y eliminadas en notación decimal"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche sea aplicable al índice actual"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca los nuevos archivos con `git add --intent-to-add`"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el árbol de trabajo"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toque fuera del área de trabajo"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "también aplicar el parche (usar con --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"intentar merge de tres vías, regresar al parche normal si el parche no aplica"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir un índice temporal basado en la información de índice incrustada"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "asegurar que al menos <n> líneas del contexto concuerden"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "acción"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detectar líneas nuevas o modificadas que contienen errores de espacios en "
"blanco"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr ""
"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "no espera al menos una línea del contexto"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
"archivo"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de líneas en los headers del fragmento"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "raíz"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
@@ -1585,152 +1600,151 @@
msgid "cannot read %s"
msgstr "no se puede leer %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "no se pudo leer '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ruta especificada '%s' no concordó con ningún archivo"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "no existe el ref: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nombre de objeto no válido: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "no es un objeto tree: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "directorio de trabajo actual no rastreado"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Archivo no encontrado: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "No es un archivo regular: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "formato de crónica"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefijo"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en la crónica"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "archivo"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "incluir archivos sin seguimiento a la crónica"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "escribe la crónica en este archivo"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "leer .gitattributes en el directorio de trabajo"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "reportar archivos en la crónica por stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "configurar nivel de compresión"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "listar los formatos de crónica soportados"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repo"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la crónica del repositorio remoto <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "comando"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archive remoto"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opción inesperada --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Opción --exec solo puede ser utilizada con --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opción inesperada --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de crónica desconocido '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soportado para formato '%s': -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no es un nombre de atributo válido"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no permitido: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1738,22 +1752,22 @@
"Los patrones negativos son ignorados en los atributos de git\n"
"Usa '\\!' para comenzar literalmente con exclamación."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Revisa las comillas en el archivo '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "¡No podemos biseccionar más!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "No es un nombre de commit válido %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1762,7 +1776,7 @@
"La base de fusión %s está mal.\n"
"Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1771,7 +1785,7 @@
"La base de fusión %s es nueva.\n"
"Esta propiedad ha cambiado entre %s y [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1780,7 +1794,7 @@
"La base de fusión %s es %s.\n"
"Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1791,7 +1805,7 @@
"git bisect no puede trabajar bien en este caso.\n"
"¿Tal vez confundiste las revisiones %s y %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1803,36 +1817,36 @@
"%s.\n"
"Vamos a continuar de todas maneras."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Biseccionando: una base de fusión debe ser probada\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "una revisión %s es necesaria"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "falló leer las refs de bisect"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s fue tanto %s como %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1841,7 +1855,7 @@
"No se encontró commit que se pueda probar.\n"
"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1851,7 +1865,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1871,11 +1885,12 @@
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "falló la configuración del recorrido de revisiones"
@@ -2065,8 +2080,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
@@ -2124,7 +2139,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
@@ -2166,7 +2181,7 @@
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "versión de hash inválida"
@@ -2211,192 +2226,192 @@
msgid "unable to find all commit-graph files"
msgstr "no es posible encontrar los archivos commit-graph"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"commit-graph requiere datos de generación de desbordamiento pero no tiene "
"ninguno"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Calculando niveles topológicos de commit graph"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Recolectando commits referenciados"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Encontrando commits para commit graph en %d pack"
msgstr[1] "Encontrando commits para commit graph en %d packs"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "error al agregar pack %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "error al abrir index para %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "falló al escribir el número correcto de ids de base graph"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "no es posible crear una capa de gráfico temporal"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "no se pudo poner permisos compartidos a '%s'"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Escribiendo commit graph en %d paso"
msgstr[1] "Escribiendo commit graph en %d pasos"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "no se pudo abrir la cadena de archivos commit-graph"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "no se pudo renombrar el archivo base commit-graph"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "falló al renombrar el archivo temporal commit-graph"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Escaneando commits fusionados"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Fusionando commit-graph"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"intentando escribir un commit-graph, pero 'core.commitGraph' está "
"deshabilitado"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"falló al analizar el commit %s de la base de datos de objetos para commit-"
"graph"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "OID del árbol raíz para commit %s en commit-graph es %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista padre de commit-graph para commit %s es demasiada larga"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista de padres de commit-graph para commit %s termina prematuramente"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2404,7 +2419,7 @@
"commit-graph tiene número de generación cero para %s, pero no cero en otro "
"lugar"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2412,29 +2427,29 @@
"commit-graph tiene número de generación no cero para %s, pero cero en otro "
"lugar"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "no se puede analizar %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "¡%s %s no es un commit!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2448,33 +2463,33 @@
"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
"y será eliminado en una versión futura de Git.\n"
"\n"
-"Por favor use \"git replace --convert-graft-file\"\n"
+"Por favor usa \"git replace --convert-graft-file\"\n"
"para convertir los grafts en refs.\n"
"\n"
-"Apapa este mensaje ejecutando\n"
+"Apaga este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "El commit %s tiene una buena firma GPG por %s\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2489,7 +2504,7 @@
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2504,36 +2519,36 @@
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
"la configuración relativa incluye condicionales que deben venir de archivos"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "formato config inválido: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "falta la variable de entorno '%s' para la configuración '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
@@ -2543,298 +2558,298 @@
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "clave de config vacía"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "conteo malogrado en %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "demasiadas entradas en %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "llave de configuración faltante %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "valor de config faltante para %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala línea de config %d en el blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala línea de config %d en el archivo %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala línea de config %d en la entrada standard"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "mala línea de config %d en el submódulo-blob %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "mala línea de config %d en la línea de comando %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numérico '%s' para '%s': %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en el blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en el archivo %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "mal valor de config numérico '%s' para '%s' en la entrada standard: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"mal valor de config numérico '%s' para '%s' en el submódulo-blob %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"mal valor de config numérico '%s' para '%s' en la línea de comando %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "mal valor de config numérico '%s' para '%s' en %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "mal valor de config booleano '%s' para '%s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falló al expandir el directorio de usuario en: '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' para '%s' no es una marca de tiempo válida"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "largo de abreviatura fuera de rango: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
-msgstr "core.commentChar debería tener solo un caracter"
+msgstr "core.commentChar debería tener solo un carácter"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz de cargar configuración de objeto blob '%s'"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no es posible resolver configuración de blob '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s inválido: '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "no es posible hacer mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nombre de sección inválido: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
@@ -2869,72 +2884,72 @@
msgid "expected flush after capabilities"
msgstr "se espera flush tras capacidades"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignorando capacidades tras primera línea '%s'"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "error de protocolo: capacidades imprevistas^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "el repositorio en el otro lado no puede ser superficial"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquete inválido"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "error de protocolo: '%s' inesperado"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "respuesta de ls-refs inválida: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "flush esperado tras listado de refs"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "se esperaba un paquete final luego del ref listing"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' no es soportado"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no es posible configurar SO_KEEPALIVE en el socket"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Revisando %s... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no se puede revisar %s (puerto %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2943,7 +2958,7 @@
"hecho.\n"
"Conectando a %s (puerto %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2953,78 +2968,78 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "hecho."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no es posible revisar %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "puerto desconocido %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "hostname extraño '%s' bloqueado"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "puerto extraño '%s' bloqueado"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "no se puede comenzar proxy %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-"no hay ruta especificada; vea 'git help pull' para sintaxis válida de url"
+"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "variante 'simple' de ssh no soporta -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "variante 'simple' de ssh no soporta -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "variante ssh 'simple' no soporta configurar puerto"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "ruta extraña '%s' bloqueada"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "No se pudo ejecutar 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
@@ -3169,17 +3184,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "rehusando trabajar con campo protocolo faltante en la credencial"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url contiene una nueva línea en su componente %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "url no tiene scheme: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "url de credencial no puede ser analizada: %s"
@@ -3281,23 +3296,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "valor desconocido para --diff-merges: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base no funciona con rangos"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base solo funciona con confirmaciones"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "no es posible obtener HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "no se encontró base de fusión"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "múltiples bases de fusión encontradas"
@@ -3310,20 +3325,20 @@
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr ""
-"No es un repositorio git. Use --no-index para comparar dos paths fuera del "
+"No es un repositorio git. Usa --no-index para comparar dos paths fuera del "
"árbol de trabajo"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falló al analizar porcentaje de corte de dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parámetro '%s' de dirstat desconocido\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3331,7 +3346,7 @@
"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3341,7 +3356,7 @@
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3349,13 +3364,13 @@
"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
"modos de espacios en blanco"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3364,49 +3379,49 @@
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
-"-G y --pickaxe-regex son mutuamente exclusivos, use --pickaxe-regex con -S"
+"-G y --pickaxe-regex son mutuamente exclusivos, usa --pickaxe-regex con -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
-"--pickaxe-all y --find-object son mutuamente exclusivas, use --pickaxe-all "
+"--pickaxe-all y --find-object son mutuamente exclusivas, usa --pickaxe-all "
"con -G y -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3415,42 +3430,42 @@
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3458,159 +3473,159 @@
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex inválido para -I: '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
-msgstr "genera diffs con <n> líneas de contexto"
+msgstr "generar diffs con <n> líneas de contexto"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
-msgstr "genera el diff en formato raw"
+msgstr "generar el diff en formato raw"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --raw'"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-"muestra la distribución de cantidades de cambios relativas para cada "
+"mostrar la distribución de cantidades de cambios relativas para cada "
"subdirectorio"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinonimo para --dirstat=archivos,param1,param2..."
+msgstr "sinónimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-"advierte si cambios introducen conflictos de markers o errores de espacios "
+"advertir si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5439
-msgid "generate diffstat with a given width"
-msgstr "genera diffstat con un ancho dado"
-
-#: diff.c:5442
-msgid "generate diffstat with a given name width"
-msgstr "genera diffstat con un ancho de nombre dado"
-
-#: diff.c:5445
-msgid "generate diffstat with a given graph width"
-msgstr "genera diffstat con un ancho de graph dado"
-
#: diff.c:5447
+msgid "generate diffstat with a given width"
+msgstr "generar diffstat con un ancho dado"
+
+#: diff.c:5450
+msgid "generate diffstat with a given name width"
+msgstr "generar diffstat con un ancho de nombre dado"
+
+#: diff.c:5453
+msgid "generate diffstat with a given graph width"
+msgstr "generar diffstat con un ancho de graph dado"
+
+#: diff.c:5455
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
-msgstr "genera diffstat con líneas limitadas"
+msgstr "generar diffstat con líneas limitadas"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
-msgstr "genera un resumen compacto de diffstat"
+msgstr "generar un resumen compacto de diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
-msgstr "muestra un diff binario que puede ser aplicado"
+msgstr "mostrar un diff binario que puede ser aplicado"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3618,7 +3633,7 @@
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3626,330 +3641,330 @@
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino dado en lugar de \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-"muestra el contexto entre hunks de diff hasta el número especificado de "
+"mostrar el contexto entre hunks de diff hasta el número especificado de "
"líneas"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<char>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
-msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
-
-#: diff.c:5490
-msgid "specify the character to indicate an old line instead of '-'"
-msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
-
-#: diff.c:5495
-msgid "specify the character to indicate a context instead of ' '"
-msgstr "especifica el char para indicar un contexto en lugar de ' '"
+msgstr "especificar el char para indicar una nueva línea en lugar de '+'"
#: diff.c:5498
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especificar el char para indicar una línea vieja en lugar de '-'"
+
+#: diff.c:5503
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especificar el char para indicar un contexto en lugar de ' '"
+
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
-msgstr "omite la preimage para borrados"
+msgstr "omitir la preimage para borrados"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
-msgstr "usa archivos no modificados como fuente para encontrar copias"
-
-#: diff.c:5517
-msgid "disable rename detection"
-msgstr "deshabilita detección de renombrados"
-
-#: diff.c:5520
-msgid "use empty blobs as rename source"
-msgstr "usa blobs vacíos como fuente de renombramiento"
-
-#: diff.c:5522
-msgid "continue listing the history of a file beyond renames"
-msgstr ""
-"continua listando el historial de un archivo más allá de renombramientos"
+msgstr "usar archivos no modificados como fuente para encontrar copias"
#: diff.c:5525
+msgid "disable rename detection"
+msgstr "deshabilitar detección de renombrados"
+
+#: diff.c:5528
+msgid "use empty blobs as rename source"
+msgstr "usar blobs vacíos como fuente de renombramiento"
+
+#: diff.c:5530
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"continuar listando el historial de un archivo más allá de renombramientos"
+
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-"previene detección de renombramientos/copias si el número de destinos para "
+"prevenir detección de renombramientos/copias si el número de destinos para "
"renombramientos/copias excede el límite dado"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
-msgstr "produce el diff más pequeño posible"
+msgstr "producir el diff más pequeño posible"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
-msgstr "ignora carrier-return al final de la línea"
+msgstr "ignorar carrier-return al final de la línea"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
-msgstr "ignora cambios cuyas líneas son todas en blanco"
+msgstr "ignorar cambios cuyas líneas son todas en blanco"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
-msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
+msgstr "ignorar cambios cuyas líneas concuerdan con <regex>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
-msgstr "escoge un algoritmo para diff"
+msgstr "escoger un algoritmo para diff"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "genera un diff usando algoritmo \"anchored diff\""
+msgstr "generar un diff usando algoritmo \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
+"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
-msgstr "usa <regex> para decidir qué es una palabra"
+msgstr "usar <regex> para decidir qué es una palabra"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
+"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra "
"paths relativos"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5589
-msgid "swap two inputs, reverse the diff"
-msgstr "cambia dos inputs, invierte el diff"
-
-#: diff.c:5591
-msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-
-#: diff.c:5593
-msgid "disable all output of the program"
-msgstr "deshabilita todo el salida del programa"
-
-#: diff.c:5595
-msgid "allow an external diff helper to be executed"
-msgstr "permite la ejecución de un diff helper externo"
-
#: diff.c:5597
-msgid "run external text conversion filters when comparing binary files"
-msgstr ""
-"ejecuta filtros de conversión de texto externos cuando comparando binarios"
+msgid "swap two inputs, reverse the diff"
+msgstr "cambiar dos inputs, invierte el diff"
#: diff.c:5599
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "terminar con 1 si hubieron diferencias, de lo contrario con 0"
+
+#: diff.c:5601
+msgid "disable all output of the program"
+msgstr "deshabilitar toda la salida del programa"
+
+#: diff.c:5603
+msgid "allow an external diff helper to be executed"
+msgstr "permitir la ejecución de un diff helper externo"
+
+#: diff.c:5605
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"ejecutar filtros de conversión de texto externos cuando comparando binarios"
+
+#: diff.c:5607
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
-msgstr "especifica como son mostradas las diferencias en submódulos"
+msgstr "especificar como son mostradas las diferencias en submódulos"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del índice"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
-msgstr "trata entradas 'git add -N' como reales en el índice"
+msgstr "tratar entradas 'git add -N' como reales en el índice"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<string>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-"busca diferencias que cambien el número de ocurrencias del string "
+"buscar diferencias que cambien el número de ocurrencias del string "
"especificado"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-"busca por diferencias que cambien el número de ocurrencias del regex "
+"buscar diferencias que cambien el número de ocurrencias del regex "
"especificado"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<ruta>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "mostrar el cambio en la ruta especificada primero"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
-msgstr "saltar el salida de la ruta especificada"
+msgstr "saltar la salida de la ruta especificada"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id-de-objeto>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-"busca diferencias que cambien el número de ocurrencias para el objeto "
+"buscar diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
-msgstr "selecciona archivos por tipo de diff"
+msgstr "seleccionar archivos por tipo de diff"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"detección exhaustiva de cambio de nombre fue saltada por haber demasiados "
"archivos."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber demasiados "
"archivos."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3962,7 +3977,7 @@
msgid "failed to read orderfile '%s'"
msgstr "falló al leer archivo de orden '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Realizando una detección de cambios de nombre inexacta"
@@ -4001,339 +4016,416 @@
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "falló al conseguir el nombre y la información del kernel"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No se pudo adivinar ningún nombre de directorio.\n"
+"Por favor especifica un directorio en la línea de comando"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo hacer stat en el archivo '%s'"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ruta de namespace de git mala \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no se pudo configurar GIT_DIR a '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "demasiados argumentos para ejecutar %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista de superficiales esperada"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack: se esperaba un flush packet luego de la lista de "
"superficiales"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "no se puede escribir al remoto"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea shallow inválida: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea unshallow inválida: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "shallow no encontrado: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "listo"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "error de protocolo: header de paquete erróneo"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede ejecutar %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: salida de index-pack no válida"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "El servidor soporta %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "El servidor no soporta clientes superficiales"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "El servidor no soporta el formato de objetos de este repositorio"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "el repositorio fuente es superficial, rechazando clonado."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "algoritmos no compatibles: cliente %s; servidor %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "el servidor no soporta el algoritmo '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "El servidor soporta filtración"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "error al leer header de sección '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "error al procesar acks: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "se esperaba que el packfile fuera enviado luego del 'listo'"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "error al procesar información de superficiales: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error al procesar refs deseadas: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: se esperaba un paquete final de respuesta"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "remoto no mandó todos los objetos necesarios"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "'listo' inesperado del remoto"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile necesita ser configurado y existe para "
+"verificación de firmas ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify se necesita para la verficación de ssh "
+"(disponible en openssh versión 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "archivo de revocación de firmas ssh configurado pero no encontrado: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "firma mala/incompatible '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "error al conseguir la huella de ssh para la llave '%s'"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "user.signingkey o gpg.ssh.defaultKeyCommand necesitan ser configurados"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand exitoso pero no retornó ninguna llave: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand falló: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg falló al firmar los datos"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey necesita ser configurado para firmar con ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falló al escribir la llave de firma para '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falló al escribir el buffer para lla llave de firma para '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signs se necesita para el firmado con ssh (disponible en "
+"openssh versión 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falló al leer la firma ssh desde '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorado color inválido '%.*s' en log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4341,109 +4433,109 @@
"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es "
"soportado con -P bajo PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "falló al hacer stat en '%s'"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr "comienza un área de trabajo (ver también: git help tutorial)"
-
#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comenzar un área de trabajo (mira también: git help tutorial)"
#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "examina el historial y el estado (ver también: git help revisions)"
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabajar en los cambios actuales (mira también: git help everyday)"
#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr "crece, marca y ajusta tu historial común"
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examinar el historial y el estado (mira también: git help revisions)"
#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr "colabora (mira también: git help workflows)"
+msgid "grow, mark and tweak your common history"
+msgstr "crecer, marcar y ajustar tu historial común"
-#: help.c:31
+#: help.c:28
+msgid "collaborate (see also: git help workflows)"
+msgstr "colaborar (mira también: git help workflows)"
+
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Comandos de Porcelana principales"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Comandos auxiliares / Manipuladores"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Comandos auxiliares / Interrogadores"
-#: help.c:34
-msgid "Interacting with Others"
-msgstr "Interactuando con Otros"
-
#: help.c:35
+msgid "Interacting with Others"
+msgstr "Interactuar con Otros"
+
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Comandos de bajo nivel / Manipuladores"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Comandos de bajo nivel / Interrogadores"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Comandos de bajo nivel / Sincronización de repositorios"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Comandos de bajo nivel / Auxiliares internos"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "comandos disponibles de git en '%s'"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipo de listado de comandos no soportado '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Las guías de conceptos de Git son:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
+msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Comandos externos"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Aliases de comando"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4452,31 +4544,36 @@
"'%s' parece ser un comando de git, pero no hemos\n"
"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' no es un comando de git. Mira 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuando asumiendo que quisiste decir '%s'."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Ejecutar '%s' en su lugar? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4490,16 +4587,16 @@
"\n"
"Los comandos más similares son"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opciones>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4513,6 +4610,15 @@
"\n"
"¿Quisiste decir alguno de estos?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
+"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identidad del autor desconocido\n"
@@ -4575,7 +4681,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
@@ -4656,7 +4762,7 @@
"No se puede crear '%s.lock': %s.\n"
"\n"
"Otro proceso git parece estar ejecutando en el repositorio, es decir\n"
-"un editor abierto con 'git commit'. Por favor asegúrese de que todos los "
+"un editor abierto con 'git commit'. Por favor asegúrate de que todos los "
"procesos\n"
"estén terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
"puede haber roto el repositorio antes:\n"
@@ -4672,7 +4778,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "valor inválido '%s' para lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línea inesperada: '%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "se esperaba un flush luego de argumentos ls-refs"
@@ -4680,37 +4791,37 @@
msgid "quoted CRLF detected"
msgstr "CRLF con comillas detectado"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "mala acción '%s' para '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Falló al fusionar el submódulo %s (no revisado)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Falló el fusionar submódulo %s (commits no siguen la base de fusión)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Nota: Fast-forward de submódulo %s a %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Falló al fusionar el submódulo %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4720,7 +4831,7 @@
"fusión:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4737,30 +4848,31 @@
"\n"
"el cual aceptará esta sugerencia.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n"
+"Falló al fusionar el submódulo %s, pero existen múltiples fusiones "
+"posibles:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Falló al ejecutar la fusión interna"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "No es posible agregar %s a la base de datos"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-fusionando %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4770,7 +4882,7 @@
"existente en %s se interpone con el cambio de nombres implícito, poniendo "
"la(s) siguiente(s) ruta(s) aquí: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4779,7 +4891,7 @@
"CONFLICTO (cambio de nombre de directorio implícito): No se puede mapear más "
"de una ruta para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4790,7 +4902,7 @@
"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, "
"sin que ningún destino obtuviera la mayoría de los archivos."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4799,7 +4911,7 @@
"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
"renombrado."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4808,7 +4920,7 @@
"Path actualizado: %s agregado en %s dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4817,7 +4929,7 @@
"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4826,7 +4938,7 @@
"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
"que fue renombrado en %s, sugerimos que debería ser movido a %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4836,13 +4948,13 @@
"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
"movido a %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4853,24 +4965,24 @@
"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
"resultar en marcadores de conflicto anidados."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado "
"en %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4879,7 +4991,7 @@
"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; "
"moviéndolo a %s en su lugar."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4889,7 +5001,7 @@
"fueron renombrados para que cada uno pueda ser grabado en algún lugar "
"diferente."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4899,24 +5011,24 @@
"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar "
"diferente."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "contenido"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "submódulo"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4925,7 +5037,7 @@
"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
"Versión %s de %s restante en el árbol."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4937,13 +5049,13 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
"la recopilación de información de fusión falló para los árboles %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4953,106 +5065,106 @@
"merge:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Ya está actualizado."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(commit erróneo)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo falló al refrescar la ruta '%s'; abortando fusión."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falló al crear la ruta '%s'%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Quitando %s para hacer espacio para un subdirectorio\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": ¿tal vez un conflicto D/F?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "rehusando perder el archivo no rastreado en '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no se puede leer el objeto %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "se esperaba blob para %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "falló al abrir '%s': %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falló al crear el enlace simbólico '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no sé qué hacer con %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rápido en submódulo %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falló al fusionar el submódulo %s (avance rápido no es posible)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
"cambio."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5061,7 +5173,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de "
"%s en el árbol."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5070,7 +5182,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5079,7 +5191,7 @@
"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
"dejada en el árbol, en %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5088,44 +5200,44 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol en %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "renombrar"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Rehusando perder el archivo sucio en %s"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
"interponiendo."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s es un directorio en %s agregando como %s más bien"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5134,18 +5246,18 @@
"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
"%s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5156,7 +5268,7 @@
"colocar %s porque el directorio %s fue renombrado a múltiples otros "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5165,81 +5277,81 @@
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
"%s"
-#: merge-recursive.c:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
@@ -5247,196 +5359,228 @@
msgid "failed to read the cache"
msgstr "falló al leer la cache"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
"el abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "el archivo multi-pack-index %s es demasiado pequeño"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versión %d de multi-pack-index no reconocida"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la versión de hash de índice de paquetes múltiples %u no coincide con la "
"versión %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "a multi-pack-index le falta el conjunto pack-name requerido"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "a multi-pack-index le falta el conjunto de offset del objeto requerido"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"nombres de paquete de multi-pack-index fuera de orden: '%s' antes de '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "no se puede almacenar el archivo de índice inverso"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no se puede analizar línea: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "línea mal formada: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorando el actual multi-pack-index; checksum no concuerda"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "no se pudo cargar pack"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "no se puede abrir index para %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Agregando packfiles a multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no se vió el pack-file que abandonar %s"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "pack preferido desconocido: '%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no se pueden seleccionar el paquete preferido %s sin objetos"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió el pack-file que abandonar %s"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "pack de referencia '% s' ha expirado"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "no hay archivos pack para indexar."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "no se pudo escribir bitmap multi-paquete"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "no se pudo escribir multi-pack-index"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "falló al borrar %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
"el archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "checksum incorrecto"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Buscando packfiles referidos"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "el midx no contiene oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Verificando orden de OID en multi-pack-index"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Contando objetos no referenciados"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Encontrando y borrando packfiles sin referencias"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "no se pudo iniciar pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "no se pudo finalizar pack-objects"
@@ -5462,7 +5606,7 @@
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-"No has concluido tu fusión preia de notas (%s existe).\n"
+"No has concluido tu fusión previa de notas (%s existe).\n"
"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
"confirmar/abortar la fusión previa antes de comenzar una nueva fusión de "
"notas."
@@ -5496,262 +5640,262 @@
msgid "Bad %s value: '%s'"
msgstr "Valor erróneo para %s: '%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"directorio de objetos %s no existe; revisa .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz de normalizar directorio de objetos: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "no es posible hacer fdopen en lockfile alternos"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "no es posible leer el archivo de alternativos"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "no es posible mover el nuevo archivo de alternativos al lugar"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "ruta '%s' no existe"
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repositorio de referencia '%s' como un checkout vinculado no es soportado "
"todavía."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositorio de referencia '%s' no es un repositorio local."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repositorio de referencia '%s' es superficial (shallow)"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "línea inválida mientras se analizaban refs alternas: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap falló %s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "archivo de objeto %s está vacío"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto suelto corrupto '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "basura al final del objeto suelto '%s'"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "tipo de objeto inválido"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no es posible desempacar header %s con --allow-unknown-type"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "incapaz de desempaquetar header %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no es posible analizar header %s con --allow-unknown-type"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "incapaz de analizar header %s"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "cabecera para %s es muy larga, excede %d bytes"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "falló al leer objeto %s"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "reemplazo %s no encontrado para %s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto suelto %s (guardado en %s) está corrompido"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "no es posible escribir archivo %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "falló de escritura"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "error al cerrar el archivo de objeto suelto"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"permisos insuficientes para agregar un objeto a la base de datos del "
"repositorio %s"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "no es posible crear un archivo temporal"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "no es posible escribir el archivo de objeto suelto"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd en objeto %s falló (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confundido por fuente de data de objetos inestable para %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "no se pudo leer el objeto para %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "commit corrupto"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "tag corrupto"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "error de lectura al indexar %s"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "lectura corta al indexar %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falló al insertar en la base de datos"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo de archivo no soportado"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s no es objeto válido"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash no concuerda para %s (se esperaba %s)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "no es posible hacer mmap a %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz de desempaquetar header de %s"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz de analizar header de %s"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
@@ -5880,12 +6024,25 @@
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "a multi-pack-index le falta un índice reveretido"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: no se pudo abrir el paquete"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "no se pudo obtener el tamaño de %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no se pudo encontrar %s en paquete %s en el offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "no se puede obtener el uso de disco de %s"
@@ -5915,47 +6072,47 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "no puede escribir y verificar el índice inverso"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "no se pudo hacer stat: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "no pudo hacer %s legible"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "no se pudo escribir el archivo promisor '%s'"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (¿.idx roto?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "objeto %s no puede ser mapeado %s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset más allá del índice de fin de paquete para %s (¿índice truncado?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opción `%s' espera un valor numérico"
@@ -5975,71 +6132,71 @@
msgid "malformed object name '%s'"
msgstr "nombre de objeto mal formado '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s requiere un valor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s es incompatible con %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : incompatible con otra cosa"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s no toma valores"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s no está disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "alias de --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opción desconocida en string no ascii: `%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -6047,49 +6204,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "No se pudo hacer que %s fuera escribible por el grupo"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Carácter de escape '\\' no permitido como último carácter en el valor attr"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Solo se permite una única especificación 'attr'."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "la especificación attr no puede estar vacía"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nombre de atributo %s inválido"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6097,54 +6278,54 @@
"la configuración global de 'literal' para patrones de ruta es incompatible "
"con las demás configuraciones globales de patrones de ruta"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "parámetro no válido para la magia de pathspec 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Magia de pathspec inválida '%.*s' en '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Falta ')' al final de la magia de pathspec en '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Magia de pathspec '%c' no implementada en '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' y 'glob' son incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' está fuera del repositorio en '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (nemotécnico: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magia de pathspec no soportada por este comando: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
-msgstr "la línea está mál entrecomillada: %s"
+msgstr "la línea está mal entrecomillada: %s"
#: pkt-line.c:92
msgid "unable to write flush packet"
@@ -6162,7 +6343,7 @@
msgid "flush packet write failed"
msgstr "limpieza de escritura de paquetes falló"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "error de protocolo: línea imposiblemente larga"
@@ -6170,7 +6351,7 @@
msgid "packet write with format failed"
msgstr "escritura de paquetes con formato falló"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
@@ -6179,25 +6360,25 @@
msgid "packet write failed: %s"
msgstr "escritura de paquetes falló: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "el remoto se colgó de manera inesperada"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
-msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
+msgstr "error de protocolo: mal carácter de largo de línea: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocolo: mal largo de línea %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "error remoto: %s"
@@ -6211,21 +6392,21 @@
msgid "unable to create threaded lstat: %s"
msgstr "no es posible crear lstat hilado: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato de --pretty"
#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación"
+msgstr "promisor-remote: no se puede bifurcar el subproceso de fetch"
#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo escribir al subproceso de fetch"
#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo cerrar stdin al subproceso de fetch"
#: promisor-remote.c:54
#, c-format
@@ -6240,20 +6421,20 @@
msgid "Removing duplicate objects"
msgstr "Quitando objetos duplicados"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "no se pudo leer salida de `log`"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6262,12 +6443,12 @@
"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit "
"': '%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no se puede analizar git header '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "falló al generar diff"
@@ -6296,7 +6477,7 @@
"%s: solo se pueden agregar archivos regulares, symbolic links o git-"
"directories"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' no tiene un commit checked out"
@@ -6316,16 +6497,16 @@
msgid "unable to stat '%s'"
msgstr "incapaz de hacer stat en '%s'"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' parece ser un directorio y un archivo a la vez"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Refrescar index"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6334,7 +6515,7 @@
"index.version configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6343,143 +6524,143 @@
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "mala firma 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "mala versión de índice %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "mala firma sha1 del archivo index"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index usa la extensión %.4s, cosa que no entendemos"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorando extensión %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato de índice desconocido 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "campo nombre malformado en el índice, cerca de ruta '%s'"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "entradas en stage desordenadas en index"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "múltiples entradas de stage para archivo fusionado '%s'"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entradas de stage desordenadas para '%s'"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "archivo índice corrompido"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no es posible crear hilo load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no es posible unir hilo load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: falló al abrir el archivo index"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: no se puede hacer stat en el índice abierto"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: archivo index más pequeño de lo esperado"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: no se pudo mapear el archivo index %s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no es posible crear hilo load_index_extensions: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no es posible unir hilo load_index_extensions: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no se pudo refrescar el índice compartido '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "falló al convertir a un índice sparse"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo hacer stat en '%s'"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no se pudo arreglar bits de permisos en '%s'"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no se puede eliminar hasta stage #0"
@@ -6536,13 +6717,13 @@
"\t, a menos que se use -C, en cuyo caso\n"
"\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n"
"\tpero abre el editor\n"
-"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n"
+"x, exec <commit> = ejecutar comando (el resto de la línea) usando un shell\n"
"b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n"
"d, drop <commit> = eliminar commit\n"
"l, label <label> = poner label al HEAD actual con un nombre\n"
"t, reset <label> = reiniciar HEAD al label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". crea un commit de fusión usando el mensaje original de\n"
+". crear un commit de fusión usando el mensaje original de\n"
". fusión (o la línea de oneline, si no se especifica un mensaje\n"
". de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
"\n"
@@ -6556,7 +6737,7 @@
msgstr[0] "Rebase %s en %s (%d comando)"
msgstr[1] "Rebase %s en %s (%d comandos)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6564,7 +6745,7 @@
"\n"
"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6572,7 +6753,7 @@
"\n"
"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6586,7 +6767,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6596,14 +6777,14 @@
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "no se pudo escribir '%s'."
@@ -6627,20 +6808,18 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "
+"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un "
"commit.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
"advertencias.\n"
"Los posibles comportamientos son: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' es supercedido por 'merges'"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6661,132 +6840,142 @@
msgid "ahead %d, behind %d"
msgstr "delante %d, detrás %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento %%(%s) no reconocido: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no toma ningún argumento"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argumento %%(objectsize) no reconocido: %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no toma argumentos"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argumento %%(subject) no reconocido: %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "se esperaba %%(trailers:key=<value>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconocido: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %%(contents) no reconocido: %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "argumento %%(raw) no reconocido: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positivo esperado '%s' en %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argumento '%s' no reconocido en %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "opción de email desconocida: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento %%(if) no reconocido: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no toma ningún argumento"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre mal formado de campo: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6794,126 +6983,136 @@
"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos "
"de objeto"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) usado más de una vez"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) usado después de %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) usado más de una vez"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "este comando rechaza el átomo %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s no se puede usar con --python, --shell, --tcl"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(no hay rama, rebasando %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(no hay rama, comenzando biseccón en %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD desacoplado en %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD desacoplado de %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(sin rama)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "¡%s no apunta a ningún objeto válido!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6931,7 +7130,7 @@
"predeterminado\n"
"está sujeto a cambios. Para configurar el nombre de la rama inicial para "
"usar en todos\n"
-"de sus nuevos repositorios, reprimiendo esta advertencia, llame a:\n"
+"de sus nuevos repositorios, reprimiendo esta advertencia, llama a:\n"
"\n"
"\tgit config --global init.defaultBranch <nombre>\n"
"\n"
@@ -6941,81 +7140,81 @@
"\n"
"\tgit branch -m <nombre>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "no se pudo recibir `%s`"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nombre de rama inválido: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorando referencia symbólica rota %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "log de ref %s tiene un vacío tras %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "log de ref %s finalizado inesperadamente en %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "log de %s está vacío"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "rehusando actualizar ref con mal nombre '%s'"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref falló para ref '%s': %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "no se permiten múltiples actualizaciones para ref '%s'"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "ref updates abortados por el hook"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; no se puede crear '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "no se pudo eliminar la referencia %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no se pudo eliminar la referencia %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "no se pudo eliminar las referencias: %s"
@@ -7304,7 +7503,7 @@
#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
-msgstr "profundiad de reemplazo demasiada para objeto %s"
+msgstr "profundidad de reemplazo demasiada para objeto %s"
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
@@ -7319,7 +7518,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "hubieron errores mientras se escribía '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "falló al hacer flush '%s'"
@@ -7364,8 +7563,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Preimagen grabada para '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
@@ -7403,46 +7602,41 @@
msgid "could not determine HEAD revision"
msgstr "no se pudo determinar revisión HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "falló al encontrar árbol de %s"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input es incompatible con --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> ya no es soportado"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk es incompatible con --unsorted-input"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "falló al abrir /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "no es posible crear hilo async: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
-"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7462,24 +7656,24 @@
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr ""
"send-pack: no es posible bifurcar el proceso de búsqueda en un subproceso"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "negociación push falló; procediendo con el push de todas formas"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "el destino no soporta el algoritmo de hash de este repositorio"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta push --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7487,47 +7681,48 @@
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed)"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómico (--atomic)"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mensaje de commit inválido, modo cleanup '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "no se pudo eliminar '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revertir"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7535,53 +7730,75 @@
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"tras resolver los conflictos, marca las rutas corregidas\n"
-"con 'git add <rutas>' o 'git rm <rutas>'\n"
-"y haz un commit del resultado con 'git commit'"
+"Luego de resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git cherry-pick --continue\".\n"
+"O puede saltar este commit con \"git cherry-pick --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git cherry-pick\",\n"
+"ejecute \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Tras resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git revert --continue\".\n"
+"O puede saltar este commit con \"git revert --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git revert\",\n"
+"ejecute \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "no se pudo escribir en '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o haz un stash para proceder."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup inválido %s"
@@ -7589,65 +7806,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de caché"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote valor de '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7673,15 +7890,15 @@
"\n"
" git commit %s\n"
"\n"
-"en cambos casos, cuando acabes, continua con:\n"
+"en ambos casos, cuando acabes, continúa con:\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7708,7 +7925,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7732,343 +7949,348 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "¡HEAD %s no es un commit!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "identidad de autor inválida '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "autor corrupto: falta información de fecha"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "no se puede actualizar %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "El mensaje del 1er commit será saltado:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "no se puede obtener el mensaje de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta argumentos: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para %s"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "cancelando cherry-pick en progreso"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "cancelando revert en progreso"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
+msgstr "por favor arregla esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "revert ya está en progreso"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "cherry-pick ya está en progreso"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "no hay revert en progreso"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "ningún cherry-pick en progreso"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "falló al escribir el commit"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "no hay nada que saltar"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8077,16 +8299,16 @@
"¿ya has hecho el commit?\n"
"intenta \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8105,27 +8327,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Ejecutando: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8140,11 +8362,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8161,90 +8383,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "ni se pudo intentar fusionar '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "No se puede ejecutar autostash"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Respuesta de stash inesperada: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No se pudo crear el directorio para '%s'"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autostash creado: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "no se pudo reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8256,29 +8478,29 @@
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
"momento.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Aplicar autostash resultó en conflictos."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash existe; creando una nueva entrada stash."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "no se pudo desacoplar HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8294,63 +8516,63 @@
"\n"
" %.*s\n"
"Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
-"edite la lista de \"todo\" primero:\n"
+"edita la lista de \"todo\" primero:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Aplicando rebase (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "no se pudo leer orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "no se pudo leer 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se pudo actualizar HEAD a %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8361,50 +8583,59 @@
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se pudo eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "se ha saltado el commit %s aplicado previamente"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "use --reapply-cherry-picks para incluir los commits saltados"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: error al preparar revisiones"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
@@ -8420,7 +8651,7 @@
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no existe la ruta en el árbol de trabajo.\n"
-"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen "
"localmente."
#: setup.c:198
@@ -8432,7 +8663,7 @@
msgstr ""
"argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
"trabajo.\n"
-"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
+"Usa '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
#: setup.c:264
@@ -8448,7 +8679,7 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
-"Use '--' para separar rutas de revisiones, de esta manera:\n"
+"Usa '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
#: setup.c:419
@@ -8566,27 +8797,15 @@
"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "falló al abrir /dev/null o hacer dup"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "falló setsid"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "intentando usar sparse-index sin modo cono"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "no es posible actualizar el cache del árbol, manteniendo full"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "la entrada de índice es un directorio, pero no escazo (%08x)"
@@ -8643,13 +8862,13 @@
msgstr[0] "%u bytes/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "no se pudo abrir '%s' para escritura"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "no se pudo editar '%s'"
@@ -8675,7 +8894,7 @@
msgid "invalid value for %s"
msgstr "valor inválido para %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No se pudo actualizar la entrada %s de .gitmodules"
@@ -8683,7 +8902,7 @@
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"No se puede cambiar .gitmodules no fusionados, primero resuelva los "
+"No se puede cambiar .gitmodules no fusionados, primero resuelve los "
"conflictos de fusión"
#: submodule.c:118 submodule.c:147
@@ -8700,22 +8919,22 @@
msgid "staging updated .gitmodules failed"
msgstr "falló realizar stage a los .gitmodules actualizados"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "en el submódulo no poblado '%s'"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mal argumento --ignore-submodules: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8724,12 +8943,12 @@
"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo "
"llamado igual. Saltándolo."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8738,36 +8957,36 @@
"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
"el submódulo %s"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "proceso para submódulo '%s' falló"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falló al resolver HEAD como un ref válido."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Empujando submódulo '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "No es posible hacer push al submódulo '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Haciendo fetch al submódulo %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "No se pudo acceder al submódulo '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8776,62 +8995,62 @@
"Errores durante el fetch del submódulo:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' no reconocido como un repositorio git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' falló en el submódulo %s"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "no se pudo recursar en el submódulo '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "no se pudo reiniciar el índice del submódulo"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submódulo '%s' tiene un índice corrupto"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' no pudo ser actualizado."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8839,17 +9058,17 @@
"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
"soportado"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "rechazando mover '%s' dentro de un directorio git existente"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8860,11 +9079,11 @@
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
@@ -8886,7 +9105,7 @@
msgstr "valor '%s' desconocido para la clave '%s'"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "más de un %s"
@@ -8901,11 +9120,11 @@
msgid "could not read input file '%s'"
msgstr "no se pudo leer el archivo de entrada '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "no se pudo hacer stat en %s"
@@ -8973,7 +9192,7 @@
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
@@ -8991,7 +9210,7 @@
msgid "invalid remote service path"
msgstr "ruta de servicio remoto inválida"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "operación no soportada por protocolo"
@@ -9000,7 +9219,7 @@
msgid "can't connect to subservice %s"
msgstr "no se puede conectar al subservicio %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only requiere protocolo v2"
@@ -9013,59 +9232,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "se esperaba ok/error, helper dijo '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportó estado inesperado de %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s no soporta dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s no soporta --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s no soporta --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s no soporta --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s no soporta --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9074,52 +9293,52 @@
"No hay refs comunes y ninguno especificado; no se hace nada.\n"
"Tal vez deberías especificar un branch.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "formato de objeto no soportado '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) falló"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) falló"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "no se puede iniciar el hilo para copiar data: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
@@ -9133,46 +9352,46 @@
msgid "could not read bundle '%s'"
msgstr "no se pudo leer el conjunto '%s'"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción de profundidad inválida '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
-msgstr "ver protocol.version en 'git help config' para más información"
+msgstr "mira protocol.version en 'git help config' para más información"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "el servidor no soporta wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "no se pudo analizar valor de configuración transport.color.*"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "soporte para protocolo v2 no implementado todavía"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconocido para configuración '%s': %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporte '%s' no permitido"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ya no es soportado"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9181,7 +9400,7 @@
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9208,11 +9427,11 @@
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Abortando."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
@@ -9497,17 +9716,17 @@
"en un filesystem case-insensitive) y solo una del grupo\n"
"colisionando está en el árbol de trabajo:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Actualizando flags del índice"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"el árbol de trabajo y commits no monitoreados tienen entradas duplicadas: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "se espera flush tras argumentos fetch"
@@ -9544,7 +9763,7 @@
msgid "Fetching objects"
msgstr "Haciendo fetch a objetos"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
@@ -9645,17 +9864,27 @@
msgid "gitdir file points to non-existent location"
msgstr "archivo gitdir apunta a una ubicación inexistente"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no se pudo establecer setenv '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no se pudo abrir '%s' para lectura y escritura"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "no es posible acceder '%s'"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
@@ -9722,8 +9951,8 @@
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (confirmar o descartar el contenido sin seguimiento o modificado en los "
-"sub-módulos)"
+" (confirma o descarta el contenido sin seguimiento o modificado en los sub-"
+"módulos)"
#: wt-status.c:254
#, c-format
@@ -9823,7 +10052,7 @@
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-"No modifique ni borre la línea de encima.\n"
+"No modifiques ni borres la línea de encima.\n"
"Todo lo que esté por abajo será ignorado."
#: wt-status.c:1165
@@ -10006,7 +10235,7 @@
#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
+" (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
#: wt-status.c:1500
msgid "Revert currently in progress."
@@ -10057,7 +10286,7 @@
#: wt-status.c:1550
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes."
+msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes."
#: wt-status.c:1794
msgid "On branch "
@@ -10108,7 +10337,7 @@
msgstr ""
"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
-"nuevos archivos tú mismo (vea 'git help status')."
+"nuevos archivos tú mismo (mira 'git help status')."
#: wt-status.c:1857
#, c-format
@@ -10208,25 +10437,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "no se pudo enviar el comando IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "no se pudo leer la respuesta IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "no se pudo iniciar el accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "no se pudo iniciar el worker[0] para '%s'"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
@@ -10235,134 +10464,133 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "no se puede aplicar chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "falló la actualización de archivos"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "eliminar '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "No se pudo leer el índice"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No se pudo abrir '%s' para escritura."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "No se puede escribir el parche"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "falló la edición del parche"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "No se pudo hacer stat en '%s'"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Parche vacío. Abortado."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "No se pudo aplicar '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "dry run (ejecución en seco)"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "elegir fragmentos de forma interactiva"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "editar diff actual y aplicar"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "permitir agregar archivos que de otro modo se ignoren"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "actualizar los archivos rastreados"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "grabar solo el hecho de que la ruta será agregada luego"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "agregar los cambios de todos los archivos con y sin seguimiento"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "no agregar, solo actualizar el índice"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "saltar los archivos que no pueden ser agregados a causa de errores"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comprobar si los archivos - incluso los que faltan - se ignoran en dry run"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permite actualizar entradas fuera del cono de sparse-checkout"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "sobrescribir el bit ejecutable de los archivos listados"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "avisar cuando se agrega un repositorio incrustado"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "backend para `git stash -p`"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10391,14 +10619,14 @@
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Vea \"git help submodule\" para más información."
+"Mira \"git help submodule\" para más información."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "agregando repositorio de git embebido: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10408,51 +10636,51 @@
"Desactiva este mensaje ejecutando\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "falló al agregar archivos"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run es incompatible con --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file es incompatible con --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A y -u son mutuamente incompatibles"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x o +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul requiere --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nada especificado, nada agregado.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10462,111 +10690,110 @@
"Desactiva este mensage ejecutando\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "no se pudo analizar el script del autor"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' fue borrado por el hook de applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línea de entrada mal formada: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falló al copiar notas de '%s' a '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fallo de fseek"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "no se pudo analizar el parche '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "Solo un parche StGIT puede ser aplicado a la vez"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "timestamp inválido"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "línea Date inválida"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "offset de zona horaria inválido"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Falló al dividir parches."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Para restaurar la rama original y detener el parcheo, ejecutar \"%s --abort"
-"\"."
+"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"."
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Parche enviado con format=flowed; espacios al final de las líneas tal vez "
"desaparezcan."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "El parche está vacío."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "falta línea de autor en commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línea de identificación no válida: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
"3 vías."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Usando la información del índice para reconstruir un árbol base..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10574,24 +10801,24 @@
"¿Editaste el parche a mano?\n"
"No aplica a los blobs registrados en su índice."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocediendo para parchar base y fusionar de 3 vías..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Falló al fusionar los cambios."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "aplicando a un historial vacío"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
@@ -10599,37 +10826,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "no es posible escribir el archivo índice"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- Parche ya aplicado."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido"
+msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido"
#: builtin/am.c:1868
msgid ""
@@ -10654,17 +10881,17 @@
"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
"en él."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10672,190 +10899,190 @@
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido para --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3 vías si es necesario"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "pasarlo a través de git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "formato de los parches"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensaje de error cuando fallos de parcheo ocurran"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "restaurar la rama original y abortar la operación de parcheo"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "abortar la operación de parcheo pero mantener HEAD donde está"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
-msgstr "muestra el parche siendo aplicado"
+msgstr "mostrar el parche siendo aplicado"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "firmar los commits con GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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 ""
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
-"será eliminada. Por favor no la use más."
+"será eliminada. Por favor no la uses más."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe pero un mbox fue dado."
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
"Directorio extraviado %s encontrado.\n"
-"Use \"git am --abort\" para borrarlo."
+"Usa \"git am --abort\" para borrarlo."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "modo interactivo requiere parches en la línea de comando"
@@ -10863,44 +11090,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opciones>] [<parche>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no se pudo crear el archivo de crónica '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "no se pudo redirigir la salida"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Remote sin URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: error de protocolo"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: se esperaba un flush"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10939,46 +11157,59 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "no se puede abrir archivo '%s' en modo '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "no se pudo escribir al archivo '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no se puede abrir archivo '%s' para lectura"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' no es un término válido"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no se puede usar el comando nativo '%s' como un término"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no se puede cambiar el significado del término '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
-msgstr "por favor use dos términos diferentes"
+msgstr "por favor usa dos términos diferentes"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "No estamos bisecando.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' no es un commit válido"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10986,27 +11217,27 @@
"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mal argumento bisect_write: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no se pudo obtener el oid de la rev '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "no se pudo abrir el archivo '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11015,7 +11246,7 @@
"Tienes que dar al menos una revisión %s y una %s.\n"
"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11026,7 +11257,7 @@
"Después tienes que entregar al menos una revisión %s y una %s.\n"
"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "haciendo bisect solo con un commit %s"
@@ -11035,15 +11266,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "¿Estás seguro [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "no hay términos definidos"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11052,7 +11283,7 @@
"Tus términos actuales son %s para el estado viejo\n"
"y %s para el estado nuevo.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11061,53 +11292,53 @@
"argumento inválido %s para 'git bisect terms'.\n"
"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "la configuración del recorrido de revisiones falló\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "no se pudo abrir '%s' en modo append"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' no es un término válido"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opción desconocida: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' no parece ser una revisión válida"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "mal HEAD - Necesito un HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+"error al hacer checkout '%s'. Intenta 'git bisect start <rama-válida>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "no se bisecará en un árbol con cg-seek"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "mal HEAD - ref simbólico extraño"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ref inválido: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Debes iniciar con \"git bisect start\"\n"
@@ -11115,104 +11346,150 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "¿Quieres que lo haga por ti [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Llame a `--bisect-state` con al menos un argumento"
+msgstr "Por favor llama a `--bisect-state` con al menos un argumento"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' solo puede tomar un argumento."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Mala entrada rev: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Mala entrada rev (no es un commit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "No estamos bisecando."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "¿¿'%s'?? ¿De qué estás hablando?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "no se puede leer '%s' para reproducir"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect falló: no se proveyó comando."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "ejecutando %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect falló: código de salida %d de '%s' es <0 o >=128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "no se pudo abrir archivo '%s' para escritura"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect no puede seguir continuando"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect exitoso"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect encontró el primer mal commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ejecución de bisect falló: 'git bisect--helper --bisect-state %s' terminó "
+"con código de error %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "reiniciar el estado de bisect"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "revisar si existen términos malos o buenos"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "imprimir los terms del bisect"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "comenzar la sesión de bisect"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "encontrar el siguiente commit de bisección"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "marcar el estado de ref (o refs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "listar los pasos de bisección hasta ahora"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "reproducir el proceso de bisección del archivo dado"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "saltar algunos commits para checkout"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualizar bisección"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "use <cmd>... para aplicar bisección automática."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "no hay log para BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset requiere o un commit o ningún argumento"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requiere 2 o 3 argumentos"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requiere 0 o 1 argumentos"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next requiere 0 argumentos"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log requiere 0 argumentos"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "ningún logfile proporcionado"
@@ -11224,151 +11501,153 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opciones-de-rev> están documentadas en git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "esperando un color: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "tiene que terminar con un color"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color inválido '%s' en color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "valor inválido para blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "no se pudo encontrar revisión %s para ignorar"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "no mostrar nombres de objetos de commits extremos (Default: off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "no tratar commits raíces como extremos (Default: off)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "mostrar estadísticas de costo de trabajo"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forzar el reporte de progreso"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "mostrar la puntuación de salida de las entradas de blame"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "mostrar nombre original del archivo (Default: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "mostrar número de línea original (Default: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "mostrar en un formato diseñado para consumo de máquina"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "mostrar en formato porcelana con información de commit por línea"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "usar el mismo modo de salida como git-annotate (Default: off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "mostrar timestamp en formato raw (Default: off)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "suprimir nombre del autor y timestamp (Default: off)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "mostrar el email del autor en cambio de su nombre (Default: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "ignorar <rev> durante el blame"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "ignorar revisiones de <archivo>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "colorear metadata redundante de líneas previas de manera diferente"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "colorear líneas por edad"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "ocupar más ciclos para encontrar mejores resultados"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "use revisiones en <archivo> en lugar de llamar git-rev-list"
+msgstr "usar revisiones en <archivo> en lugar de llamar git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "usar contenido de <archivo> como imagen final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "puntaje"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "encontrar copias de líneas entre y a través de archivos"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "encontrar movimientos de líneas entre y a través de archivos"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "rango"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-"
"función>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress no puede ser usado con --incremental o formatos de porcelana"
@@ -11381,18 +11660,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "archivo %s tiene solo %lu línea"
msgstr[1] "archivo %s tiene solo %lu líneas"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Blaming a líneas"
@@ -11493,78 +11772,78 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "no es posible analizar el string de formato"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "no se pudo resolver HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fuera de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama inválido: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Duplicación de rama fallida"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Copia creada de la rama malnombrada '%s'"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La rama está renombrada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La rama está copiada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11575,180 +11854,180 @@
"%s\n"
"Las líneas que comiencen con '%c' serán eliminadas.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opciones genéricas"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "suprimir mensajes informativos"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:640
-msgid "unset the upstream info"
-msgstr "desconfigurando la info de upstream"
-
#: builtin/branch.c:641
+msgid "unset the upstream info"
+msgstr "desconfigurar la info de upstream"
+
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de rastreo remoto"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contengan el commit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contengan el commit"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
-msgstr "listar ramas de remote-tracking y locales"
+msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "borrar rama (incluso si no está fusionada)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "copiar una rama y su reflog"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "copiar una rama, incluso si el destino existe"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:660
-msgid "show current branch name"
-msgstr "muestra el nombre de branch actual"
-
#: builtin/branch.c:661
-msgid "create the branch's reflog"
-msgstr "crea el reflog de la rama"
+msgid "show current branch name"
+msgstr "mostrar el nombre de branch actual"
-#: builtin/branch.c:663
-msgid "edit the description for the branch"
-msgstr "edita la descripción de la rama"
+#: builtin/branch.c:662
+msgid "create the branch's reflog"
+msgstr "crear el reflog de la rama"
#: builtin/branch.c:664
-msgid "force creation, move/rename, deletion"
-msgstr "fuerza la creación, movimiento/renombramiento, eliminación"
+msgid "edit the description for the branch"
+msgstr "editar la descripción de la rama"
#: builtin/branch.c:665
-msgid "print only branches that are merged"
-msgstr "muestra solo ramas que hayan sido fusionadas"
+msgid "force creation, move/rename, deletion"
+msgstr "forzar la creación, movimiento/renombramiento, eliminación"
#: builtin/branch.c:666
-msgid "print only branches that are not merged"
-msgstr "muestra solo ramas que no han sido fusionadas"
+msgid "print only branches that are merged"
+msgstr "mostrar solo ramas que hayan sido fusionadas"
#: builtin/branch.c:667
-msgid "list branches in columns"
-msgstr "muestra las ramas en columnas"
+msgid "print only branches that are not merged"
+msgstr "mostrar solo ramas que no han sido fusionadas"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:668
+msgid "list branches in columns"
+msgstr "mostrar las ramas en columnas"
+
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "imprimir solo las ramas del objeto"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filtración son case-insensitive"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "¡HEAD no encontrado dentro de refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "no se puede editar la descripción de más de una rama"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay commits en la rama '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de duplicación"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombramiento"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11756,32 +12035,32 @@
"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene información de upstream"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11789,41 +12068,41 @@
"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n"
"¿Quisiste usar: -a|-r --list <patrón>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
+"la opción '--set-upstream' ya no es soportada. Considera usar '--track' o '--"
"set-upstream-to' en cambio."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "versión de git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() falló con error '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "información del compilador: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "información de libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11842,7 +12121,7 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
"¡Gracias por prepara un reporte de bug de Git!\n"
-"Por favor conteste las siguientes preguntas para ayudarnos a entender el "
+"Por favor contesta las siguientes preguntas para ayudarnos a entender el "
"problema.\n"
"\n"
"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el "
@@ -11850,7 +12129,7 @@
"\n"
"¿Qué esperabas que sucediera? (Comportamiento esperado)\n"
"\n"
-"¿Qué sucedio en lugar de eso? (Comportamiento real)\n"
+"¿Qué sucedió en lugar de eso? (Comportamiento real)\n"
"\n"
"¿Qué es diferente entre lo que esperabas y lo que pasó de verdad?\n"
"\n"
@@ -11859,39 +12138,34 @@
"Por favor revisa el resto del reporte abajo.\n"
"Puedes borrar cualquier línea que no desees compartir.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "especificar el destino para el archivo de reporte de bug"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
"especificar el sufijo de formato de strftime para el nombre del archivo"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "no se pudo crear directorios principales para '%s'"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Información del sistema"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Hooks habilitados"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no se pudo crear un archivo nuevo en '%s'"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "no es posible escribir en %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Crear un nuevo reporte en '%s'.\n"
@@ -11912,53 +12186,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "especificar la versión del formato del paquete"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Se necesita un repositorio para agrupar."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "no mostrar detalles del bundle"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s está bien\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Desagrupando objetos"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sub-comando desconocido: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11966,7 +12240,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11974,74 +12248,74 @@
"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "solo se puede especificar una opción batch"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
-msgstr "use una ruta específica para --textconv/--filters"
+msgstr "usar una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permita que -s y -t funcionen con objetos rotos o corruptos"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar info y content de los objetos alimentados por standard input"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
-msgstr "no ordenar el salida de --batch-all-objects"
+msgstr "no ordenar la salida de --batch-all-objects"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12057,9 +12331,9 @@
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
-msgstr "use .gitattributes solo desde el índice"
+msgstr "usar .gitattributes solo desde el índice"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "leer nombres de archivos de stdin"
@@ -12067,8 +12341,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
@@ -12126,11 +12400,10 @@
msgstr "git checkout--worker [<opciones>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "string"
@@ -12283,11 +12556,11 @@
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no está fusionada"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12296,50 +12569,50 @@
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12362,7 +12635,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12389,28 +12662,28 @@
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "error interno en recorrido de revisiones"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
-"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
+"Por favor usa -- (y opcionalmente --no-guess) para desambiguar"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12430,51 +12703,51 @@
"un remoto particular, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "solo una referencia esperada"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es un árbol: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "se esperaba un branch, se obtuvo tag '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "se espera una rama, se obtuvo una rama remota '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "se esperaba branch, se obtuvo '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "se espera una rama, se obtuvo commit '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12482,7 +12755,7 @@
"no se puede cambiar de branch durante un merge\n"
"Considera \"git merge --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12490,7 +12763,7 @@
"no se puede cambiar de branch en medio de una sesión de am\n"
"Considera \"git am --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12498,7 +12771,7 @@
"no se puede cambiar de branch durante un rebase\n"
"Considera \"git rebase --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12506,7 +12779,7 @@
"no se puede cambiar de branch durante un cherry-pick\n"
"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12514,137 +12787,137 @@
"no se puede cambiar de branch durante un revert\n"
"Considera \"git revert --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "estás cambiando de rama durante un bisect"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' no puede tomar <punto de partida>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "realizar una fusión de tres vías con la rama nueva"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflictos (merge o diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "no averiguar si otro árbol de trabajo contiene la ref entregada"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a entradas escasas solamente"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "falta nombre de rama; prueba -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "no se pudo resolver %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file es incompatible con --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file es incompatible con --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12652,71 +12925,71 @@
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "debes especificar path(s) para restaurar"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>' (default)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "usar modo overlay (default)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "crear y hacer switch a una nueva rama"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "crear/reiniciar y hacer switch a una rama"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "descartar modificaciones locales"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "de qué árbol hacer el checkout"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "restaurar el índice"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "restaurar el árbol de trabajo (default)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignorar entradas no fusionadas"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "usar modo overlay"
@@ -12760,8 +13033,8 @@
" - (empty) select nothing\n"
msgstr ""
"Ayuda de comandos:\n"
-"1 - selecciona un objeto por número\n"
-"foo - selecciona un objeto basado en un prefijo único\n"
+"1 - seleccionar un objeto por número\n"
+"foo - seleccionar un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
#: builtin/clean.c:304 git-add--interactive.perl:602
@@ -12777,10 +13050,10 @@
" - (empty) finish selecting\n"
msgstr ""
"Ayuda de comandos:\n"
-"1 - selecciona un objeto único\n"
-"3-5 - selecciona un rango de objetos\n"
-"2-3,6-9 - selecciona múltiples rangos\n"
-"foo - selecciona un objeto basado en un prefijo único\n"
+"1 - seleccionar un objeto único\n"
+"3-5 - seleccionar un rango de objetos\n"
+"2-3,6-9 - seleccionar múltiples rangos\n"
+"foo - seleccionar un objeto basado en un prefijo único\n"
"-... - de-seleccionar objetos especificados\n"
"* - escoger todos los objetos\n"
" - (vacío) terminar selección\n"
@@ -12822,8 +13095,8 @@
"? - help for prompt selection"
msgstr ""
"clean - comenzar la limpieza\n"
-"filter by pattern - excluye objetos de la eliminación\n"
-"select by numbers - selecciona objetos a ser borrados por número\n"
+"filter by pattern - excluir objetos de la eliminación\n"
+"select by numbers - seleccionar objetos a ser borrados por número\n"
"ask each - confirmar cada eliminación (como \"rm -i\")\n"
"quit - parar limpieza\n"
"help - esta pantalla\n"
@@ -12856,8 +13129,8 @@
msgstr "borrar directorios completos"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
@@ -12946,25 +13219,26 @@
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
-msgstr "usa --reference solamente si estás clonando"
+msgstr "usar --reference solamente si estás clonando"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nombre"
#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
+msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream"
#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
@@ -12974,7 +13248,7 @@
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
#: builtin/pull.c:208
msgid "depth"
msgstr "profundidad"
@@ -12983,7 +13257,7 @@
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial de esa profundidad"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
#: builtin/pull.c:211
msgid "time"
msgstr "tiempo"
@@ -12993,7 +13267,7 @@
msgstr "crear un clon superficial desde el tiempo específico"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
msgid "revision"
msgstr "revisión"
@@ -13001,8 +13275,8 @@
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondar historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama, HEAD o --branch"
@@ -13020,7 +13294,7 @@
#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
-msgstr "separa git dir del árbol de trabajo"
+msgstr "separar git dir del árbol de trabajo"
#: builtin/clone.c:144
msgid "key=value"
@@ -13031,12 +13305,12 @@
msgstr "configurar config dentro del nuevo repositorio"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "específico-al-servidor"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opción para trasmitir"
@@ -13059,50 +13333,42 @@
msgstr ""
"inicializar archivo sparse-checkout para incluir solo archivos en la raíz"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No se pudo adivinar ningún nombre de directorio.\n"
-"Por favor especifique un directorio en la línea de comando"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "falló al iterar sobre '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13112,105 +13378,105 @@
"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "falló al inicializar sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivo de alternos temporal"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un número positivo"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "la ruta del repositorio '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13218,48 +13484,48 @@
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' no es un nombre remoto válido"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-"--shallow-since es ignorado en clonaciones locales; use file:// en su lugar."
+"--shallow-since es ignorado en clonaciones locales; usa file:// en su lugar."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-"--shallow-exclude es ignorado en clonaciones locales; use file:// en su "
+"--shallow-exclude es ignorado en clonaciones locales; usa file:// en su "
"lugar."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clonaciones locales; usa file:// en su lugar."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "transporte remoto reportó error"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@ -13295,13 +13561,13 @@
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13311,93 +13577,91 @@
"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "dir"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "el directorio de objetos en que guardar el gráfico"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "si el commit-graph está cortado, solo verifica el archivo tope"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No se pudo abrir commit-graph '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argumento --split no reconocido, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "ID de objeto no hex inesperado: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "comenzar recorrido en todas las refs"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "escanear paquete de índices por stdin por commits"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "comenzar recorrido a los commits listados por stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
-msgstr "incluye todos los commits que ya están en el archivo commit-graph"
+msgstr "incluir todos los commits que ya están en el archivo commit-graph"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "habilitar computación para rutas cambiadas"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permitir escribir un archivo commit-graph incremental"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "número máximo de commits en un commit-graph sin base cortada"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "razón máxima entre dos niveles de corte de commit-graph"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "solo caducar objetos más viejos a una fecha dada"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "número máximo de cambios de ruta de filtro Bloom para computar"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
+msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Recolectando commits del input"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13411,70 +13675,65 @@
msgid "duplicate parent %s ignored"
msgstr "padre duplicado %s ignorado"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "no es un nombre de objeto válido %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: falló al abrir '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: falló al leer '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: falló al cerrar '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "padre"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id del objeto commit padre"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "mensaje"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "mensaje del commit"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "leer mensaje de commit desde un archivo"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Firmar commit con GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
-msgstr "tiene que dar exactamente un árbol"
+msgstr "hay que dar exactamente un árbol"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: falló al leer"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13484,7 +13743,7 @@
"vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n"
"el commit completamente con \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13499,15 +13758,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Caso contrario, por favor usa 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13529,73 +13788,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "falló al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file con -a no tiene sentido"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only sin ruta no tiene sentido."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el árbol de caché principal"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "no es posible escribir archivo new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusión."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no se puede realizar un commit parcial durante un cherry-pick."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "no se puede realizar un commit parcial durante un rebase."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "no se puede leer el índice"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una línea de autor mal formada"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13603,43 +13862,43 @@
"no es posible seleccionar un carácter de comentario que no sea usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "no se puede combinar -m con --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13648,7 +13907,7 @@
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
" líneas que comiencen con '%c' serán ignoradas.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13658,17 +13917,17 @@
" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
" vacío aborta el commit.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, 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"
msgstr ""
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
-" usted mismo si lo desea.\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13676,11 +13935,11 @@
"An empty message aborts the commit.\n"
msgstr ""
"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
-" usted mismo si lo desea.\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13689,12 +13948,12 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que está realizando una fusión.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que estás realizando una fusión.\n"
+"Si esto no es correcto, ejecuta\n"
"\tgit update-ref -d MERGE_HEAD\n"
"e intenta de nuevo.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13703,78 +13962,78 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que puede estar cometiendo una selección de cerezas.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que puedes estar cometiendo una selección de cerezas.\n"
+"Si esto no es correcto, ejecuta\n"
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"e intenta de nuevo.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "no se puede pasar trailers a --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
"autor existente"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorancia inválido '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de archivos no rastreados '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Estás en medio de una fusión -- no puedes renombrar."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Está en medio de un cherry-pick -- no se puede renombrar."
+msgstr "Estás en medio de un cherry-pick -- no se puede renombrar."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "no se puede combinar opción de renombrar de --fixup con ruta '%s'"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -13782,103 +14041,103 @@
"opción de refraseado de --fixup es mutuamente exclusiva con --patch/--"
"interactive/--all/--include/--only"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
+msgstr "Estás en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "La opción -m no puede ser combinada con -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author solo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "opción desconocida: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
-msgstr "version"
+msgstr "versión"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "output en formato de máquina"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
"(Predeterminado: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13886,11 +14145,11 @@
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13898,202 +14157,202 @@
"ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombrados, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinación de argumentos de archivos ignorados y no rastreados no soportada"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
-msgstr "suprime summary tras un commit exitoso"
+msgstr "suprimir summary tras un commit exitoso"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
-msgstr "sobrescribe el autor del commit"
+msgstr "sobrescribir el autor del commit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
-msgstr "sobrescribe la fecha del commit"
+msgstr "sobrescribir la fecha del commit"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit específico"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit específico"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
+"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
"commit especificado"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar el mensaje de formato autosquash para realizar squash al commit "
"especificado"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "trailer"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "agregando trailer(s) personalizados"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
#: builtin/pull.c:145 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "agregar una línea Signed-off-by al final"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "solo confirmar archivos específicos"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
-msgstr "salta el gancho de postreescritura"
+msgstr "saltar el gancho de postreescritura"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "vale grabar un cambio vacío"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "vale grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando commit debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; no se ha editado el mensaje.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Abortando commit debido que el cuerpo del mensaje está en blanco.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
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 restore --staged :/\" to recover."
msgstr ""
"el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
-"new_index. Verifique que el disco no esté lleno y la cuota no haya\n"
+"new_index. Verifica que el disco no esté lleno y la cuota no haya\n"
"sido superada, y luego \"git restore --staged :/\" para recuperar."
#: builtin/config.c:11
@@ -14192,7 +14451,7 @@
#: builtin/config.c:149
msgid "use string equality when comparing values to 'value-pattern'"
-msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'"
+msgstr "usar la igualdad de cadenas al comparar valores con 'patrón de valor'"
#: builtin/config.c:150
msgid "open an editor"
@@ -14271,7 +14530,7 @@
#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
-msgstr "con --get, usa el valor por defecto cuando falta una entrada"
+msgstr "con --get, usar el valor por defecto cuando falta una entrada"
#: builtin/config.c:181
#, c-format
@@ -14357,7 +14616,7 @@
msgstr ""
"--worktree no puede ser usado con múltiples árboles de trabajo a menos que "
"la\n"
-"extensión worktreeConfig esté habilitada. Por favor lea \"CONFIGURATION FILE"
+"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION FILE"
"\"\n"
"en \"git help worktree\" para más detalles"
@@ -14417,7 +14676,7 @@
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"no se puede sobrescribir múltiples valores con un único valor\n"
-" Use una regexp, --add o --replace-all para cambiar %s."
+" Usa una regexp, --add o --replace-all para cambiar %s."
#: builtin/config.c:943 builtin/config.c:954
#, c-format
@@ -14454,7 +14713,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache no disponible; sin soporte de socket Unix"
@@ -14516,7 +14775,7 @@
"However, there were unannotated tags: try --tags."
msgstr ""
"No hay tags anotados que puedan describir '%s'.\n"
-"Sin embargo, hubieron tags no anotados: intente --tags."
+"Sin embargo, hubieron tags no anotados: intenta --tags."
#: builtin/describe.c:428
#, c-format
@@ -14525,7 +14784,7 @@
"Try --always, or create some tags."
msgstr ""
"Ningún tag puede describir '%s'.\n"
-"Intente --always, o cree algunos tags."
+"Intenta --always, o crea algunos tags."
#: builtin/describe.c:458
#, c-format
@@ -14566,11 +14825,11 @@
#: builtin/describe.c:556
msgid "use any ref"
-msgstr "use cualquier ref"
+msgstr "usar cualquier ref"
#: builtin/describe.c:557
msgid "use any tag, even unannotated"
-msgstr "use cualquier tag, incluso los no anotados"
+msgstr "usar cualquier tag, incluso los no anotados"
#: builtin/describe.c:558
msgid "always use long format"
@@ -14649,13 +14908,13 @@
#: builtin/diff.c:376
#, c-format
msgid "%s...%s: no merge base"
-msgstr "%s...%s: se neceista una base de fusión"
+msgstr "%s...%s: se necesita una base de fusión"
#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido."
@@ -14679,114 +14938,114 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "falló: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "tal vez desees limpiar o recuperar estos."
-#: builtin/difftool.c:699
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "use `diff.guitool` en lugar de `diff.tool`"
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "falló: %d"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "usar `diff.guitool` en lugar de `diff.tool`"
+
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "herramienta"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "pasado a `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool requiere un árbol de trabajo o --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff es incompatible con --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
@@ -14794,7 +15053,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "tipo"
@@ -14823,98 +15082,98 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Error: No se puede exportar los tags anidados a menos que --mark-tags sea "
"especificado."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "token --anonymize-map no puede estar vacío"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "volcar marcas a este archivo"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "importar marcas de este archivo"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "importar marcas de este archivo si existe"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1220
-msgid "use the done feature to terminate the stream"
-msgstr "use el feature done para terminar el stream"
-
#: builtin/fast-export.c:1221
-msgid "skip output of blob data"
-msgstr "saltar el salida de data blob"
+msgid "use the done feature to terminate the stream"
+msgstr "usar el feature done para terminar el stream"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1222
+msgid "skip output of blob data"
+msgstr "saltar la salida de data blob"
+
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "de:para"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "convertir <de> a <para> en output anonimizado"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"referir a los padres que no estén en fast-export stream por id de objeto"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "mostrar ids de objetos originales para blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "marcar tags con ids de mark"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map sin --anonymize no tiene sentido"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
@@ -15088,17 +15347,17 @@
#: builtin/fetch.c:208 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
-msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
+msgstr "reportar que solo tenemos objetos alcanzables de este objeto"
#: builtin/fetch.c:210
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
-"no realizar fecth al packfile; en lugar de eso, mostrar los ancestros de las "
+"no realizar fetch al packfile; en lugar de eso, mostrar los ancestros de las "
"puntas de negociación"
#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
-msgstr "ejecute 'maintenance --auto' después de buscar"
+msgstr "ejecutar 'maintenance --auto' después de buscar"
#: builtin/fetch.c:217 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
@@ -15116,73 +15375,73 @@
msgid "Couldn't find remote ref HEAD"
msgstr "No se pudo encontrar ref remota HEAD"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "no es posible actualizar el ref local"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "sobrescribiría tag existente"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "avance no rápido"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
"Fetch normalmente incida qué branches han tenido un update forzado,\n"
-"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--"
+"pero esa validación ha sido deshabilitada. Para activarla de nuevo usa '--"
"show-forced-updates'\n"
-"o ejecute 'git config fetch.showForcedUpdates true'."
+"o ejecuta 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15195,80 +15454,85 @@
"false'\n"
"para evitar esta validación.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizada"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
+"algunos refs locales no pudieron ser actualizados; intenta ejecutar\n"
" 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se volverá colgante)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha vuelto colgante)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "el objeto %s no existe"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "no configurar upstream para una rama de rastreo remoto"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "no configurar upstream para un tag remoto"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "tipo de branch desconocido"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15276,79 +15540,79 @@
"no se encontró rama fuente.\n"
"tienes que especificar exactamente una rama con la opción --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
+"No hay repositorio remoto especificado. Por favor, especifica un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only necesita uno o más --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar refspecs no tiene sentido"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "tiene que proveer un remoto cuando usa --negotiate-only"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Protocolo no soporta --negotiate-only, saliendo."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15356,11 +15620,11 @@
"--filter solo puede ser usado con el remoto configurado en extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic solo se puede usar cuando se busca desde un control remoto"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin solo se puede usar cuando se busca desde un control remoto"
@@ -15384,7 +15648,7 @@
#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
-msgstr "use <text> como comienzo de mensaje"
+msgstr "usar <text> como comienzo de mensaje"
#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
@@ -15408,25 +15672,25 @@
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
-msgstr "cite los marcadores de posición adecuadamente para los shells"
+msgstr "entrecomillar los marcadores de posición adecuadamente para los shells"
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
-msgstr "cite los marcadores de posición adecuadamente para perl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para perl"
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
-msgstr "cite los marcadores de posición adecuadamente para python"
+msgstr "entrecomillar los marcadores de posición adecuadamente para python"
#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
-msgstr "cite los marcadores de posición adecuadamente para Tcl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para Tcl"
#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr "mostrar solo <n> refs encontradas"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "respetar los colores de formato"
@@ -15582,129 +15846,139 @@
msgid "notice: No default references"
msgstr "aviso: No hay referencias por defecto"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hash-path no concuerda, encontrado en: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto corrupto o no encontrado: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objeto de tipo desconocido '%s':%s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no se pudo analizar objeto: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "mal sha1 de archivo: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Revisando directorio de objetos"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Revisando link %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a algo extraño (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD desacoplado no apunta a nada"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "aviso: %s apunta a un branch no nacido (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Revisando el tree caché"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: puntero inválido sha1 en cache-tree"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "non-tree en cache-tree"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "mostrar objetos inalcanzables"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "mostrar objetos colgantes"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "revisar solo conectividad"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgantes en .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progreso"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verbosos de objetos alcanzables"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Revisando objetos"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: objeto faltante"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
@@ -15728,7 +16002,7 @@
msgid "cannot stat '%s'"
msgstr "no se puede hacer stat en '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
@@ -15737,13 +16011,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"El último gc reportó lo siguiente. Por favor corrige la causa\n"
-"y elimine %s.\n"
+"y elimina %s\n"
"Limpieza automática no se realizará hasta que el archivo sea eliminado.\n"
"\n"
"%s"
@@ -15782,25 +16056,25 @@
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-"Auto empaquetado del repositorio en segundo plano para un performance "
+"Auto empaquetado del repositorio en segundo plano para un rendimiento "
"óptimo.\n"
#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
+msgstr "Auto empaquetado del repositorio para rendimiento óptimo.\n"
#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Vea \"git help gc\" para limpieza manual.\n"
+msgstr "Mira \"git help gc\" para limpieza manual.\n"
#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force si no "
+"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (usa --force si no "
"es así)"
#: builtin/gc.c:705
@@ -15825,151 +16099,191 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule no reconocido, '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "no se pudo escribir el commit-graph"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "falló al hacer prefetch a los remotos"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "no se pudo iniciar el proceso 'git pack-objects'"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "no se pudo finalizar el proceso 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "no se pudo escribir el índice de paquetes múltiples"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' falló"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' falló"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex "
"está deshabilitado"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "tarea '%s' falló"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' no es una tarea válida"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr "tarea '%s' no puede ser seleccionada múltipes veces"
+msgstr "tarea '%s' no puede ser seleccionada múltiples veces"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "ejecutar tareas basadas en el estado del repositorio"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "frecuencia"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "ejecutar tareas basado en frecuencia"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "no reportar progreso u otra información por medio de stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "tarea"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "ejecutar una tarea específica"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "usar como máximo una de --auto y --schedule=<frecuencia>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "no pudo ejecutar 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "falló al expandir la ruta '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "falló al iniciar launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "falló al crear directorios para '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "falló al generar el servicio %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "no se pudo crear el archivo temp xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "no se pudo iniciar schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "no se pudo abrir stdin de 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' murió"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "falló al iniciar systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "falló el ejecutar systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "falló al borrar '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumento --scheduler no reconocido '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni systemd ni crontab disponibles"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planificador no disponible"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "otro proceso está programando el mantenimiento en segundo plano"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificador>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador para iniciar git maintenance run"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "no se pudo agregar el repositorio a la configuración global"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcomando> [<opciones>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "subcomando no válido: %s"
@@ -15978,12 +16292,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falló al crear el hilo: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "número inválido de hilos especificado (%d) para %s"
@@ -15992,266 +16306,266 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "buscar en contenidos no manejados por git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados vía '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerden"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings fijos"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primera coincidencia"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "mostrar solo las partes que concuerden de una línea"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
"archivo"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr ""
"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan con todos los patrones"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "no se ha entregado ningún patrón"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no es posible resolver revisión: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no es soportada con --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked no se puede usar con --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "ambos --cached y árboles han sido entregados"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16259,439 +16573,442 @@
"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
"[--] <archivo>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "tipo de objeto"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "escribir el objeto en la base de datos de objetos"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "leer el objeto de stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "guardar el archivo tal cual sin filtros"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"solo realizar un hash a cualquier basura random para crear un objeto "
"corrupto para hacer debugging de Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "procesar el archivo como si fuera de esta ruta"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "mostrar todos los comandos disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "excluir las guias"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "mostrar una lista de guías útiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimir todos los nombres de variables de configuración"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "mostrar la página del manual"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "mostrar la página del manual en un navegador web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "mostrar la página de info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "imprimir descripción del comando"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "mostrar una lista de guías útiles"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "imprimir todos los nombres de variables de configuración"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato help no reconocido '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Falló al iniciar emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Falló al analizar la versión de emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versión '%d' de emacsclient es demasiada antigua (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "falló al ejecutar '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"'%s': ruta para un visualizador del manual no soportado.\n"
-"Por favor considere usar 'man.<herramienta>.cmd'."
+"Por favor considera usar 'man.<herramienta>.cmd'."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"'%s': comando para man viewer soportado.\n"
-"Por favor considere usar 'man.<herramienta>.path."
+"Por favor considera usar 'man.<herramienta>.path."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de man desconocido."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "ningún visualizador de manual procesó la petición"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "ningún visor de info manejó la petición"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mal alias.%s string: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "esta opción no requiere argumentos"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' para más información"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "error al leer en input"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paquete demasiado grande para la definición actual de off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no se puede abrir el archivo de paquete '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "inflate devolvió %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "no se puede hacer pread en el paquete"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "no es posible leer %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "error de fsck en el objeto empaquetado"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir archivo '%2$s' de %1$s"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "no se pudo renombrar el archivo temporal '*.%s' a '%s'"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "error mientras se cerraba el archivo paquete"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "no se puede guardar el archivo paquete"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "no se puede guardar el archivo índice"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el archivo índice del paquete para '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algoritmo hash desconocido '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format no se puede usar con --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
@@ -16799,7 +17116,7 @@
#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-"especifica que el repositorio de git será compartido entre varios usuarios"
+"especificar que el repositorio de git será compartido entre varios usuarios"
#: builtin/init-db.c:551
msgid "override the name of the initial branch"
@@ -17067,11 +17384,11 @@
#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
-msgstr "use [PATCH n/m] incluso con un único parche"
+msgstr "usar [PATCH n/m] incluso con un único parche"
#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
-msgstr "use [PATCH] incluso con múltiples parches"
+msgstr "usar [PATCH] incluso con múltiples parches"
#: builtin/log.c:1756
msgid "print patches to standard out"
@@ -17092,7 +17409,7 @@
#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
-msgstr "use <sfx> en lugar de '.patch'"
+msgstr "usar <sfx> en lugar de '.patch'"
#: builtin/log.c:1764
msgid "start numbering patches at <n> instead of 1"
@@ -17112,7 +17429,7 @@
#: builtin/log.c:1770
msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr "use [RFC PATCH] en lugar de [PATCH]"
+msgstr "usar [RFC PATCH] en lugar de [PATCH]"
#: builtin/log.c:1773
msgid "cover-from-description-mode"
@@ -17121,12 +17438,12 @@
#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-"genera partes de una carta de presentación basado en la descripción de la "
+"generar partes de una carta de presentación basadas en la descripción de la "
"rama"
#: builtin/log.c:1776
msgid "use [<prefix>] instead of [PATCH]"
-msgstr "use [<prefijo>] en lugar de [PATCH]"
+msgstr "usar [<prefijo>] en lugar de [PATCH]"
#: builtin/log.c:1779
msgid "store resulting files in <dir>"
@@ -17146,7 +17463,7 @@
#: builtin/log.c:1789
msgid "don't include a patch matching a commit upstream"
-msgstr "no incluya un parche que coincida con un commit en upstream"
+msgstr "no incluir un parche que coincida con un commit en upstream"
#: builtin/log.c:1791
msgid "show patch format instead of default (patch + stat)"
@@ -17241,11 +17558,11 @@
#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
-msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <rev> en cover letter o en un solo parche"
#: builtin/log.c:1827
msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <refspec> en cover letter o en un solo parche"
#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
@@ -17332,134 +17649,138 @@
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-"No se pudo encontrar una rama remota rastreada, por favor especifique "
+"No se pudo encontrar una rama remota rastreada, por favor especifica "
"<upstream> manualmente.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:619
-msgid "identify the file status with tags"
-msgstr "identifique el estado del archivo con tags"
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rutas están separadas con un carácter NULL"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:617
+msgid "identify the file status with tags"
+msgstr "identificar el estado del archivo con tags"
+
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "mostrar archivos en caché en la salida (default)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "mostrar nombre de objeto del contenido del área de stage en la salida"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "mostrar archivos en el filesystem que necesiten ser borrados"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'otros' directorios"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "excluir patrones leídos de <archivo>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "leer patrones exclude del archivo <archivo>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "leer patrones adicionales de exclusión por directorio en <archivo>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "hacer la salida relativa al directorio principal del proyecto"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "árbol-ismo"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que las rutas hayan sido borradas ya que todavía hay <árbol-ismos> "
"presentes"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "mostrar data de debug"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "suprimir entradas duplicadas"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repositorio> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositorio> [<refs>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "no mostrar el URL remoto"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "ejecutar"
@@ -17577,7 +17898,7 @@
msgid "use headers in message's body"
msgstr "usar cabeceras en el cuerpo del mensaje"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
@@ -17616,7 +17937,7 @@
#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
-msgstr "¿es el primer ancestro del otro?"
+msgstr "¿es el primero ancestro del otro?"
#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
@@ -17693,144 +18014,144 @@
msgid "Merging %s with %s\n"
msgstr "Fusionando %s con %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "opción `m' requiere un valor"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "opción `%s' requiere un valor"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
"fusión"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "crear un commit único en lugar de hacer una fusión"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:154
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "permitir fast-forward (default)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar que el commit nombrado tenga una firma GPG válida"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:172
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort pero no tocar el índice ni el árbol de trabajo"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Ya está actualizado. (nada para hacer squash)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
@@ -17845,48 +18166,48 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opción desconocida para merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opción de estrategia desconocida: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribir %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "No se pudo leer de '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-"No se realiza commit de fusión; use 'git commit' para completar la fusión.\n"
+"No se realiza commit de fusión; usa 'git commit' para completar la fusión.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
msgstr ""
-"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"Por favor ingresa un mensaje de commit que explique por qué es necesaria "
"esta fusión,\n"
"especialmente si esto fusiona un upstream actualizado en una rama de "
"tópico.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Un mensaje vacío aborta el commit.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17895,74 +18216,74 @@
"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
"el commit.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Fusión automática falló; arregle los conflictos y luego realice un commit "
"con el resultado.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Por defecto, no hay un upstream definido para la rama actual."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hay rama de rastreo remota para %s de %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor erróneo '%s' en el entorno '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit no espera argumentos"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17970,7 +18291,7 @@
"No has concluido la fusión (existe MERGE_HEAD).\n"
"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17978,89 +18299,85 @@
"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "No se puede combinar --squash con --commit."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Aplastar un commit a un head vacío no es soportado todavía"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "No es posible hacer fast-forward, abortando."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Usando estrategia %s para preparar resolución a mano.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18095,15 +18412,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%s'"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "tag en stdin no se refería a un objeto válido"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "incapaz de escribir el archivo de tag"
@@ -18124,35 +18441,51 @@
msgstr "permitir la creación de más de un árbol"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<opciones>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<opciones>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<opciones>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"directorio de objetos conteniendo conjunto de pares de packfile y pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "pack preferido"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "pack para reuso cuando se calcula un bitmap de múltiples packs"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "escribir bitmap multi-pack"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "escribir el índice multi-pack que contenga los siguientes índices"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "referencia los snapshots para seleccionar los commits de bitmap"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18160,11 +18493,6 @@
"durante el repack, recolectar los pack-files de tamaño menor en un batch que "
"sea más grande que este tamaño"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomando desconocido: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opciones>] <fuente>... <destino>"
@@ -18193,72 +18521,72 @@
msgid "skip move/rename errors"
msgstr "saltar errores de mover/renombrar"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' no es un directorio"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "mala fuente"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "no se puede mover un directorio en sí mismo"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "no se puede mover un directorio dentro de un archivo"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "directorio de fuente está vacío"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "no se encuentra bajo control de versiones"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflicto"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "destino existe"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "sobrescribiendo '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "No se puede sobrescribir"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "múltiples fuentes para el mismo destino"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "el directorio de destino no existe"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, fuente=%s, destino=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrar '%s' falló"
@@ -18439,47 +18767,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "falló la finalización de 'show' para el objeto '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
-msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
+msgstr "por favor suministra los contenidos de nota usando la opción -m o -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "incapaz de escribir el objeto de nota"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "los contenidos de nota han sido dejados en %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "falló al resolver '%s' como ref válida."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "falló al leer objeto '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "no se puede leer los datos de la nota de un objeto no blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "línea de entrada mal formada: '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "falló al copiar notas de '%s' a '%s'"
@@ -18487,147 +18815,147 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
-msgstr "muchos argumentos"
+msgstr "demasiados argumentos"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "no se encontraron notas para objeto %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "contenidos de la nota como cadena"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "contenidos de la nota en un archivo"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "reutilizar y editar el objeto de nota especificado"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "reutilizar el objeto de nota especificado"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permitir almacenar nota vacía"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "reemplazar notas existentes"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
+"No se puede agregar notas. Se encontró notas existentes para objeto %s. Usa "
"'-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Sobrescribiendo notas existentes para objeto %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Quitando nota del objeto %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "leer objetos desde stdin"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "demasiados pocos argumentos"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
"No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
-"Use '-f' para sobrescribir las notas existentes"
+"Usa '-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "faltan notas en el objeto de fuente %s. No se puede copiar."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, 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 ""
"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
-"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
+"Por favor usa 'git notes add -f -m/-F/-c/-C' en cambio.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falló al borrar ref NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falló al resolver NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "falló al finalizar la fusión de notas"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estrategia de fusión de notas %s desconocida"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opciones generales"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opciones de fusión"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18635,92 +18963,92 @@
"resolver conflictos de notas usando la estrategia entregada (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Realizando commit a las notas no fusionadas"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"finalizar fusión de notas realizando un commit de las notas no fusionadas"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Abortando resolución de fusión de notas"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "abortar fusión de notas"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no se pueden mezclar --commit, --abort o -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "se debe especificar una ref de notas a fusionar"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "--strategy/-s desconocida: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusión de notas en %s ya está en progreso en %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "falló al guardar un link para el ref de notas actual (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
-"Fusión automática de notas falló. Arregle conflictos en %s y realice un "
-"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
+"Fusión automática de notas falló. Arregla conflictos en %s y realiza un "
+"commit con el resultado 'git notes merge --commit', o aborta la fusión con "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "El objeto %s no tiene notas\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "intentar eliminar una nota no existente no es un error"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "reportar notas recortadas"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "referencia-de-notas"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
@@ -18773,86 +19101,90 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "escribir un índice de bitmap"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
"empaquetados"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow de offset de base de delta en paquete para %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset de base de delta está fuera de límites para %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18861,7 +19193,7 @@
"valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
"objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18869,17 +19201,18 @@
"objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
"'%s')"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "no se puede obtener el tipo de objeto %s en pack %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "no se pudo encontrar pack '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18888,261 +19221,260 @@
"se esperaba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-"se esperaba ID de objeto, se obtuvo basuta:\n"
+"se esperaba ID de objeto, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto suelto en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "incapaz de forzar que el objecto se suelte"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignorar objetos empaquetados"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no hayan sido empaquetados todavía"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "leer packs de stdin"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieran a objetos a ser empaquetados"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tengan un archivo .keep acompañante"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "escribir un índice de bitmap si es posible"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protocolo"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
-"protocolo"
+"excluir cualquier uploadpack.blobpackfileuri configurado con este protocolo"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "profundidad de cadena de delta %d es demasiada profunda, forzando %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no puede ser usado para construir un paquete para "
"transferencia"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no puede ser usado para construir un paquete indexable"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar --filter sin --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "no se puede usar --filter con --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "no se puede usar un lista interna de rev con --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19160,9 +19492,9 @@
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
"'git pack-redundant' está nominado para su eliminación.\n"
-"Si todavía usa este comando, agregue una extra\n"
+"Si todavía usas este comando, agrega una extra\n"
"opción, '--i-still-use-this', en la línea de comando\n"
-"y háganos saber que todavía lo usa enviando un correo electrónico\n"
+"y háganos saber que todavía lo usas enviando un correo electrónico\n"
"a <git@vger.kernel.org>. Gracias.\n"
#: builtin/pack-refs.c:8
@@ -19197,7 +19529,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "no se puede recortar en un repositorio de objetos preciosos"
@@ -19223,11 +19555,11 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:167 parse-options.h:339
msgid "automatically stash/stash pop before and after"
msgstr "ejecutar automáticamente stash/stash pop antes y después"
@@ -19280,7 +19612,7 @@
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:456 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en una rama."
@@ -19297,7 +19629,7 @@
msgstr "Ver git-pull(1) para detalles."
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<remoto>"
@@ -19305,7 +19637,7 @@
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:471 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
@@ -19334,11 +19666,11 @@
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:936
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19362,21 +19694,20 @@
"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n"
"--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n"
"por defecto en cada invocación.\n"
-"\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1010
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nacida con cambios agregados al índice."
-#: builtin/pull.c:994
+#: builtin/pull.c:1014
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1015
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1040
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19387,7 +19718,7 @@
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1046
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19398,21 +19729,29 @@
"to recover."
msgstr ""
"No se puede realizar fast-forward en tu árbol de trabajo.\n"
-"Tras asegurarse que haya guardado todo lo preciado de la salida de\n"
+"Tras asegurarte que hayas guardado todo lo preciado de la salida de\n"
"$ git diff %s\n"
-",ejecute\n"
+",ejecuta\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1061
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1066
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1068
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No se puede hacer fast-forward en múltiples ramas."
+
+#: builtin/pull.c:1082
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Necesita especificar cómo reconciliar las ramas divergentes."
+
+#: builtin/pull.c:1096
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -19475,7 +19814,7 @@
msgstr ""
"Actualmente no estás en una rama.\n"
"Para hacer un push a la historia que lleva al estado actual\n"
-"(HEAD desacoplado), use\n"
+"(HEAD desacoplado), usa\n"
"\n"
"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
@@ -19489,7 +19828,7 @@
msgstr ""
"La rama actual %s no tiene una rama upstream.\n"
"Para realizar un push de la rama actual y configurar el remoto como "
-"upstream, use\n"
+"upstream, usa\n"
"\n"
"\tgit push --set-upstream %s %s\n"
@@ -19536,10 +19875,10 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"Actualizaciones fueron rechazadas porque una punta de rama en el push está\n"
-"detrás de su contraparte remota. Verifique esta rama e integre los cambios "
+"detrás de su contraparte remota. Cambia a esta rama e integra los cambios "
"remotos\n"
"(ejem. 'git pull ...') antes de volver a hacer push.\n"
-"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
+"Mira las 'Notes about fast-forwards' en 'git push --help' para más detalles."
#: builtin/push.c:270
msgid ""
@@ -19551,9 +19890,9 @@
msgstr ""
"Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n"
"no existe localmente. Esto es causado usualmente por otro repositorio\n"
-"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n"
+"realizando push a la misma ref. Quizás quieras integrar primero los cambios\n"
"remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
-"Vea 'Notes about fast-forwards' en 'git push --help' para detalles."
+"Mira 'Notes about fast-forwards' en 'git push --help' para detalles."
#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
@@ -19579,7 +19918,7 @@
msgstr ""
"Las actualizaciones se rechazaron porque la punta de la rama de seguimiento\n"
"remoto se ha actualizado desde la última vez que se realizó checkout. Es "
-"posible que desee\n"
+"posible que desees\n"
"integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
"antes de forzar una actualización.\n"
@@ -19593,15 +19932,15 @@
msgid "failed to push some refs to '%s'"
msgstr "falló el push de algunas referencias a '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repositorio"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "realizar push a todas las refs"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "realizar mirror a todas las refs"
@@ -19613,32 +19952,32 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "forzar actualizaciones"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<refname>:<expect>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
-msgstr "requiere que el valor viejo de ref sea este valor"
+msgstr "requerir que el valor viejo de ref sea este valor"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
-msgstr "requieren que las actualizaciones remotas se integren localmente"
+msgstr "requerir que las actualizaciones remotas se integren localmente"
#: builtin/push.c:560
msgid "control recursive pushing of submodules"
msgstr "controlar push recursivo de submódulos"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "programa de recepción de paquetes"
@@ -19658,11 +19997,11 @@
msgid "push missing but relevant tags"
msgstr "realizar push de tags faltantes pero relevantes"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "Firmar con GPG el push"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "solicitar transacción atómica en el lado remoto"
@@ -19775,83 +20114,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
-"ismo2> [<árbol-ismo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "escribir índice resultante en <archivo>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "solo vaciar el índice"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Fusionando"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "realizar un merge en adición a una lectura"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusión de 3 vías si no se requiere ninguna fusión a nivel de archivo"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusión de 3 vías en presencia de adiciones y eliminaciones"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "igual que -m, pero descarta entradas sin fusionar"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<subdirectorio>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
-msgstr "lea el árbol en el índice bajo <subdirectorio>/"
+msgstr "leer el árbol en el índice bajo <subdirectorio>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "permitir sobrescritura de archivos explícitamente ignorados"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "no revisar el árbol de trabajo tras fusionar"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "no actualizar el índice o el árbol de trabajo"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "saltar aplicación de filtro de sparse checkout"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "debug unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "suprimir mensajes de feedback"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Necesitas resolver tu índice actual primero"
@@ -19873,193 +20211,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista de pendientes inutilizable: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "no se pudo crear archivo temporal %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "no se pudo marcar como interactivo"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "no se pudo generar lista de pendientes"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit base tiene que ser provisto con --upstream o --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opciones>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "mantener commits que comiencen con vacío"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permitir commits con mensajes vacíos"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebasar commits de fusión"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "mantener puntas de bifurcación originales de los primos"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mover commits que comiencen con squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "firmar commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "mostrar un diffstat de lo que cambió en upstream"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuar rebase"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "saltar commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "editar la lista de pendientes"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostrar el parche actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "ids de commits cortos en la lista de pendientes"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandir ids de commits en la lista de pendientes"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "revisar la lista de pendientes"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reordenar líneas fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insertar comando exec en la lista de pendientes"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "sobre"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restringir revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash a"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "el commit de upstream"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nombre de head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "estrategia de rebase"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opciones de estrategia"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "cambiar a"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la rama o commit para hacer checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "sobre-nombre"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "sobre nombre"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "el comando para ejecutar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "reprogramar automaticamente cualquier `exec` que falle"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s requiere un backend de fusión"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "no se pudo conseguir 'onto': '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválido: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20067,14 +20256,14 @@
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
-"Resuelva todos los conflictos manualmente ya sea con\n"
-"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"Resuelve todos los conflictos manualmente ya sea con\n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecuta \"git rebase --continue"
"\".\n"
"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n"
"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20093,7 +20282,7 @@
"\n"
"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20102,7 +20291,7 @@
"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
"\"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20119,7 +20308,7 @@
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20132,184 +20321,194 @@
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "comandos exec no pueden contener newlines"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "comando exec vacío"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase sobre rama dada en lugar de upstream"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar la base de fusión de upstream y la rama como base actual"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso. implica --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "mostrar un diffstat de lo que cambió en upstream"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "hacer que la fecha del commit concuerde con la fecha de autoría"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignorar la fecha del autor y usar la fecha actual"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "sinónimo para --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "pasado a 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignorar cambios en espacios en blanco"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
-msgstr "aborta y revisa la rama original"
+msgstr "abortar y cambiar a la rama original"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
-msgstr "aborta pero mantiene HEAD donde está"
+msgstr "abortar pero mantiene HEAD donde está"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
-msgstr "muestra el archivo parche siendo aplicado o fusionado"
+msgstr "mostrar el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "usar estrategias de apply para el rebase"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "permitir al usuario editar la lista de commits para rebasar"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "como manejar commits que se vuelven vacíos"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "mantener commits que comiencen con vacío"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comiencen con squash!/fixup! bajo -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "agregar líneas exec tras cada commit de la lista editable"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase de commits con mensajes vacíos"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "intentar rebase de fusiones en lugar de saltarlas"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "use 'merge-base --fork-point' para refinar upstream"
+msgstr "usar 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reprogramar automaticamente cualquier `exec` que falle"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
"aplicar todos los cambios, incluso aquellos que ya están presentes en "
"upstream"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges fue reemplazado por --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "no se puede combinar '--keep-base' con '--onto'"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "no se puede combinar '--keep-base' con '--root'"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "no se puede combinar '--root' con '--fork-point'"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "¿No hay rebase en progreso?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"La acción --edit-todo solo puede ser usada al rebasar interactivamente."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20317,16 +20516,16 @@
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20347,144 +20546,133 @@
"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "no se pueden combinar opciones de apply con opciones de merge"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebase desconocido: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiere --exec o --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
-"exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': necesita exactamente una base de fusión con rama"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: no existe la rama/commit: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "no existe la rama/commit: '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Rama actual %s está actualizada, rebase forzado.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
"de esta...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rápido de %s a %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20517,7 +20705,7 @@
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20538,11 +20726,11 @@
"\n"
"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
@@ -20583,7 +20771,7 @@
msgid "%s points nowhere!"
msgstr "¡%s no apunta a ningún lado!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "no reflog especificado para borrar"
@@ -20740,7 +20928,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "remoto %s ya existe."
@@ -20750,25 +20938,30 @@
msgid "Could not setup master '%s'"
msgstr "No se pudo configurar master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s no manejado; se asume 'true'"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "No se pudo obtener el mapa de fetch para refspec %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(concordando)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(eliminar)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "no se pudo configurar '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20779,17 +20972,17 @@
"\t%s:%d\n"
"ahora nombra al remoto inexistente '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20798,19 +20991,19 @@
msgstr ""
"No se actualiza refspec de fetch no predeterminada\n"
"\t%s\n"
-"\tPor favor actualice la configuración manualmente si es necesario."
+"\tPor favor actualiza la configuración manualmente si es necesario."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "borrar '%s' falló"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "crear '%s' falló"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20819,124 +21012,124 @@
"to delete them, use:"
msgstr[0] ""
"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n"
-"para borrarla, use:"
+"para borrarla, usa:"
msgstr[1] ""
"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
"eliminadas;\n"
-"para borrarlas, use:"
+"para borrarlas, usa:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No se pudo borrar la sección de configuración '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " rastreada"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
-msgstr " viejo (use 'git remote prune' para eliminar)"
+msgstr " viejo (usa 'git remote prune' para eliminar)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebasa interactivamente en remoto %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebasa interactivamente (con fusiones) en remoto %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "rebasa sobre el remoto %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " se fusiona con remoto %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "fusiona con remoto %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s y con el remoto %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "crear"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "borrar"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "actualizado"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "se puede realizar fast-forward"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "desactualizado local"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s fuerza a %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica a %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s fuerza a %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica a %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "no consultar remotos"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL para obtener: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(sin URL)"
@@ -20944,330 +21137,348 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL para publicar: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Rama HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(no consultado)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(desconocido)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Rama HEAD (HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Rama remota:%s"
msgstr[1] " Ramas remotas:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (estado no consultado)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Rama local configurada para 'git pull':"
msgstr[1] " Ramas locales configuradas para 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Las referencias locales serán reflejadas por 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referencia local configurada para 'git push'%s:"
msgstr[1] " Referencias locales configuradas para 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "borrar refs/remotos/<nombre>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "No se puede determinar el HEAD remoto"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "No se pudo borrar %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "No es un ref válido: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "No se pudo configurar %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " ¡%s se volverá colgante!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " ¡%s se ha vuelto colgante!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Recortando %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [se acortará] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [prune realizado] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "recortar remotos tras realizar fetch"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "agregar rama"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "no hay remotos especificados"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de push en lugar de URLs de fetch"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "retornar todos los URLs"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "no hay URLs configurados para remoto '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipular URLs de push"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "agregar URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "borrar URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no tiene sentido"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patrón de URL viejo inválido: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "No se encontró URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "No borrará todos los URLs no de push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<opciones>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Reempaquetados incrementales son incompatibles con índices bitmap. Use\n"
-"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
+"Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n"
+"--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Esperando líneas de ID de objeto completas en hex solo desde pack-"
"objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no se puede finalizar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "no se puede abrir index para %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
-msgstr "pack %s es muy grande para considerar en la progresión geométrica"
+msgstr ""
+"pack %s es demasiado grande para considerar en la progresión geométrica"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
-msgstr "pack %s es muy grande para hacer un roll up"
+msgstr "pack %s es demasiado grande para hacer un roll up"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no se pudo abrir %s para escritura"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "no se pudo cerrar snapshot de refs temporal"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y soltar objetos inalcanzables"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "approxidate"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "con -a, reempaquetar objetos inalcanzables"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usada para la compresión delta"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"lo mismo que arriba, pero limita el tamaño de memoria en lugar del número de "
"entradas"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "reempaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "encontrar una progresión geométrica con factor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escribir un índice multi-pack de los paquetes resultantes"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric es incompatible con -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Nada nuevo para empaquetar."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "falta archivo requerido: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "no se pudo desvincular: %s"
@@ -21416,7 +21627,7 @@
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
+"commit original '%s' contiene un mergetag '%s' que es descartado; usa --edit "
"en lugar de --graft"
#: builtin/replace.c:469
@@ -21577,92 +21788,92 @@
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el árbol de HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No se puede realizar un reset %s en medio de una fusión."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e índice"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "reiniciar HEAD, índice y árbol de trabajo"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "grabar solo el hecho de que las rutas eliminadas serán agregadas luego"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Falló al resolver '%s' como una revisión válida."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Falló al resolver '%s' como un árbol válido."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
+"--mixed con rutas ha sido deprecado; usa 'git reset -- <rutas>' en cambio."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No se puede hacer un reset %s con rutas."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset no está permitido en un repositorio vacío"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N solo puede ser usada con --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21676,12 +21887,12 @@
"usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n"
"para volverlo en el default.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No se puede reiniciar el índice a la revisión '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
@@ -21741,7 +21952,7 @@
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<opciones>] [<arg>...]\n"
"\n"
-"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
+"Ejecuta \"git rev-parse --parseopt -h\" para más información sobre el primer "
"uso."
#: builtin/rev-parse.c:712
@@ -21786,7 +21997,7 @@
#: builtin/rev-parse.c:1023
#, c-format
msgid "unknown mode for --show-object-format: %s"
-msgstr "modo desconocidopara --show-object-format: %s"
+msgstr "modo desconocido para --show-object-format: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -21862,15 +22073,19 @@
msgid "preserve initially empty commits"
msgstr "preservar commits iniciales vacíos"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
@@ -21920,71 +22135,71 @@
msgstr[0] "el siguiente archivo tiene modificaciones locales:"
msgstr[1] "los siguientes archivos tienen modificaciones locales:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "no listar archivos eliminados"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "solo eliminar del índice"
-#: builtin/rm.c:246
-msgid "override the up-to-date check"
-msgstr "salta el check de actualización"
-
#: builtin/rm.c:247
+msgid "override the up-to-date check"
+msgstr "saltar el check de actualización"
+
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "permitir eliminar de forma recursiva"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "salir con estado cero incluso si nada coincide"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"por favor agrega tus cambios a .gitmodules al stage o realiza un stash para "
"proceder"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no eliminando '%s' de manera recursiva sin -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no es posible eliminar %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all y especificaciones <ref> explícitas son mutuamente exclusivas."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directorio> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nombre remoto"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "usar protocolo RPC sin estado"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "leer refs de stdin"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "mostrar status del remote helper"
@@ -22041,21 +22256,21 @@
msgid "group by field"
msgstr "agrupar por campo"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "demasiados argumentos dados fuera del repositorio"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22068,114 +22283,114 @@
msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "no hay refs que concuerden con %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "mostrar ramas locales y de rastreo remoto"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "mostrar ramas de rastreo remoto"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "colorear '*!+-' correspondiendo a la rama"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar <n> commits más tras encontrar el ancestro común"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "sinónimo de más=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "suprimir strings de nombre"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "incluir la rama actual"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "nombrar commits con sus nombres de objeto"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "mostrar bases de fusión posibles"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "mostrar refs inalcanzables por ningún otro ref"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "mostrar commits en orden topológico"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "mostrar solo commits que no estén en la primera rama"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "mostrar fusiones alcanzables por solo una punta"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "no se dieron ramas, y el HEAD no es válido"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "opción --reflog necesita un nombre de rama"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "solo %d entrada puede ser mostrada a la vez."
msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "no existe el ref %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no se puede manejar más de %d rev."
msgstr[1] "no se puede manejar más de %d revs."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' no es una ref válida."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
@@ -22246,72 +22461,86 @@
"este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no "
"existe)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"directorio '%s' contiene archivos no rastreados, pero no está en el cono de "
+"sparse-checkout"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "falló al borrar directorio '%s'"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "falló al crear directorio para el archivo sparse-checkout"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"no es posible actualizar el formato de repositorio para habilitar "
"worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "falló al configurar opción extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicializa el sparse-checkout en modo cono"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "activar el uso de un índice sparse"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "falló al modificar la configuración del índice sparse"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "no se pudo normalizar la ruta %s"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "no es posible dequote la cadena de estilo C '%s'"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "no se pudo cargar patrones de sparse-checkout existentes"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "leer patrones de standard in"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "error al refrescar directorio de trabajo"
@@ -22347,7 +22576,7 @@
" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22377,6 +22606,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
" [--] [<pathspec>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<mensaje>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22400,7 +22637,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear con argumentos no está implementado"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22412,172 +22649,172 @@
" %s ->%s\n"
" Para hacer espacio.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "no se puede aplicar un stash en medio de un merge"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "¡no se pudo generar diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
-msgstr "conflictos en índice. Intente sin --index."
+msgstr "conflictos en índice. Intenta sin --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "no se pudo guardar el árbol de índice"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no se pudo restaurar archivos no rastreados de la entrada stash"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Fusionando %s con %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "El índice no fue sacado de stash."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "no se pudo restaurar archivos no rastreados de la entrada stash"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "intento de recrear el índice"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Descartado %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: No se pudo borrar entrada stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' no es una referencia stash"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "falló al analizar el árbol"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "falló al desempaquetar árboles"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "incluir archivos no rastreados en el stash"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "solo mostrar archivos no rastreados en el stash"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "No se puede actualizar %s con %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "mensaje de stash"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" requiere un argumento <commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes un commit inicial"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "¿Olvidaste 'git add'?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Directorio de trabajo y estado de índice %s guardados"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "No se pueden eliminar cambios del árbol de trabajo"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "mantener index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "stash en modo patch"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "modo tranquilo"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "incluir archivos sin seguimiento en stash"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "incluir archivos ignorados"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
"¡el soporte para stash.useBuiltin ha sido eliminado!\n"
-"Vea su entrada en 'git help config' para detalles."
+"Mira su entrada en 'git help config' para detalles."
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -22596,7 +22833,7 @@
msgid "prepend comment character and space to each line"
msgstr "anteponer carácter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
@@ -22610,27 +22847,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
+"su propio upstream autoritario."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrando '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22639,7 +22884,7 @@
"run_command devolvió estado no cero para %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22650,79 +22895,70 @@
"anidados de %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "suprime la salida de inicializar cada comando de submódulo"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "recursar en submódulos anidados"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
-"su propio upstream autoritativo."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "suprime la salida de inicializar un submódulo"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opciones>] [<path>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no se pudo resolver ref de HEAD dentro del submódulo '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falló al recursar en el submódulo '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "suprimir salida del estado del submódulo"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22730,109 +22966,109 @@
"usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "no se pudo realizar hash del objeto '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "modo %o inesperado\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
"usar el commit guardado en el índice para comparar con el guardado en el "
"submódulo HEAD"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "limitar el tamaño de resumen"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "no se puede obtener la revisión para HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached y --files son mutuamente exclusivos"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url del submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "error al actualizar el remoto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "suprime la salida de sincronizar el url del submódulo"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-"El árbol de trabajo de submódulo '%s' contiene un directorio .git (use 'rm -"
+"El árbol de trabajo de submódulo '%s' contiene un directorio .git (usa 'rm -"
"rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22841,46 +23077,46 @@
"El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-"
"f' para descartarlas"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directorio '%s' limpiado\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No se pudo eliminar el árbol de trabajo de submódulo '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no se pudo crear directorio vacío de submódulo %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"quitar árboles de trabajo de submódulos incluso si contienen cambios locales"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "quitar todos los submódulos"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Usa '--all' si realmente quieres desinicializar todos los submódulos"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22889,72 +23125,72 @@
msgstr ""
"Una alternativa calculada a partir de la alternativa de un superproyecto no "
"es válida.\n"
-"Para permitir que Git clone sin una alternativa en ese caso, establezca\n"
-"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar "
+"Para permitir que Git clone sin una alternativa en ese caso, establece\n"
+"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clona "
"con\n"
"'--reference-if-able' en lugar de '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clonación de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "directorio no está vacío: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "forzar el proceso de clonación"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "no permitir clonar en directorios no vacíos"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22964,83 +23200,182 @@
"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
"url <url> --path <ruta>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "¿Tal vez quieres usar 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No es posible revisar '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "No es posible ejecutar rebase a '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Incapaz de fusionar '%s' en la ruta del submódulo '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Falló la ejecución de '%s %s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ruta de submódulo '%s': check out realizado a '%s'\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ruta de submódulo '%s': rebasado a '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ruta de submódulo '%s': fusionado en '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ruta de submódulo '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"No es posible realizar fetch en la ruta de submódulo '%s'; intentando hacer "
+"un fetch directo de %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Fetch realizado en la ruta de submódulo '%s', pero no contenía %s. Fetch "
+"directo del commit falló."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "ruta al árbol de trabajo"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "crea un clon superficial truncado al número especificado de revisiones"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "tareas paralelas"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación de superficialidad"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonación"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "suprime la salida para actualización por rebase o fusión"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "forzar actualizaciones de checkout"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "no recuperar objetos nuevos del sitio remoto"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"sobreescribe el modo de actualización en caso de que el respositorio sea un "
+"clon fresco"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "profundidad para recuperación superficial"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 esperado para superproyecto"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 del submódulo de HEAD"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<options>] <path>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23049,144 +23384,194 @@
"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
"el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "revisar si es seguro escribir al archivo .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
-msgstr "desconfigura la opción en el archivo .gitmodules"
+msgstr "desconfigurar la opción en el archivo .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nombre> [<valor>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nombre>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"por favor asegúrate que el archivo .gitmodules esté en el árbol de trabajo"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "suprime la salida de inicializar la url de un submódulo"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "configurar la rama de rastreo por defecto a master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "configurar la rama de rastreo por defecto"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch o --default requerido"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch y --default son mutuamente exclusivos"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Agregando el repositorio existente en '%s' al índice\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' ya existe y no es un repositorio git válido"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
-"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):"
+"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
+"Si quieres reusar este directorio git local en lugar de clonar nuevamente "
+"de\n"
" %s\n"
"usa la opción '--force'. Si el directorio git local no es el repositorio "
"correcto\n"
"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
-"'--name'.\n"
+"'--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Reactivando directorio git local para el submódulo '%s'.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "no es posible hacer checkout al submódulo '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "la rama del repositorio para hacer checkout durante clonado"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Falló al agregar el submódulo '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Falló al registrar el submódulo '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' ya existe en el índice"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' ya existe en el índice y no es un submódulo"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "rama del repositorio para agregar como submódulo"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
-msgstr "permitir agregar una ruta de submódulo sino ignorada"
+msgstr "permitir agregar una ruta de submódulo que de otro modo se ignora"
-#: builtin/submodule--helper.c:2917
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "mostrar solo mensajes de error"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "prestar los objetos de los repositorios de referencia"
+
+#: builtin/submodule--helper.c:3262
msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
msgstr ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <ruta> --"
-"name <nombre>"
+"configura el nombre del submódulo para el string dado en lugar de ir a la "
+"ruta por defecto"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <repository> [<path>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
+"trabajo"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: '%s' debe ser absoluta o iniciar con ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' no es un nombre de submódulo válido"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper válido"
@@ -23211,21 +23596,21 @@
msgid "shorten ref output"
msgstr "salida de referencia más corta"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "razón"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "razón de la actualización"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n"
-"\t\t<nombre-tag> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+" <tagname> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23235,13 +23620,13 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <objeto>]\n"
-"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
-"[<patrón>...]"
+"points-at <object>]\n"
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23306,130 +23691,130 @@
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "¿sin mensaje de tag?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "El mensaje del tag ha sido dejado en %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de tag"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contengan el commit"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contengan el commit"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "solo imprimir las tags que estén fusionadas"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "solo imprimir las tags que no estén fusionadas"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "solo imprimir tags del objeto"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en modo lista"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "solo se permite una de las opciones, -m o -F."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de tag válido."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -23443,202 +23828,197 @@
msgid "failed to create directory %s"
msgstr "falló al crear directorio %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "falló al crear el archivo %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "falló al eliminar el archivo %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "falló al eliminar directorio %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Probando mtime en '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"info de estado del directorio no cambia tras agregar un nuevo directorio"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "info de estado del directorio cambia tras actualizar un archivo"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"info de estado del directorio cambia tras agregar un archivo dentro del "
"subdirectorio"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "info de estado del directorio no cambia tras borrar un archivo"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "info de estado del directorio no cambia tras borrar un directorio"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opciones>] [--] [<archivo>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
"continuar refresh (refrescamiento) incluso cuando el índice necesita "
"actualización"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "refresh: ignora submódulos"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "no ignorar archivos nuevos"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "permitir que archivos remplacen directorios y viceversa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "avisar de archivos faltando del árbol de trabajo"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "refrescar información de estado"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, pero ignora configuración assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<ruta>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "agregar la entrada especificada al índice"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "marcar archivos como \"not changing\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "limpiar bit assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "marcar archivos como \"index-only\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "limpiar bit skip-worktree"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "no tocar entradas index-only"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"agregar solo al índice; no agregar contenido a la base de datos de objetos"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "leer la lista de rutas que actualizar desde standard input"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "agregar entradas de standard input al índice"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repoblar stages #2 y #3 para las rutas listadas"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "solo actualizar entradas que difieran de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "ignorar archivos faltantes en el árbol de trabajo"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "reportar acciones por standard output"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(para porcelanas) olvidar conflictos guardados sin resolución"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "escribir índice en este formato"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "activar o desactivar índice dividido"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "habilitar o deshabilitar caché no rastreado"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "probar si el filesystem soporta caché no rastreado"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "habilitar caché no rastreado sin probar el filesystem"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "escribir el índice incluso si no está marcado como cambiado"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "activar o desactivar monitor de sistema de archivos"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "marcar archivos como válidos para fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
-msgstr "limpia el bit de validación fsmonitor"
+msgstr "limpiar el bit de validación fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23646,7 +24026,7 @@
"core.splitIndex está configurado en false; quítalo o cámbialo, si realmente "
"quieres habilitar el índice partido"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23654,7 +24034,7 @@
"core.splitIndex está configurado en true; quítalo o cámbialo, si realmente "
"quieres deshabilitar el índice partido"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23662,11 +24042,11 @@
"core.untrackedCache está configurado en true; quítalo o cámbialo, si "
"realmente quieres deshabilitar el chaché no rastreado"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Caché no rastreado deshabilitado"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23674,29 +24054,29 @@
"core.untrackedCache está configurado en false; quítalo o cámbialo, si "
"realmente quieres habilitar el caché no rastreado"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Caché no rastreado habilitado para '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor no está configurado; actívalo si realmente quieres habilitar "
"fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor activado"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor está configurado; quítalo si realmente quieres deshabilitar "
"el fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor desactivado"
@@ -23714,21 +24094,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opciones>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "eliminar la referencia"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
-msgstr "actualiza <refname> no la a que apunta"
+msgstr "actualizar <refname> no la a que apunta"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin tiene argumentos terminados en NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
-msgstr "lee actualizaciones de stdin"
+msgstr "leer actualizaciones de stdin"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
@@ -23736,25 +24116,25 @@
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
-msgstr "actualiza los archivos info desde cero"
+msgstr "actualizar los archivos info desde cero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opciones>] <directorio>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
-msgstr "sale después de un solo intercambio petición/respuesta"
+msgstr "salir después de un solo intercambio petición/respuesta"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "salir inmediatamente tras el anuncio inicial de ref"
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir los info/refs para git-http-backend"
#: builtin/upload-pack.c:29
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "no probar <directorio>/.git/ si <directorio> no es un directorio Git"
+
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
@@ -23768,7 +24148,7 @@
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
-msgstr "muestra la salida de status gpg en formato raw"
+msgstr "mostrar la salida de status gpg en formato raw"
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
@@ -23790,63 +24170,58 @@
msgid "print tag contents"
msgstr "imprimir contenido del tag"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opciones>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opciones>] <ruta>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> <nueva-ruta>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opciones>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opciones>] <worktree>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "falló al borrar '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Eliminando %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
-msgstr "reporta árboles de trabajo recortados"
+msgstr "reportar árboles de trabajo recortados"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "caducar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "destino de worktree inutilizable '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23856,7 +24231,7 @@
"usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
"limpiar"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23865,219 +24240,219 @@
"'%s' es un árbol de trabajo faltante pero ya registrado;\n"
"usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "inicializando"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"hacer checkout a <rama> incluso si ya hay checkout de ella en otro árbol de "
"trabajo"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason requiere --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "agregado con --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
+"agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose and --porcelain son mutuamente exclusivas"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"árboles de trabajo conteniendo submódulos no pueden ser movidos o eliminados"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no se pudo descubrir el nombre de destino de '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
-"use 'move -f -f' para forzar o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"no se puede mover un árbol de trabajo bloqueado;\n"
-"use 'move -f -f' para forzar o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-"'%s' contiene archivos modificados o no rastreados, use --force para borrarlo"
+"'%s' contiene archivos modificados o no rastreados, usa --force para borrarlo"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forzar eliminación incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
-"use 'remove -f -f' para forzar o desbloquear primero"
+"usa 'remove -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"no se pueden eliminar árbol de trabajo bloqueado;\n"
-"use 'remove -f -f' para forzar o desbloquear primero"
+"usa 'remove -f -f' para forzar o desbloquear primero"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "reparar: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "error: %s: %s"
@@ -24125,7 +24500,7 @@
"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
-"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
+"guías de concepto. Consulta 'git help <command>' o 'git help <concepto>'\n"
"para leer sobre un subcomando o concepto específico.\n"
"Mira 'git help git' para una vista general del sistema."
@@ -24205,17 +24580,17 @@
msgid "close failed on standard output"
msgstr "cierre falló en standard output"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "no se puede manejar %s como un builtin"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24226,12 +24601,12 @@
"\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "falló al ejecutar comando '%s': %s\n"
@@ -24278,67 +24653,33 @@
msgid "exit immediately after advertising capabilities"
msgstr "salir inmediatamente tras anunciar capacidades"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe ya está en uso: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "no se pudo iniciar el servidor en: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "no se puede generar demonio en el background"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "falló waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "demonio no está en línea todavía"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "falló al iniciar demonio"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid está confundido"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "demonio no se ha apagado todavía"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<nombre>] [<opciones>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<nombre>] [<hilos>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<nombre>] [<hilos>] [<espera-maxima>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<nombre>] [<espera-maxima>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<nombre>] [<token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
"test-helper simple-ipc sendbytes [<nombre>] [<cuenta de bytes>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24346,85 +24687,81 @@
"test-helper simple-ipc multiple [<nombre>] [<hilos>] [<cuenta de bytes>] "
"[<tamaño de batch>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "nombre o ruta de nombre de socket de dominio unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "nombre de named-pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "número de hilos en el pool de hilos del servidor"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "segundos a esperar para que el dominio empiece o se detenga"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "número de bytes"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
-msgstr "númeor de peticiones por hilo"
+msgstr "número de peticiones por hilo"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
-msgstr "caracter lastre"
+msgstr "carácter lastre"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "token"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
-msgstr "comando token para enviar al servidor"
+msgstr "token de comando para enviar al servidor"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negativo para http.postbuffer; poniendo el default %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegación de control no es soportada con cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fijación de llave pública no es soportada con cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
"SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24440,47 +24777,53 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "quoting inválido en valor de push-option: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
"packet"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "respuesta de servidor inválida; se obtuvo '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "repositorio '%s' no encontrado"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autenticación falló para '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"no es posible acceder a '%s' con la configuración http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "no es posible acceder a '%s': %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "redirigiendo a %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "no se debería tener EOF cuando no es laxo con EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
@@ -24489,83 +24832,83 @@
msgstr ""
"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: mal carácter de largo de línea: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: packet de respuesta final inesperado"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC falló; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "no se puede manejar pushes tan grandes"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "no se puede desinflar el request; zlib deflate error %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "no se puede desinflar el request; zlib end error %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d bytes de header de longitud fueron recibidos"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d bytes de cuerpo se siguen esperando"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "dump http transport no soporta capacidades superficiales"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "fetch falló."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "no se puede hacer fetch por sha1 sobre smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http transport no soporta %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push falló"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: error al leer command stream de git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: fetch intentado sin un repositorio local"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: comando '%s' desconocido de git"
@@ -24586,46 +24929,46 @@
msgid "object filtering"
msgstr "filtrado de objeto"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "fecha de caducidad"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
-#: parse-options.h:310
+#: parse-options.h:309
msgid "be more verbose"
msgstr "ser más verboso"
-#: parse-options.h:312
+#: parse-options.h:311
msgid "be more quiet"
msgstr "ser más callado"
-#: parse-options.h:318
+#: parse-options.h:317
msgid "use <n> digits to display object names"
-msgstr "use <n> cifras para mostrar los nombres de los objetos"
+msgstr "usar <n> cifras para mostrar los nombres de los objetos"
-#: parse-options.h:337
+#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"
-#: parse-options.h:338
+#: parse-options.h:337
msgid "read pathspec from file"
msgstr "leer pathspec de archivo"
-#: parse-options.h:339
+#: parse-options.h:338
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-"con --pathspec-from-file, elementos de pathspec son separados con caracter "
+"con --pathspec-from-file, elementos de pathspec son separados con carácter "
"NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "clave"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nombre del campo por el cuál ordenar"
@@ -24637,7 +24980,7 @@
#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Agrega contenido de archivos al índice"
+msgstr "Agregar contenido de archivos al índice"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
@@ -24661,7 +25004,7 @@
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
+msgstr "Usar la búsqueda binaria para encontrar el commit que introdujo el bug"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
@@ -24670,7 +25013,7 @@
#: command-list.h:58
msgid "List, create, or delete branches"
-msgstr "Lista, crea, o borra ramas"
+msgstr "Listar, crear, o borrar ramas"
#: command-list.h:59
msgid "Collect information for user to file a bug report"
@@ -24701,7 +25044,7 @@
#: command-list.h:65
msgid "Switch branches or restore working tree files"
-msgstr "Cambia de rama o restaura archivos del árbol de trabajo"
+msgstr "Cambiar de rama o restaura archivos del árbol de trabajo"
#: command-list.h:66
msgid "Copy files from the index to the working tree"
@@ -24709,15 +25052,15 @@
#: command-list.h:67
msgid "Ensures that a reference name is well formed"
-msgstr "Asegura que un nombre de referencia esté bien formado"
+msgstr "Asegurar que un nombre de referencia esté bien formado"
#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
-msgstr "Encuentra commits que falten aplicar en upstream"
+msgstr "Encontrar commits que falten aplicar en upstream"
#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
-msgstr "Aplica los cambios introducidos por algunos commits existentes"
+msgstr "Aplicar los cambios introducidos por algunos commits existentes"
#: command-list.h:70
msgid "Graphical alternative to git-commit"
@@ -24729,7 +25072,7 @@
#: command-list.h:72
msgid "Clone a repository into a new directory"
-msgstr "Clona un repositorio dentro de un nuevo directorio"
+msgstr "Clonar un repositorio dentro de un nuevo directorio"
#: command-list.h:73
msgid "Display data in columns"
@@ -24737,15 +25080,15 @@
#: command-list.h:74
msgid "Record changes to the repository"
-msgstr "Graba los cambios al repositorio"
+msgstr "Grabar los cambios al repositorio"
#: command-list.h:75
msgid "Write and verify Git commit-graph files"
-msgstr "Escribe y verifica los archivos commit-graph de Git"
+msgstr "Escribir y verificar los archivos commit-graph de Git"
#: command-list.h:76
msgid "Create a new commit object"
-msgstr "Crea un nuevo objeto commit"
+msgstr "Crear un nuevo objeto commit"
#: command-list.h:77
msgid "Get and set repository or global options"
@@ -24769,11 +25112,11 @@
#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
-msgstr "Exporta un commit único a CVS checkout"
+msgstr "Exportar un commit único a CVS checkout"
#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Salva tus datos de otro SCM que la gente adora odiar"
+msgstr "Salvar tus datos de otro SCM que la gente adora odiar"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -24791,20 +25134,20 @@
#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
+msgstr "Mostrar los cambios entre commits, commit y árbol de trabajo, etc"
#: command-list.h:88
msgid "Compares files in the working tree and the index"
-msgstr "Compara archivos del árbol de trabajo y del índice"
+msgstr "Comparar archivos del árbol de trabajo y del índice"
#: command-list.h:89
msgid "Compare a tree to the working tree or index"
-msgstr "Compara un árbol con el árbol de trabajo o índice"
+msgstr "Comparar un árbol con el árbol de trabajo o índice"
#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
+"Comparar el contenido y el modo de blobs encontrados a través de dos objetos "
"de árbol"
#: command-list.h:91
@@ -24821,11 +25164,11 @@
#: command-list.h:94
msgid "Download objects and refs from another repository"
-msgstr "Descarga objetos y referencias de otro repositorio"
+msgstr "Descargar objetos y referencias de otro repositorio"
#: command-list.h:95
msgid "Receive missing objects from another repository"
-msgstr "Descarga objetos faltantes de otro repositorio"
+msgstr "Descargar objetos faltantes de otro repositorio"
#: command-list.h:96
msgid "Rewrite branches"
@@ -24833,7 +25176,7 @@
#: command-list.h:97
msgid "Produce a merge commit message"
-msgstr "Produce un mensaje de commit de fusión"
+msgstr "Producir un mensaje de commit de fusión"
#: command-list.h:98
msgid "Output information on each ref"
@@ -24841,28 +25184,28 @@
#: command-list.h:99
msgid "Run a Git command on a list of repositories"
-msgstr "Ejecute un comando de Git en una lista de repositorios"
+msgstr "Ejecutar un comando de Git en una lista de repositorios"
#: command-list.h:100
msgid "Prepare patches for e-mail submission"
-msgstr "Prepara parches para ser enviados por e-mail"
+msgstr "Preparar parches para ser enviados por e-mail"
#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+"Verificar la conectividad y disponibilidad de los objetos en la base de datos"
#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
+msgstr "Limpiar archivos innecesarios y optimiza el repositorio local"
#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Extrae el ID de commit de una crónica creada usando git-archive"
+msgstr "Extraer el ID de commit de una crónica creada usando git-archive"
#: command-list.h:104
msgid "Print lines matching a pattern"
-msgstr "Imprime las líneas que concuerden con el patrón"
+msgstr "Imprimir las líneas que concuerden con el patrón"
#: command-list.h:105
msgid "A portable graphical interface to Git"
@@ -24870,7 +25213,7 @@
#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
+msgstr "Computar ID de objeto y, opcionalmente, crear un blob de un archivo"
#: command-list.h:107
msgid "Display help information about Git"
@@ -24882,11 +25225,11 @@
#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
-msgstr "Descarga de un repositorio Git remoto vía HTTP"
+msgstr "Descargar de un repositorio Git remoto vía HTTP"
#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
+msgstr "Empujar objetos por HTTP/DAV a otro repositorio"
#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
@@ -24894,11 +25237,11 @@
#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
-msgstr "Construye un archivo de índice para una crónica empaquetada existente"
+msgstr "Construir un archivo de índice para una crónica empaquetada existente"
#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
+msgstr "Crear un repositorio de Git vacío o reinicia el que ya existe"
#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
@@ -24914,19 +25257,19 @@
#: command-list.h:117
msgid "Show commit logs"
-msgstr "Muestra los logs de los commits"
+msgstr "Mostrar los logs de los commits"
#: command-list.h:118
msgid "Show information about files in the index and the working tree"
-msgstr "Muestra información sobre archivos en el índice y el árbol de trabajo"
+msgstr "Mostrar información sobre archivos en el índice y el árbol de trabajo"
#: command-list.h:119
msgid "List references in a remote repository"
-msgstr "Lista referencias en un repositorio remoto"
+msgstr "Listar referencias en un repositorio remoto"
#: command-list.h:120
msgid "List the contents of a tree object"
-msgstr "Lista los contenidos de un objeto árbol"
+msgstr "Listar los contenidos de un objeto árbol"
#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
@@ -24938,23 +25281,23 @@
#: command-list.h:123
msgid "Run tasks to optimize Git repository data"
-msgstr "Ejecute tareas para optimizar los datos del repositorio de Git"
+msgstr "Ejecutar tareas para optimizar los datos del repositorio de Git"
#: command-list.h:124
msgid "Join two or more development histories together"
-msgstr "Junta dos o más historiales de desarrollo juntos"
+msgstr "Juntar dos o más historiales de desarrollo juntos"
#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
-msgstr "Encuentra ancestros tan buenos como posible para una fusión"
+msgstr "Encontrar ancestros tan buenos como posible para una fusión"
#: command-list.h:126
msgid "Run a three-way file merge"
-msgstr "Ejecuta una fusión de tres vías en un archivo"
+msgstr "Ejecutar una fusión de tres vías en un archivo"
#: command-list.h:127
msgid "Run a merge for files needing merging"
-msgstr "Ejecuta una fusión para archivos que la necesiten"
+msgstr "Ejecutar una fusión para archivos que la necesiten"
#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
@@ -24963,8 +25306,8 @@
#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
-"conflictos de fusión"
+"Ejecutar las herramientas de fusión de resolución de conflictos para "
+"resolver conflictos de fusión"
#: command-list.h:130
msgid "Show three-way merge without touching index"
@@ -24972,11 +25315,11 @@
#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
-msgstr "Escribe y verifica archivos multi-pack-index"
+msgstr "Escribir y verificar archivos multi-pack-index"
#: command-list.h:132
msgid "Creates a tag object with extra validation"
-msgstr "Crea un objeto de etiqueta con validación adicional"
+msgstr "Crear un objeto de etiqueta con validación adicional"
#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
@@ -24984,7 +25327,7 @@
#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
+msgstr "Mover o cambiar el nombre a archivos, directorios o enlaces simbólicos"
#: command-list.h:135
msgid "Find symbolic names for given revs"
@@ -24992,7 +25335,7 @@
#: command-list.h:136
msgid "Add or inspect object notes"
-msgstr "Agrega o inspecciona notas de objeto"
+msgstr "Agregar o inspeccionar notas de objeto"
#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
@@ -25000,15 +25343,15 @@
#: command-list.h:138
msgid "Create a packed archive of objects"
-msgstr "Crea una crónica de objetos empaquetada"
+msgstr "Crear una crónica de objetos empaquetada"
#: command-list.h:139
msgid "Find redundant pack files"
-msgstr "Encuentra archivos de paquete redundantes"
+msgstr "Encontrar archivos de paquete redundantes"
#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
-msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
+msgstr "Empaquetar heads y tags para un acceso eficiente al repositorio"
#: command-list.h:141
msgid "Compute unique ID for a patch"
@@ -25016,7 +25359,8 @@
#: command-list.h:142
msgid "Prune all unreachable objects from the object database"
-msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
+msgstr ""
+"Limpiar todos los objetos no alcanzables de la base de datos de objetos"
#: command-list.h:143
msgid "Remove extra objects that are already in pack files"
@@ -25024,27 +25368,27 @@
#: command-list.h:144
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Realiza un fetch e integra con otro repositorio o rama local"
+msgstr "Realizar un fetch e integra con otro repositorio o rama local"
#: command-list.h:145
msgid "Update remote refs along with associated objects"
-msgstr "Actualiza referencias remotas junto con sus objetos asociados"
+msgstr "Actualizar referencias remotas junto con sus objetos asociados"
#: command-list.h:146
msgid "Applies a quilt patchset onto the current branch"
-msgstr "Aplica un parche quilt en la rama actual"
+msgstr "Aplicar un parche quilt en la rama actual"
#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
+msgstr "Comparar dos rangos de commits (por ejemplo dos versions de un branch)"
#: command-list.h:148
msgid "Reads tree information into the index"
-msgstr "Lee información del árbol al índice"
+msgstr "Leer información del árbol al índice"
#: command-list.h:149
msgid "Reapply commits on top of another base tip"
-msgstr "Vuelve a aplicar commits en la punta de otra rama"
+msgstr "Volver a aplicar commits en la punta de otra rama"
#: command-list.h:150
msgid "Receive what is pushed into the repository"
@@ -25056,7 +25400,7 @@
#: command-list.h:152
msgid "Manage set of tracked repositories"
-msgstr "Gestiona un conjunto de repositorios rastreados"
+msgstr "Gestionar un conjunto de repositorios rastreados"
#: command-list.h:153
msgid "Pack unpacked objects in a repository"
@@ -25064,11 +25408,11 @@
#: command-list.h:154
msgid "Create, list, delete refs to replace objects"
-msgstr "Crea, lista, borra referencias para reemplazar objetos"
+msgstr "Crear, listar, borrar referencias para reemplazar objetos"
#: command-list.h:155
msgid "Generates a summary of pending changes"
-msgstr "Genera un resumen de cambios pendientes"
+msgstr "Generar un resumen de cambios pendientes"
#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
@@ -25076,7 +25420,7 @@
#: command-list.h:157
msgid "Reset current HEAD to the specified state"
-msgstr "Reinicia el HEAD actual a un estado específico"
+msgstr "Reiniciar el HEAD actual a un estado específico"
#: command-list.h:158
msgid "Restore working tree files"
@@ -25084,11 +25428,11 @@
#: command-list.h:159
msgid "Revert some existing commits"
-msgstr "Revierte algunos commits existentes"
+msgstr "Reviertir algunos commits existentes"
#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
-msgstr "Lista objetos commit en orden cronológico inverso"
+msgstr "Listar objetos commit en orden cronológico inverso"
#: command-list.h:161
msgid "Pick out and massage parameters"
@@ -25096,11 +25440,11 @@
#: command-list.h:162
msgid "Remove files from the working tree and from the index"
-msgstr "Borra archivos del árbol de trabajo y del índice"
+msgstr "Borrar archivos del árbol de trabajo y del índice"
#: command-list.h:163
msgid "Send a collection of patches as emails"
-msgstr "Envía una colección de parches como e-mails"
+msgstr "Enviar una colección de parches como e-mails"
#: command-list.h:164
msgid "Push objects over Git protocol to another repository"
@@ -25116,7 +25460,7 @@
#: command-list.h:167
msgid "Show various types of objects"
-msgstr "Muestra varios tipos de objetos"
+msgstr "Mostrar varios tipos de objetos"
#: command-list.h:168
msgid "Show branches and their commits"
@@ -25140,7 +25484,7 @@
#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicializa y modifica el sparse-checkout"
+msgstr "Inicializar y modificar el sparse-checkout"
#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
@@ -25148,11 +25492,11 @@
#: command-list.h:175
msgid "Add file contents to the staging area"
-msgstr "Agrega contenidos de un archivo al área de staging"
+msgstr "Agregar contenidos de un archivo al área de staging"
#: command-list.h:176
msgid "Show the working tree status"
-msgstr "Muestra el estado del árbol de trabajo"
+msgstr "Mostrar el estado del árbol de trabajo"
#: command-list.h:177
msgid "Remove unnecessary whitespace"
@@ -25160,7 +25504,7 @@
#: command-list.h:178
msgid "Initialize, update or inspect submodules"
-msgstr "Inicializa, actualiza o inspecciona submódulos"
+msgstr "Inicializar, actualizar o inspeccionar submódulos"
#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
@@ -25172,33 +25516,33 @@
#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
-msgstr "Lee, modifica y borra referencias simbólicas"
+msgstr "Leer, modificar y borrar referencias simbólicas"
#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Crea, lista, borra o verifica un objeto de tag firmado con GPG"
+msgstr "Crear, listar, borrar o verificar un objeto de tag firmado con GPG"
#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
-msgstr "Crea un archivo temporal con contenidos de un blob"
+msgstr "Crear un archivo temporal con contenidos de un blob"
#: command-list.h:184
msgid "Unpack objects from a packed archive"
-msgstr "Desempaqueta objetos de una crónica empaquetada"
+msgstr "Desempaquetar objetos de una crónica empaquetada"
#: command-list.h:185
msgid "Register file contents in the working tree to the index"
-msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
+msgstr "Registrar contenidos de archivos en el árbol de trabajo al índice"
#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
-"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
+"Actualizar el nombre del objeto almacenado en una referencia de forma segura"
#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-"Actualiza el archivo de información auxiliar para ayudar a los servidores "
+"Actualizar el archivo de información auxiliar para ayudar a los servidores "
"dumb"
#: command-list.h:188
@@ -25219,11 +25563,11 @@
#: command-list.h:192
msgid "Validate packed Git archive files"
-msgstr "Valida crónicas Git empaquetadas"
+msgstr "Validar crónicas Git empaquetadas"
#: command-list.h:193
msgid "Check the GPG signature of tags"
-msgstr "Verifica la firma GPG de etiquetas"
+msgstr "Verificar la firma GPG de etiquetas"
#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
@@ -25231,15 +25575,15 @@
#: command-list.h:195
msgid "Show logs with difference each commit introduces"
-msgstr "Muestra logs con las diferencias que cada commit introduce"
+msgstr "Mostrar logs con las diferencias que cada commit introduce"
#: command-list.h:196
msgid "Manage multiple working trees"
-msgstr "Gestiona múltiples árboles de trabajo"
+msgstr "Gestionar múltiples árboles de trabajo"
#: command-list.h:197
msgid "Create a tree object from the current index"
-msgstr "Crea un objeto árbol del índice actual"
+msgstr "Crear un objeto árbol del índice actual"
#: command-list.h:198
msgid "Defining attributes per path"
@@ -25283,7 +25627,7 @@
#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
-msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+msgstr "Especificar de forma intencional archivos sin seguimiento a ignorar"
#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
@@ -25327,41 +25671,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect falló: no se proveyó comando."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "ejecutando $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect falló:\n"
-"código de salida $res de '$command' es <0 o >=128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect no puede seguir continuando"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"bisect run falló:\n"
-"'bisect-state $state' salió con el código de error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect exitoso"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25402,55 +25711,19 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Fusión simple no funcionó, intentando fusión automática."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
-"trabajo"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ya existe en el índice"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' no tiene un commit checked out"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Falló al agregar el submódulo '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Falló al registrar el submódulo '$sm_path'"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No se pudo encontrar la revisión actual en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25459,402 +25732,11 @@
"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
"de submódulo '$sm_path'"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
-"intentando hacer un fetch directo de $sha1:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Fetch realizado en la ruta de submódulo '$displaypath', pero no contenía "
-"$sha1. Fetch directo del commit falló."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No es posible ejecutar rebase a '$sha1' en la ruta de submódulo "
-"'$displaypath'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': rebasado a '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': fusionado en '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Falló la ejecución de '$command $sha1' en la ruta de submódulo '$displaypath'"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autostash aplicado."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No se puede almacenar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Aplicar autostash resultó en conflictos.\n"
-"Tus cambios están seguros en el stash.\n"
-"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
-"momento.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasando ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Comandos:\n"
-"p, pick <commit> = usar commit\n"
-"r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
-"e, edit <commit> = usar commit, pero parar para un amend\n"
-"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
-"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
-"este commit\n"
-"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n"
-"d, drop <commit> = eliminar commit\n"
-"l, label <label> = poner label al HEAD actual con un nombre\n"
-"t, reset <label> = reiniciar HEAD al label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". crea un commit de fusión usando el mensaje original de\n"
-". fusión (o la línea de oneline, si no se especifica un mensaje\n"
-". de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
-"\n"
-"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
-"abajo.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Puedes enmendar el commit ahora, con\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Una vez que estés satisfecho con los cambios, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no es un commit que pueda ser cogido"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nombre de commit inválido: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No se puede escribir el remplazo sha1 del commit actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No se puede realizar avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No se puede mover HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Rehusando ejecutar squash en fusión: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error al rehacer fusión $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No se pudo coger $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Este es el mensaje del commit #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El mensaje del commit #${n} será ignorado:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Esta es una combinación de $count commit."
-msgstr[1] "Esta es la combinación de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No se puede escribir $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Esto es una combinación de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No se pudo aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
-"$rest\n"
-"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
-"commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
-"problema antes\n"
-"de que sea capaz de reformular el commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Detenido en $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No se puede '$squash_style' sin un commit previo"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Ejecutando: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ejecución fallida: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Puedes corregir el problema y entonces ejecutar\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"La ejecución tuvo éxito: $rest\n"
-"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
-"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Comando desconocido: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name rebasado y actualizado satisfactoriamente."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Tienes cambios en el área de stage de tu árbol de trabajo.\n"
-"Si estos cambios están destinados a\n"
-"ser aplastados en el commit previo, ejecuta:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"En ambos casos, cuando termines, continue con:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Error al tratar de encontrar la identidad del autor para remediar el commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
-"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No se pudo realizar el commit con los cambios en el área de stage."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No se pudo ejecutar el editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No se pudo crear $state_dir temporalmente"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No se pudo marcar como interactivo"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacíos están comentados"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No se pudo inicializar los commits reescritos"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25872,55 +25754,32 @@
msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar rebase: Tienes cambios que no están en el área de stage."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"No se puede reescribir las ramas: Tienes cambios que no están en el área de "
"stage."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar pull con rebase: Tienes cambios que no están en el área "
-"de stage."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No se puede $action: Tienes cambios que no están en el área de stage."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer rebase: Tu índice contiene cambios que no están en un "
-"commit."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer pull con rebase: Tu índice contiene cambios que no están "
-"en un commit."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No se puede $action: El índice contiene cambios sin confirmar."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
"trabajo."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Incapaz de determinar la ruta absoluta del directorio git"
@@ -25993,8 +25852,8 @@
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n"
-"Para eliminar '%s' líneas, bórrelas.\n"
+"Para eliminar '%s' líneas, haz de ellas líneas ' ' (contexto).\n"
+"Para eliminar '%s' líneas, bórralas.\n"
"Líneas comenzando con %s serán eliminadas.\n"
#: git-add--interactive.perl:1143
@@ -26014,8 +25873,8 @@
"n - no aplicar stage a este fragmento\n"
"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n"
"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n"
-"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en este "
-"archivo"
+"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en "
+"este archivo"
#: git-add--interactive.perl:1257
msgid ""
@@ -26029,7 +25888,8 @@
"n - no hacer stash a este fragmento\n"
"q - quit; no hacer stash a este fragmento ni a ninguno de los restantes\n"
"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
-"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo"
#: git-add--interactive.perl:1263
msgid ""
@@ -26041,10 +25901,12 @@
msgstr ""
"y - sacar este fragmento del área de stage\n"
"n - no sacar este fragmento del area de stage\n"
-"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n"
-"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el "
-"archivo"
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
+"archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo"
#: git-add--interactive.perl:1269
msgid ""
@@ -26231,14 +26093,14 @@
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
-"status - muestra las rutas con cambios\n"
-"update - agrega el estado del árbol de trabajo al set de cambios en "
+"status - mostrar las rutas con cambios\n"
+"update - agregar el estado del árbol de trabajo al set de cambios en "
"el área de stage\n"
-"revert - revierte los cambios en el área de stage de regreso a la "
+"revert - revertir los cambios en el área de stage de regreso a la "
"versión HEAD\n"
-"patch - selecciona los hunks y actualiza de forma selectiva\n"
+"patch - seleccionar los hunks y actualiza de forma selectiva\n"
"diff - mirar la diff entre HEAD y el índice\n"
-"add untracked - agrega contenidos de archivos no rastreados al grupo de "
+"add untracked - agregar contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
@@ -26298,9 +26160,9 @@
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
"fatal: opciones de configuración encontradas para 'sendmail'\n"
-"git-send-email está configurado con las opciones sendemail.* - tenga en "
-"cuenta la 'e'.\n"
-"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta "
+"git-send-email está configurado con las opciones sendemail.* - ten en cuenta "
+"la 'e'.\n"
+"Establece sendemail.forbidSendmailVariables en false para deshabilitar esta "
"verificación.\n"
#: git-send-email.perl:530 git-send-email.perl:746
@@ -26394,10 +26256,10 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"Líneas que comienzan en \"GIT:\" serán eliminadas.\n"
-"Considere incluir un diffstat global o una tabla de contenidos\n"
+"Considera incluir un diffstat global o una tabla de contenidos\n"
"para el parche que estás escribiendo.\n"
"\n"
-"Limpiar el contenido de body si no deseas mandar un resumen.\n"
+"Limpia el contenido de body si no deseas mandar un resumen.\n"
#: git-send-email.perl:826
#, perl-format
@@ -26562,7 +26424,7 @@
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %s"
@@ -26587,30 +26449,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falló al cerrar el pipe a '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "codificación de transferencia inválida"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26621,12 +26483,12 @@
"%s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no es posible abrir %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26635,17 +26497,580 @@
"fatal: %s: %d es más grande que 998 caracteres\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "¿Realmente deseas mandar %s? [y|N]: "
+#, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Los siguientes pathspecs no concuerdan con ninguna ruta elegible, pero "
+#~ "concuerdan\n"
+#~ "con entradas del índice fuera del checkout sparse actual:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Deshabilitar o modificar las reglas de escasez si tienes intención de "
+#~ "actualizar dichas entradas."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "no se pudo configurar GIT_DIR a '%s'"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "no es posible desempacar header %s con --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "no es posible analizar header %s con --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "falló al abrir /dev/null"
+
+#~ 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 ""
+#~ "tras resolver los conflictos, marca las rutas corregidas\n"
+#~ "con 'git add <rutas>' o 'git rm <rutas>'\n"
+#~ "y haz un commit del resultado con 'git commit'"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "falló al abrir /dev/null o hacer dup"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "intentando usar sparse-index sin modo cono"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "no es posible actualizar el cache del árbol, manteniendo full"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "No se pudo abrir '%s' para escritura."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "no se pudo crear el archivo de crónica '%s'"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check requiere 2 o 3 argumentos"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "no se pudo crear un archivo nuevo en '%s'"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: falló al abrir '%s'"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "no se puede abrir el archivo de paquete '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "no se puede guardar el archivo paquete"
+
+#~ msgid "cannot store index file"
+#~ msgstr "no se puede guardar el archivo índice"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "excluir patrones leídos de <archivo>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Opción desconocida para merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista de pendientes inutilizable: '%s'"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opciones>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "rebasar commits de fusión"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "mantener puntas de bifurcación originales de los primos"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "mover commits que comiencen con squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "firmar commits"
+
+#~ msgid "continue rebase"
+#~ msgstr "continuar rebase"
+
+#~ msgid "skip commit"
+#~ msgstr "saltar commit"
+
+#~ msgid "edit the todo list"
+#~ msgstr "editar la lista de pendientes"
+
+#~ msgid "show the current patch"
+#~ msgstr "mostrar el parche actual"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "ids de commits cortos en la lista de pendientes"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "expandir ids de commits en la lista de pendientes"
+
+#~ msgid "check the todo list"
+#~ msgstr "revisar la lista de pendientes"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "reordenar líneas fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "insertar comando exec en la lista de pendientes"
+
+#~ msgid "onto"
+#~ msgstr "sobre"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "restringir revisión"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "squash a"
+
+#~ msgid "the upstream commit"
+#~ msgstr "el commit de upstream"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "nombre de head"
+
+#~ msgid "rebase strategy"
+#~ msgstr "estrategia de rebase"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "opciones de estrategia"
+
+#~ msgid "switch-to"
+#~ msgstr "cambiar a"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "la rama o commit para hacer checkout"
+
+#~ msgid "onto-name"
+#~ msgstr "sobre-nombre"
+
+#~ msgid "onto name"
+#~ msgstr "sobre nombre"
+
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "el comando para ejecutar"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
+#~ "exec'"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <ruta> "
+#~ "--name <nombre>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "falló al crear el archivo %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "salir inmediatamente tras el anuncio inicial de ref"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "socket/pipe ya está en uso: '%s'"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "no se pudo iniciar el servidor en: '%s'"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "no se puede generar demonio en el background"
+
+#~ msgid "waitpid failed"
+#~ msgstr "falló waitpid"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "demonio no está en línea todavía"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "falló al iniciar demonio"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid está confundido"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demonio no se ha apagado todavía"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "ejecutando $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' no tiene un commit checked out"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Autostash aplicado."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "No se puede almacenar $stash_sha1"
+
+#~ 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 ""
+#~ "Aplicar autostash resultó en conflictos.\n"
+#~ "Tus cambios están seguros en el stash.\n"
+#~ "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+#~ "momento.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Rebasando ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Comandos:\n"
+#~ "p, pick <commit> = usar commit\n"
+#~ "r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
+#~ "e, edit <commit> = usar commit, pero parar para un amend\n"
+#~ "s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
+#~ "f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
+#~ "este commit\n"
+#~ "x, exec <commit> = ejecutar comando (el resto de la línea) usando un "
+#~ "shell\n"
+#~ "d, drop <commit> = eliminar commit\n"
+#~ "l, label <label> = poner label al HEAD actual con un nombre\n"
+#~ "t, reset <label> = reiniciar HEAD al label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". crear un commit de fusión usando el mensaje original de\n"
+#~ ". fusión (o la línea de oneline, si no se especifica un mensaje\n"
+#~ ". de commit). Usa -c <commit> para reescribir el mensaje del "
+#~ "commit.\n"
+#~ "\n"
+#~ "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
+#~ "abajo.\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Puedes enmendar el commit ahora, con\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Una vez que estés satisfecho con los cambios, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: no es un commit que pueda ser cogido"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nombre de commit inválido: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "No se puede escribir el remplazo sha1 del commit actual"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Avance rápido a $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "No se puede realizar avance rápido a $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "No se puede mover HEAD a $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Rehusando ejecutar squash en fusión: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Error al rehacer fusión $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "No se pudo coger $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Este es el mensaje del commit #${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "El mensaje del commit #${n} será ignorado:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Esta es una combinación de $count commit."
+#~ msgstr[1] "Esta es la combinación de $count commits."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "No se puede escribir $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Esto es una combinación de 2 commits."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "No se pudo aplicar $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
+#~ "$rest\n"
+#~ "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
+#~ "commit\n"
+#~ "ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
+#~ "problema antes\n"
+#~ "de que seas capaz de reformular el commit."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Detenido en $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "No se puede '$squash_style' sin un commit previo"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Ejecutando: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Ejecución fallida: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "y hizo cambios al índice y/o al árbol de trabajo"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Puedes corregir el problema y entonces ejecutar\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "La ejecución tuvo éxito: $rest\n"
+#~ "Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
+#~ "Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Comando desconocido: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "$head_name rebasado y actualizado satisfactoriamente."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Tienes cambios en el área de stage de tu árbol de trabajo.\n"
+#~ "Si estos cambios están destinados a\n"
+#~ "ser aplastados en el commit previo, ejecuta:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "En ambos casos, cuando termines, continúa con:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Error al tratar de encontrar la identidad del autor para remediar el "
+#~ "commit"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, "
+#~ "confírmalos\n"
+#~ "primero y entonces ejecuta 'git rebase --continue' de nuevo."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "No se pudo realizar el commit con los cambios en el área de stage."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "No se pudo ejecutar el editor"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "¿Sin HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "No se pudo crear $state_dir temporalmente"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "No se pudo marcar como interactivo"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
+#~ msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Ten en cuenta que los commits vacíos están comentados"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "No se pudo inicializar los commits reescritos"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "No se puede aplicar rebase: Tienes cambios que no están en el área de "
+#~ "stage."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "No se puede aplicar pull con rebase: Tienes cambios que no están en el "
+#~ "área de stage."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No se puede hacer rebase: Tu índice contiene cambios que no están en un "
+#~ "commit."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No se puede hacer pull con rebase: Tu índice contiene cambios que no "
+#~ "están en un commit."
+
#~ msgid "unable to write stateless separator packet"
#~ msgstr "no es posible escribir un paquete separador sin estado (stateless)"
diff --git a/po/fr.po b/po/fr.po
index 59481a7..e950f87 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -51,6 +51,7 @@
# to prune | éliminer
# to push | pousser
# to rebase | rebaser
+# scheduler | planificateur
# trailers | lignes terminales
# repository | dépôt
# remote | distante (ou serveur distant)
@@ -76,8 +77,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 08:28+0200\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-10 22:00+0100\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -87,216 +88,216 @@
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
"X-Generator: Poedit 2.4.2\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binaire"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "rien"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "inchangé"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Mise à jour"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "impossible d'indexer '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "impossible d'écrire l'index"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d chemin mis à jour\n"
msgstr[1] "%d chemins mis à jour\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Inverser"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Impossible d'analyser HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d chemin inversé\n"
msgstr[1] "%d chemins inversés\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d chemin ajouté\n"
msgstr[1] "%d chemins ajoutés\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "fichier non-fusionné ignoré : %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Réviser la différence"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "afficher les chemins comprenant des modifications"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr ""
"ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "retourner l'ensemble de modifications indexées à la version HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "sélection et mise à jour individuelle des sections"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "visualiser les diffs entre HEAD et l'index"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"ajouter le contenu des fichiers non-suivis à l'ensemble des modifications "
"indexées"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Aide :"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "sélectionner un seul élément"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "sélectionner une plage d'éléments"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "sélectionner plusieurs plages"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "sélectionner un élément basé sur une préfixe unique"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "désélectionner les éléments spécifiés"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "choisir tous les éléments"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(vide) arrêter de sélectionner"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "sélectionner un élément par son numéro"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(vide) ne rien sélectionner"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Et maintenant"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "indexé"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "non-indexé"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "chemin"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "impossible de rafraîchir l'index"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
@@ -818,7 +819,7 @@
msgid "'git apply' failed"
msgstr "'git apply' a échoué"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -827,37 +828,37 @@
"\n"
"Désactivez ce message avec \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
-#: advice.c:270
+#: advice.c:196
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."
@@ -865,41 +866,49 @@
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Pas possible d'avancer rapidement, abandon."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, "
-"mais correspondent\n"
-"dans les entrées d'index hors de l'extraction clairsemée actuelle :\n"
+"Les chemins ou spécificateurs de chemins suivants correspondent à des "
+"chemins\n"
+"qui existent hors de votre définition d'extraction clairsemée, et ne seront\n"
+"donc pas mis à jour dans l'index :\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Désactiver ou modifier les règles de partialisation si vous allez mettre à "
-"jour de telles entrées."
+"Si vous souhaitez mettre à jour de telles entrées, essayez au choix :\n"
+"* d'utiliser l'option --sparse,\n"
+"* de désactiver ou modifier les règles de choix clairsemé."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1089,49 +1098,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, 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)."
-#: apply.c:3068
+#: apply.c:3069
#, 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"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1140,456 +1149,457 @@
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
"inverse"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, 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é)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Application d'une fusion à 3 points…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Échec de l'application de la fusion à 3 points…\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Retour à une application directe…\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3976
+#: apply.c:3998
#, 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)"
-#: apply.c:3981
+#: apply.c:4003
#, 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"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4327
+#: apply.c:4349
#, 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"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4559
+#: apply.c:4581
#, 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..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4937
+#: apply.c:4959
#, 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"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "num"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:5006
+#: apply.c:5028
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"
-#: apply.c:5010
+#: apply.c:5032
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"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:5014
+#: apply.c:5036
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"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "action"
-#: apply.c:5036
+#: apply.c:5058
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"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:5054
+#: apply.c:5076
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"
-#: apply.c:5057
+#: apply.c:5079
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"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "racine"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
@@ -1661,153 +1671,152 @@
msgid "cannot read %s"
msgstr "impossible de lire %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "référence inexistante : %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nom d'objet invalide : %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "objet arbre invalide : %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "l'arbre de travail actuel est non-suivi"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Fichier non trouvé : %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "'%s' n'est pas un fichier normal"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "préfixe"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "fichier"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "ajouter les fichiers non suivis à l'archive"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "régler le niveau de compression"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "dépôt"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
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:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "commande"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr ""
"Les options --add-file et --remote ne peuvent pas être utilisées ensemble"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s n'est pas un nom valide d'attribut"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s non permis : %s : %d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1815,22 +1824,22 @@
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1839,7 +1848,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1848,7 +1857,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1857,7 +1866,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1868,7 +1877,7 @@
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1880,36 +1889,36 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1918,7 +1927,7 @@
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1928,7 +1937,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1949,11 +1958,12 @@
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -2142,8 +2152,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -2201,7 +2211,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -2243,7 +2253,7 @@
msgid "invalid color value: %.*s"
msgstr "valeur invalide de couleur : %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "version d'empreinte invalide"
@@ -2292,200 +2302,200 @@
msgid "unable to find all commit-graph files"
msgstr "impossible de trouver tous les fichiers du graphe de commit"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"position de commit invalide. Le graphe de commit est vraisemblablement "
"corrompu"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
"le graphe de commits requiert des données de génération de débordement mais "
"n'en contient pas"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Lecture des commits connus dans un graphe de commit"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Expansion des commits joignables dans un graphe de commit"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Suppression les marques de commit dans le graphe de commits"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Calcul des niveaux topologiques du graphe de commits"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Calcul des chiffres de génération du graphe de commits"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Collecte des commits référencés"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "erreur à l'ajout du packet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "erreur à l'ouverture de l'index pour %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "impossible de créer les répertoires de premier niveau de %s"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "impossible de créer une couche de graphe temporaire"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "impossible de régler les droits partagés pour '%s'"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Écriture le graphe de commits en %d passe"
msgstr[1] "Écriture le graphe de commits en %d passes"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "impossible d'ouvrir le fichier de graphe de commit"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "échec du renommage du fichier de graphe de commits"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "impossible de renommer le fichier temporaire de graphe de commits"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Analyse des commits de fusion"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Fusion du graphe de commits"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "trop de commits pour écrire un graphe"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"le graphe de commit a une somme de contrôle incorrecte et est "
"vraisemblablement corrompu"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
"%u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Verification des commits dans le graphe de commits"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
"graphe de commit"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
"%s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"la liste des parents du graphe de commit pour le commit %s est trop longue"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "le parent du graphe de commit pour %s est %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2493,7 +2503,7 @@
"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
"non-nul ailleurs"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2501,32 +2511,32 @@
"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
"mais nul ailleurs"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"la date de validation pour le commit %s dans le graphe de commit est "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2546,27 +2556,27 @@
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1239
#, 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."
-#: commit.c:1241
+#: commit.c:1243
#, 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."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1247
+#: commit.c:1249
#, 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"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2582,7 +2592,7 @@
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2597,37 +2607,37 @@
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "format de config invalide : %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
@@ -2637,310 +2647,310 @@
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "clé de configuration vide"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "compte faux dans %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "trop d'entrées dans %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "clé de configuration %s manquante"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "valeur de config manquante %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "hors plage"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la référence '%s' ne pointe pas sur un blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
"100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "impossible de réaliser un mmap de '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
@@ -2975,72 +2985,72 @@
msgid "expected flush after capabilities"
msgstr "vidage attendu après les capacités"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "capacités ignorées après la première ligne '%s'"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "erreur de protocole : capabilities^{} inattendu"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "le dépôt distant ne peut pas être superficiel"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "paquet invalide"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "erreur de protocole : '%s' attendu"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "format d'objet spécifié par le serveur inconnu '%s'"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "réponse à ls-ref invalide : %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "vidage attendu après le listage de références"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "paquet de fin de réponse attendu après le listage de références"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "le protocole '%s' n'est pas supporté"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Recherche de %s… "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "impossible de rechercher %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -3049,7 +3059,7 @@
"fait.\n"
"Connexion à %s (port %s)… "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3059,80 +3069,80 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "fait."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "impossible de rechercher %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "port inconnu %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "nom d'hôte étrange '%s' bloqué"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "port étrange '%s' bloqué"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "impossible de démarrer un proxy %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
"d'URL valide"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
"le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "la variante ssh 'simple' ne supporte pas -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "la variante ssh 'simple' ne supporte pas -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "chemin étrange '%s' bloqué"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
@@ -3282,17 +3292,17 @@
msgstr ""
"refus de travailler avec un champ protocol manquant dans l'identification"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "l'url contient un retour chariot dans composant %s : %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "l'url n'a pas de schéma : %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "impossible d'analyser l'url d'identification : %s"
@@ -3396,23 +3406,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "valeur inconnue pour --diff-merges : %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base ne fonctionne pas avec des plages"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base ne fonctionne qu'avec des commits"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "impossible d'acquérir HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "aucune base de fusion trouvée"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "bases multiples de fusion trouvées"
@@ -3428,18 +3438,18 @@
"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
"arbre de travail"
-#: diff.c:156
+#: diff.c:157
#, 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:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3447,7 +3457,7 @@
"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3457,7 +3467,7 @@
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3465,13 +3475,13 @@
"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
"d'autres modes d'espace"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3480,27 +3490,27 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
"avec -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3508,22 +3518,22 @@
"--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
"pickaxe-all avec -G et -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3532,42 +3542,42 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3575,160 +3585,160 @@
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex invalide fournie à -I : '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "afficher seulement la dernière ligne de --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"afficher la distribution des quantités de modifications relatives pour "
"chaque sous-répertoire"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avertir si les modifications introduisent des marqueurs de conflit ou des "
"erreurs d'espace"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"résumé succinct tel que les créations, les renommages et les modifications "
"de mode"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "n'afficher que les noms et les status des fichiers modifiés"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "génerer un diffstat avec la largeur de nom indiquée"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"afficher les noms complets des objets pre- et post-image sur les lignes "
"\"index\""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3736,7 +3746,7 @@
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3744,93 +3754,93 @@
"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
"champs dans --raw ou --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"afficher le contexte entre les sections à concurrence du nombre de ligne "
"indiqué"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"casser les modifications d'une réécrire complète en paires de suppression et "
"création"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr ""
"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3838,165 +3848,165 @@
"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
"copie excède la limite indiquée"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heuristique qui déplace les limites de sections de diff pour faciliter la "
"lecture"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"afficher des différences par mot, en utilisant <mode> pour délimiter les "
"mots modifiés"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "utiliser <regex> pour décider ce qu'est un mot"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
"afficher les chemins relatifs"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "autoriser l'exécution d'un assistant externe de diff"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"lancer les filtres externes de conversion en texte lors de la comparaison de "
"fichiers binaires"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorer les modifications dans les sous-modules lors de la génération de diff"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "masquer les entrées 'git add -N' de l'index"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -4004,7 +4014,7 @@
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -4012,38 +4022,38 @@
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr ""
"afficher toutes les modifications dans l'ensemble de modifications avec -S "
"ou -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<chemin>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "afficher la modification dans le chemin spécifié en premier"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "sauter la sortie pour le chemin spécifié"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -4051,35 +4061,35 @@
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Sortie vers un fichier spécifié"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4092,7 +4102,7 @@
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
@@ -4133,340 +4143,418 @@
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "le cache non suivi est désactivé sur ce système ou sur cet endroit"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Aucun nom de répertoire n'a pu être deviné\n"
+"Veuillez spécifier un répertoire dans la ligne de commande"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "fichier d'index corrompu dans le dépôt %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
"suggestion : en attente de la fermeture du fichier par votre éditeur de "
"texte…%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtrage du contenu"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "espaces de nom de Git \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "impossible de régler GIT_DIR à '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack : paquet de vidage attendu après une liste superficielle"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "impossible d'écrire sur un distant"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "erreur dans l'objet : %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "pas de superficiel trouvé : %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "fait"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack : sortie d'index de pack invalide"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Le serveur supporte %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "le dépôt source est superficiel, clonage rejeté."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "le serveur ne supporte pas l'algorithme '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte pas les requêtes superficielles"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Le serveur supporte filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack : paquet de fin de réponse attendu"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "'ready' inattendu depuis le distant"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile doit exister et être configuré pour la "
+"vérification de signature ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de "
+"signature ssh (disponible depuis openssh version 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "signature incompatible ou mauvaise '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey doit être configuré pour pour signer avec ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "
+"dans openssh version 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4474,112 +4562,112 @@
"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
"supporté qu'avec -P avec PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr ""
"travailler sur la modification actuelle (voir aussi : git help revisions)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "agrandir, marquer et modifier votre historique"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "collaborer (voir aussi : git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Commandes Porcelaine Principales"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Commandes Auxiliaires / Manipulateurs"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Commandes Auxiliaires / Interrogateurs"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Interaction avec d'autres développeurs"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Commandes bas-niveau / Manipulateurs"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Commandes bas niveau / Interrogateurs"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Commandes bas niveau / Synchronisation de dépôts"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Commandes bas niveau / Assistants internes"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "type de liste de commandes non supporté '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Les guides des concepts de Git sont :"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Référez-vous à 'git help <commande>' pour des informations sur une sous-"
"commande spécifique"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Commandes externes"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Alias de commande"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4588,33 +4676,38 @@
"'%s' semble être une commande git, mais elle n'a pas pu\n"
"être exécutée. Peut-être git-%s est-elle cassée ?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ahem. Votre système n'indique aucune commande Git."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuons en supposant que vous avez voulu dire '%s'."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Lancer '%s' à la place ? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4628,16 +4721,16 @@
"\n"
"Les commandes les plus ressemblantes sont"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4651,6 +4744,16 @@
"\n"
"Vouliez-vous dire un de ceux-là ?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
+"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
+"false`."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Identité d'auteur inconnue\n"
@@ -4713,7 +4816,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
@@ -4812,7 +4915,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "valeur invalide '%s' pour lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "ligne inattendue : '%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "vidage attendu après les arguments ls-refs"
@@ -4820,39 +4928,39 @@
msgid "quoted CRLF detected"
msgstr "CRLF citées détectées"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "action invalide '%s' pour '%s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Échec de la fusion du sous-module %s (non extrait)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Échec de fusion du sous-module %s (commits non présents)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
"base de fusion)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Note : Avance rapide du sous-module %s à %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Échec de la fusion du sous-module %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4862,7 +4970,7 @@
"existe :\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4879,7 +4987,7 @@
"\n"
"qui acceptera cette suggestion.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4889,21 +4997,21 @@
"existent :\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4912,7 +5020,7 @@
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4921,7 +5029,7 @@
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4932,7 +5040,7 @@
"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
"aucune destination récupérant la majorité des fichiers."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4941,7 +5049,7 @@
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
"renommé."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4950,7 +5058,7 @@
"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
"en %s ; déplacé dans %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4959,7 +5067,7 @@
"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
"renommé en %s ; déplacé dans %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4969,7 +5077,7 @@
"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
"vers %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4979,13 +5087,13 @@
"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
"être déplacé vers %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4996,24 +5104,24 @@
"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
"peut resulter en des marqueurs de conflit imbriqués."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "
"supprimé dans %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5022,7 +5130,7 @@
"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
"déplacement dans %s à la place."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5031,7 +5139,7 @@
"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
"renommé chacune de manière à pouvoir enregistrer les deux quelque part."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5041,24 +5149,24 @@
"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
"part."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "contenu"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "sous-module"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5067,7 +5175,7 @@
"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
"Version %s de %s laissée dans l'arbre."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5079,12 +5187,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5094,106 +5202,106 @@
"fusion :\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Déjà à jour."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, 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:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avance rapide du sous-module %s au commit suivant :"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rapide du sous-module %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
"place."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5202,7 +5310,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5211,7 +5319,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5220,7 +5328,7 @@
"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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5229,41 +5337,41 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Refus de perdre le fichier modifié %s"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, 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:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5272,18 +5380,18 @@
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5294,7 +5402,7 @@
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5303,80 +5411,80 @@
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, 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:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -5384,142 +5492,174 @@
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
"version %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "index multi-paquet manque de tronçon de recherche OID requis"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "impossible de stocker le fichier d'index inversé"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "impossible d'analyser la ligne : %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "ligne malformée : %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "impossible de charger le paquet"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "impossible d'ouvrir l'index pour %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Ajout de fichiers paquet à un index multi-paquet"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "fichier paquet à éliminer %s non trouvé"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "paquet préféré inconnu : %s"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "le paquet préféré '%s' est expiré"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "aucun fichier paquet à l'index."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "impossible d'écrire le bitmap multi-paquet"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "somme de contrôle incorrecte"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5527,55 +5667,55 @@
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "le midx ne contient aucun oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Comptage des objets référencés"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Recherche et effacement des fichiers paquets non-référencés"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "impossible de démarrer le groupement d'objets"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "impossible de finir le groupement d'objets"
@@ -5633,261 +5773,261 @@
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossible de normaliser le répertoire d'objet : %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "lecture du fichier d'alternatives impossible"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "impossible de déplacer le nouveau fichier d'alternative"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: object-file.c:789
+#: object-file.c:722
#, 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é."
-#: object-file.c:795
+#: object-file.c:728
#, 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."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossible de trouver le répertoire objet correspondant à %s"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "échec de mmap%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "type d'objet invalide"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "impossible de dépaqueter l'entête %s avec --allow-unknown-type"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "impossible de dépaqueter l'entête %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "impossible d'analyser l'entête %s avec --allow-unknown-type"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "impossible d'analyser l'entête %s"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "type d'objet invalide"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "impossible de dépaqueter l'entête %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "entête de %s trop long, attendu %d octets"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "impossible d'écrire le fichier %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "impossible de lire l'objet pour %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "commit corrompu"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "incohérence de hachage pour %s (%s attendu)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
@@ -6018,12 +6158,25 @@
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "l'index inverse requis manque dans l'index multi-paquet"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index : impossible d'ouvrir le paquet"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "impossible de récupérer la taille de %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "impossible de récupérer l'utilisation du disque de %s"
@@ -6053,46 +6206,46 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "impossible de lire et vérifier à la fois l'index inverse"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "stat impossible de %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "échec de rendre %s lisible"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "impossible d'écrire le fichier de prometteur '%s'"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "le fichier paquet %s ne peut être mmap%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'option '%s' attend une valeur numérique"
@@ -6112,71 +6265,71 @@
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s a besoin d'une valeur"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s est incompatible avec %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s est incompatible avec toute autre option"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s n'accepte aucune valeur"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s n'est pas disponible"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "alias pour --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "option non-ascii inconnue dans la chaîne : '%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -6184,51 +6337,75 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-NUM"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
"valeur d'attribut"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Une seule spécification 'attr:' est autorisée."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "un spécificateur d'attribut ne peut pas être vide"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'attribut invalide %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
"incompatibles"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6236,53 +6413,53 @@
"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
"tous les autres réglages globaux de spécificateur de chemin"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s : '%s' est hors du dépôt à '%s'"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "la ligne est mal citée : %s"
@@ -6303,7 +6480,7 @@
msgid "flush packet write failed"
msgstr "échec de l'écriture du vidage de paquet"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "erreur de protocole : ligne impossiblement trop longue"
@@ -6311,7 +6488,7 @@
msgid "packet write with format failed"
msgstr "échec de l'écriture d'un paquet avec format"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "
@@ -6322,25 +6499,25 @@
msgid "packet write failed: %s"
msgstr "échec de l'écriture d'un paquet : %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "erreur de lecture"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "l'hôte distant a fermé la connexion de manière inattendue"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "erreur de protocole : mauvaise longueur de ligne %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
@@ -6354,7 +6531,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "impossible de créer le lstat en fil : %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
@@ -6387,20 +6564,20 @@
msgid "Removing duplicate objects"
msgstr "Suppression des objets dupliqués"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6409,12 +6586,12 @@
"impossible d'analyser la première ligne de la sortie de `log` : ne commence "
"pas par 'commit' : '%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "impossible d'analyser l'entête git '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
@@ -6443,7 +6620,7 @@
"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
"répertoires git"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' n'a pas de commit extrait"
@@ -6463,16 +6640,16 @@
msgid "unable to stat '%s'"
msgstr "fstat de '%s' impossible"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' existe à la fois comme un fichier et un répertoire"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Rafraîchir l'index"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6481,7 +6658,7 @@
"index.version renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6490,143 +6667,143 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "signature incorrecte 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "mauvaise version d'index %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "mauvaise signature sha1 d'index"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "extension %.4s ignorée"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrée d'index inconnu 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "entrées de préparation non ordonnées dans l'index"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrées de préparation non ordonnées pour '%s'"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "impossible de créer le fil load_cache_entries : %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "impossible de joindre le fil load_cache_entries : %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s : l'ouverture du fichier d'index a échoué"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s : impossible de faire un stat sur l'index ouvert"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s : fichier d'index plus petit qu'attendu"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s : impossible de mapper le fichier d'index%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "impossible de créer le fil load_index_extensions : %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "impossible de joindre le fil load_index_extensions : %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "impossible de rafraîchir l'index partagé '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index cassé, %s attendu dans %s, %s obtenu"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "échec de conversion d'un index clairsemé"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "impossible de stat '%s'"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "impossible de régler les bits de droit de '%s'"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s : impossible de revenir à l'étape 0"
@@ -6706,7 +6883,7 @@
msgstr[0] "Rebasage de %s sur %s (%d commande)"
msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6715,7 +6892,7 @@
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6723,7 +6900,7 @@
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6738,7 +6915,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6748,14 +6925,14 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "impossible d'écrire '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "impossible d'écrire '%s'."
@@ -6787,12 +6964,10 @@
"Les comportements disponibles sont : ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s : 'preserve' a été remplacé par 'merges'"
# à priori on parle d'une branche ici
#: ref-filter.c:42 wt-status.c:2036
@@ -6814,258 +6989,278 @@
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argument %%(objectsize) non reconnu : %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) n'accepte pas d'argument"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argument %%(subject) non reconnu : %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<value>) attendu"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "argument %%(raw) non reconnu : %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valeur positive attendue '%s' dans %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argument '%s' non reconnu dans %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "option de courriel non reconnue : %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) n'accepte pas d'argument"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "chaîne de formatage mal formée %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "cette commande rejette l'atome %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(aucune branche)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "échec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s ne pointe pas sur un objet valide!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7090,81 +7285,81 @@
"\n"
"\tgit branch -m <nom>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "impossible de récupérer `%s`"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nom de branche invalide : %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "symref pendant %s ignoré"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "le journal pour la réf %s contient un trou après %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "le journal pour la réf %s est vide"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "mises à jour des références annulées par le crochet"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
@@ -7478,7 +7673,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "échec du flush de '%s'"
@@ -7523,8 +7718,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
@@ -7562,47 +7757,41 @@
msgid "could not determine HEAD revision"
msgstr "impossible de déterminer la révision HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "impossible de trouver l'arbre de %s"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input est incompatible avec --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<fichier-paquet> n'est plus géré"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk est incompatible avec --unsorted-input"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2687
+#: revision.c:2693
#, 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:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "échec de l'ouverture de /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "impossible de créer un fil asynchrone : %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
-"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
-"false`."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -7623,24 +7812,24 @@
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack : impossible de créer un sous-processus de récupération"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
"le négociation de poussée a échoué ; poursuite de la poussée de toute façon"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "le receveur ne gère pas l'algorithme d'empreinte de ce dépôt"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7648,47 +7837,48 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "le receveur ne gère pas les options de poussées"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de nettoyage invalide de message de validation '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7696,53 +7886,75 @@
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"après résolution des conflits, marquez les chemins corrigés\n"
-"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
-"puis validez le résultat avec 'git commit'"
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git cherry-pick --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git cherry-pick --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git cherry-pick\",,\n"
+"lancez \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git revert --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git revert --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n"
+"lancez \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
@@ -7750,65 +7962,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "impossible de décoter la valeur de '%s'"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7837,11 +8049,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7870,7 +8082,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7896,344 +8108,349 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "identité d'auteur invalide '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "auteur corrompu : information de date manquante"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "Le premier message de validation sera ignoré :"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossible d'obtenir un message de validation pour %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "annulation d'un picorage en cours"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "annulation d'un retour en cours"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "un retour est déjà en cours"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "un picorage est déjà en cours"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "pas de retour en cours"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "aucun picorage en cours"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "échec du saut de commit"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "il n'y a rien à sauter"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8242,16 +8459,16 @@
"avez-vous déjà validé ?\n"
"essayez \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8270,27 +8487,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossible d'appliquer %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Exécution : %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8305,11 +8522,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8326,91 +8543,91 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Réponse de remisage inattendue : '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossible de créer le répertoire pour '%s'"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autoremisage créé : %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "impossible de réinitialiser --hard"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8421,30 +8638,30 @@
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "L'application du remisage automatique a créé des conflits."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "impossible de détacher HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Arrêt à HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8465,58 +8682,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Rebasage (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Arrêt à %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Rebasage et mise à jour de %s avec succès.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8526,50 +8743,59 @@
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "le commit %s appliqué précédemment a été sauté"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
@@ -8735,27 +8961,15 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "échec de l'ouverture ou au dup de /dev/null"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "échec du setsid"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "tentative d'utilisation de l'index partiel sans mode cone"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "impossible de mettre à jour l'arbre de cache, full conservé"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
@@ -8812,13 +9026,13 @@
msgstr[0] "%u octet/s"
msgstr[1] "%u octets/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "impossible d'éditer '%s'"
@@ -8844,7 +9058,7 @@
msgid "invalid value for %s"
msgstr "valeur invalide pour %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
@@ -8870,22 +9084,22 @@
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dans le sous-module '%s' non populé"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mauvais argument --ignore-submodules : %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8894,12 +9108,12 @@
"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
"sous-module du même nom. Ignoré."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8908,36 +9122,36 @@
"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
"1' dans le sous-module %s"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "le processus pour le sous-module '%s' a échoué"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Poussée du sous-module '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossible de pousser le sous-module '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Récupération du sous-module %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Impossible d'accéder au sous-module '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8946,63 +9160,63 @@
"Erreurs pendant la récupération du sous-module :\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "impossible de réinitialiser l'index du sous-module"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git "
"'%.*s'"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -9010,17 +9224,17 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "refus de déplacer '%s' dans une répertoire git existant"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -9031,11 +9245,11 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -9057,7 +9271,7 @@
msgstr "valeur inconnue '%s' pour la clé '%s'"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
@@ -9072,11 +9286,11 @@
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "impossible de lire depuis l'entrée standard"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
@@ -9145,7 +9359,7 @@
msgid "error while running fast-import"
msgstr "erreur au lancement de fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "impossible de lire la réf %s"
@@ -9165,7 +9379,7 @@
msgid "invalid remote service path"
msgstr "chemin de service distant invalide"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole"
@@ -9174,7 +9388,7 @@
msgid "can't connect to subservice %s"
msgstr "impossible de se connecter au sous-service %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only requiert le protocole v2"
@@ -9187,61 +9401,61 @@
msgid "expected ok/error, helper said '%s'"
msgstr "ok/error attendu, l'assistant a dit '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "l'assistant %s ne gère pas dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "l'assistant %s ne gère pas --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "l'assistant %s ne gère pas --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "l'assistant %s ne gère pas --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "l'assistant %s ne gère pas --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "l'assistant %s ne gère pas 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'assistant %s ne gère pas push ; un spécificateur de référence est "
"nécessaire"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'assistant %s ne gère pas 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "impossible de lancer fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "erreur au lancement de fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9250,52 +9464,52 @@
"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
"Vous devriez peut-être spécifier une branche.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "format d'objet non géré '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "réponse malformée dans le liste de réfs : %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "échec de read(%s)"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "échec de write(%s)"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "échec du fil d'exécution %s"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "échec de jonction du fil d'exécution %s : %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "échec du processus %s pour l'attente"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "échec du processus %s"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "impossible de démarrer le fil d'exécution pour copier les données"
@@ -9309,46 +9523,46 @@
msgid "could not read bundle '%s'"
msgstr "impossible de lire la liasse '%s'"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "voir protocol.version dans 'git help config' pour plus d'information"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "les options de serveur exigent une version 2 ou supérieure"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "le serveur ne prend pas en charge wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "impossible d'analyser la configuration transport.color.*"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "le support du protocole v2 n'est pas encore implanté"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valeur inconnue pour la config '%s' : %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' non permis"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync n'est plus supporté"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9357,7 +9571,7 @@
"Les chemins suivants de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9384,11 +9598,11 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Abandon."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "échec de la poussée de tous les sous-modules nécessaires"
@@ -9667,17 +9881,17 @@
"sensibles à la casse dans une système de fichier insensible) et un\n"
"seul du groupe en collision est dans l'arbre de travail :\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Mise à jour des drapeaux de l'index"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "vidage attendu après les arguments de récupération"
@@ -9714,7 +9928,7 @@
msgid "Fetching objects"
msgstr "Récupération des objets"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
@@ -9815,17 +10029,27 @@
msgid "gitdir file points to non-existent location"
msgstr "le fichier gitdir pointe sur un endroit inexistant"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "impossible de configurer l'environnement '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
@@ -10380,25 +10604,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "impossible de trouver le commit %"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "impossible de lire la réponse IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "impossible de démarrer accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "impossible de démarrer worker[0] pour '%s'"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec pour délier '%s'"
@@ -10407,136 +10631,136 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "impossible de chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Impossible d'ouvrir '%s' en écriture."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
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:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+"permettre la mise à jour des entrées hors du cone d'extraction clairsemée"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "backend pour `git stash -p`"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10567,12 +10791,12 @@
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10582,52 +10806,52 @@
"Éliminez ce message en lançant\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run est incompatible avec --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file est incompatible avec --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:522
+#: builtin/add.c:547
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:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10637,112 +10861,112 @@
"Éliminez ce message en lançant\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "impossible d'analyser l'auteur du script"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
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:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, 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:1127
+#: builtin/am.c:1128
#, 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:1128
+#: builtin/am.c:1129
#, 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:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
"être perdus."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Le patch actuel est vide."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "ligne d'auteur manquante dans le commit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
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:1540
+#: builtin/am.c:1541
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:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10750,24 +10974,24 @@
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -10775,35 +10999,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
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:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "l'application de la rustine a échoué à %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
@@ -10832,17 +11056,17 @@
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10850,160 +11074,160 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valeur invalide pour --show-current-patch : %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "ajouter une ligne terminale Signed-off-by au message de validation"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
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:2290
+#: builtin/am.c:2292
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:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "le passer à travers git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
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:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "restaurer la branche originale et abandonner les applications de patch"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "abandonne l'opération de patch mais garde HEAD où il est"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -11011,17 +11235,17 @@
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, 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:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -11030,13 +11254,13 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
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 "
"reprise."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
@@ -11044,46 +11268,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "création impossible du fichier d'archive '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "impossible de rediriger la sortie"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive : Dépôt distant sans URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive : vidage attendu"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> "
-"[<term>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11122,46 +11335,59 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "impossible d'écrire le fichier '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "impossible d'ouvrir le fichier '%s' en lecture"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' n'est pas un terme valide"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "impossible d'utiliser la commande incluse '%s' comme terme"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "impossible de modifier la signification du terme '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "veuillez utiliser deux termes différents"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Pas de bissection en cours.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' n'est pas un commit valide"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11169,27 +11395,27 @@
"échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mauvais argument pour bisect_write : %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "impossible d'obtenir l'oid de la révision '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11198,7 +11424,7 @@
"Vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11209,7 +11435,7 @@
"Puis vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "bissection avec seulement un commit %s"
@@ -11218,15 +11444,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Confirmez-vous [Y/n] ? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "aucun terme défini"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11235,7 +11461,7 @@
"Vos termes actuels sont %s pour l'état ancien\n"
"et %s pour le nouvel état.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11245,53 +11471,53 @@
"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
"new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "échec de la préparation du parcours des révisions\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "impossible d'ouvrir '%s' en ajout"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' n'est pas un terme valide"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "option non reconnue : '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' ne semble être une révision valide"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "mauvaise HEAD - référence symbolique douteuse"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "réference invalide : '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Vous devez démarrer avec \"git bisect start\"\n"
@@ -11299,104 +11525,150 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Veuillez appeler `--bisect-state` avec au moins un argument"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' n'accepte qu'un seul argument."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Mauvaise révision en entrée : %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Mauvaise révision en entrée (pas un commit) : %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Pas de bissection en cours."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s' ?? de quoi parlez-vous ?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "impossible de lire le fichier '%s' pour rejouer"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "la bissection a échoué : aucune commande fournie."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "Lancement de %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "la bissection a échoué : le code retour %d de '%s' est < 0 ou >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "la bissection ne peut plus continuer"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "succès de la bissection"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "la bissection a trouvé le premier mauvais commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné "
+"le code erreur %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "réinitialiser l'état de la bissection"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "vérifier si les termes bons ou mauvais existent"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "afficher les termes de bissection"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "démarrer une session de bissection"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "trouver le prochain commit de bissection"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "marquer l'état d'une références (ou plusieurs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "lister les étapes de bissection jusqu'ici"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "rejouer le processus de bissection depuis le fichier fourni"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "sauter certains commits pour l'extraction"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualiser la bissection"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "utiliser <cmd>... pour bissecter automatiquement."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "pas de journal pour BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check exige 2 ou 3 arguments"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms exige 0 ou 1 argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next exige 0 argument"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log exige 0 argument"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "pas de fichier de log donné"
@@ -11408,159 +11680,161 @@
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:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "couleur attendue : %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "doit finir avec une couleur"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "valeur invalide pour blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "référence à ignorer %s introuvable"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
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:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"ne pas montrer les noms des objets pour les commits de limite (Défaut : "
"désactivé)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
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:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "montrer les statistiques de coût d'activité"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
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:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
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:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignorer les différences d'espace"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rév"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "ignorer <rev> pendant le blâme"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "ignorer les révisions listées dans <fichier>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr ""
"colorer différemment les métadonnées redondantes avec la ligne précédente"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "colorier les lignes par âge"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr ""
"dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
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:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "score"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "plage"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
"de-fonction>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -11574,18 +11848,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
@@ -11688,78 +11962,78 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pointe hors de refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
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:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, 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:579
+#: builtin/branch.c:580
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:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11770,180 +12044,180 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
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:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "désactiver l'information amont"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "afficher le nom de la branche courante"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objet"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11951,32 +12225,32 @@
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
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:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11985,7 +12259,7 @@
"branche.\n"
"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11993,32 +12267,32 @@
"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
"upstream-to' à la place."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "version git ::\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "info compilateur : "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "info libc : "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -12055,38 +12329,33 @@
"Veuillez relire le rapport de bogue ci-dessous.\n"
"Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "spécifier la destination du fichier de rapport de bogue"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "spécifier une suffixe au format strftime pour le nom de fichier"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "impossible de créer les répertoires de premier niveau pour '%s'"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Info système"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Crochets activés"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "impossible de créer un fichier nouveau à '%s'"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "impossible d'écrire dans %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Nouveau rapport créé à '%s'.\n"
@@ -12107,53 +12376,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "spécifier la version du format de colis"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "La création d'un colis requiert un dépôt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "ne pas afficher les détails du colis"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s est correct\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "dépaquetage d'objets depuis un colis"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12161,7 +12430,7 @@
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -12169,74 +12438,74 @@
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "une seule option de traitement ne peut être spécifiée à la fois"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "ne pas ordonner la sortie de --batch-all-objects"
@@ -12256,7 +12525,7 @@
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
@@ -12265,8 +12534,8 @@
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -12324,11 +12593,10 @@
msgstr "git checkout--worker [<options>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "chaîne"
@@ -12483,11 +12751,11 @@
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12497,50 +12765,50 @@
"suivants :\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12563,7 +12831,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12592,19 +12860,19 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12613,7 +12881,7 @@
"'%s' pourrait être un fichier local ou un branche de suivi.\n"
"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12633,51 +12901,51 @@
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "une seule référence attendue"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "branche attendue, mais étiquette '%s' reçue"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "une branche est attendue, mais '%s' a été reçue"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "une branche est attendue, mais un commit '%s' a été reçu"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12685,7 +12953,7 @@
"impossible de basculer de branche pendant une fusion\n"
"Envisagez \"git merge --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12693,7 +12961,7 @@
"impossible de basculer de branche pendant une session am\n"
"Envisagez \"git am --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12701,7 +12969,7 @@
"impossible de basculer de branche pendant un rebasage\n"
"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12709,7 +12977,7 @@
"impossible de basculer de branche pendant un picorage\n"
"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12717,139 +12985,139 @@
"impossible de basculer de branche pendant un retour\n"
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "vous basculez de branche en cours de bissection"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, 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:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' n'accepte pas <point-de-départ>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, 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:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
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:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
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:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p et --overlay sont mutuellement exclusifs"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "nom de branche manquant ; essayez -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "impossible de résoudre %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, 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:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file est incompatible avec --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file est incompatible avec --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12857,72 +13125,72 @@
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "vous devez spécifier un ou des chemins à restaurer"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "utiliser le mode de superposition (défaut)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "créer et basculer sur une nouvelle branche"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "créer/réinitialiser et basculer sur une branche"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "interpréter 'git switch <branche-inexistante>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "laisser tomber les modifications locales"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "de quel <arbre-esque> faire l'extraction"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "restaurer l'index"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "restaurer l'arbre de travail (par défaut)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignorer les entrées non-fusionnées"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "utiliser le mode de superposition"
@@ -13062,8 +13330,8 @@
msgstr "supprimer les répertoires entiers"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
@@ -13152,19 +13420,20 @@
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nom"
@@ -13180,8 +13449,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "profondeur"
@@ -13189,8 +13458,8 @@
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "heure"
@@ -13199,17 +13468,17 @@
msgstr "créer un clone superficiel depuis une date spécifique"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
@@ -13240,21 +13509,21 @@
msgstr "régler la configuration dans le nouveau dépôt"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spécifique au serveur"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
@@ -13270,50 +13539,42 @@
"initialiser le fichier d'extraction clairsemée pour n'inclure que les "
"fichiers à la racine"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Aucun nom de répertoire n'a pu être deviné\n"
-"Veuillez spécifier un répertoire dans la ligne de commande"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "échec du démarrage un itérateur sur '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "échec de l'itération sur '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13323,107 +13584,107 @@
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer avec 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "échec lors de l'initialisation l'extraction clairsemée"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
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:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, 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:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, 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:1089
+#: builtin/clone.c:974
#, 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:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13431,50 +13692,50 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
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:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
"\"."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
"\"file://\"."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "le transport distant a retourné une erreur"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, 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:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -13510,13 +13771,13 @@
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13526,96 +13787,94 @@
"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossible de trouver le répertoire objet correspondant à %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "répertoire"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "le répertoire d'objet où stocker le graphe"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Impossible d'ouvrir le graphe de commit '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argument de --split non reconnu, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "ID d'objet non hexadécimal inattendu : %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "objet invalide : %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "commencer le parcours à toutes les réfs"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "commencer le parcours aux commits listés sur stdin"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"inclure tous les commits déjà présents dans le fichier de graphe de commits"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "activer le calcul pour les chemins modifiés"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"le nombre maximum de commits dans un graphe de commit divisé pas de base"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnée"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "nombre maximum des filtres Bloom des chemins modifiés à calculer"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Collecte des commits depuis l'entrée"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "sous-commande non reconnue : %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13629,70 +13888,65 @@
msgid "duplicate parent %s ignored"
msgstr "le parent dupliqué %s est ignoré"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree : échec à l'ouverture de '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree : échec de la lecture de '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree : échec de la fermeture de '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "parent"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "lire le message de validation depuis un fichier"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "exactement un arbre obligatoire"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree : échec de la lecture"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13703,7 +13957,7 @@
"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:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13718,15 +13972,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13748,73 +14002,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
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:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "impossible de faire une validation partielle pendant un rebasage."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13822,43 +14076,43 @@
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, 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:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "impossible de combiner -m avec --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13867,7 +14121,7 @@
"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
"commençant par '%c' seront ignorées.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13877,7 +14131,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13888,7 +14142,7 @@
"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le "
"souhaitez.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13899,7 +14153,7 @@
"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:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13913,7 +14167,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13927,73 +14181,73 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "impossible de passer les lignes finales à --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1124
#, 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:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Vous êtes en plein picorage -- impossible de reformuler."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -14001,104 +14255,104 @@
"l'option reword de --fixup est mutuellement exclusive avec --patch/--"
"interactive/--all/--include/--only"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
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:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
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:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
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:1281
+#: builtin/commit.c:1280
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:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
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:1310
+#: builtin/commit.c:1309
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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "option inconnue : --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14106,11 +14360,11 @@
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -14118,198 +14372,198 @@
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
"détecter les renommages, en spécifiant optionnellement le facteur de "
"similarité"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "date"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger ou reformuler le "
"commit spécifié"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
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:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "ajouter des lignes terminales personnaliser"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "ajouter une ligne terminale Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation dû à un message de validation vide.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, 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:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
"Abandon de la validation dû à un corps de message de validation vide.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14679,7 +14933,7 @@
msgstr ""
"credential-cache--daemon non disponible ; pas de gestion des sockets unix"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache non disponible ; pas de gestion des socket unix"
@@ -14884,7 +15138,7 @@
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
@@ -14908,113 +15162,113 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "échec : %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "échec : %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "outil"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
-"non-nul"
+"de sortie non-nul"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "passé à `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool exige un arbre de travail ou --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff est incompatible avec --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
@@ -15022,7 +15276,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "type"
@@ -15055,102 +15309,102 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
"tags ne soit spécifié."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "le jeton --anonymize-map ne peut pas être vide"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"sélectionner la gestion des messages de validation dans un encodage "
"alternatif"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "importer les marques depuis ce fichier s'il existe"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "depuis:vers"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
"d'objet"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "afficher les ids d'objet originaux des blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "marquer les étiquettes avec des ids de marque"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
@@ -15212,15 +15466,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel ne peut pas être négatif"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "définir la branche amont pour git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
@@ -15228,7 +15482,7 @@
msgid "use atomic transaction to update references"
msgstr "utiliser une transaction atomique pour mettre à jour les références"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
@@ -15240,7 +15494,7 @@
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
@@ -15258,7 +15512,7 @@
"modifier le spécificateur de référence pour placer les références dans refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
@@ -15270,7 +15524,7 @@
"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
"encombrent les étiquettes modifiées"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "à la demande"
@@ -15282,7 +15536,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "écrire les références récupérées dans le fichier FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
@@ -15290,16 +15544,16 @@
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
@@ -15315,19 +15569,19 @@
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
@@ -15341,7 +15595,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "lancer 'maintenance --auto' après la récupération"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
"vérifier les mises à jour forcées (forced-updates) sur toutes les branches "
@@ -15359,63 +15613,63 @@
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15425,7 +15679,7 @@
"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15437,24 +15691,24 @@
"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, 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:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
"permises"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15463,56 +15717,61 @@
"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:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, 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:1403
+#: builtin/fetch.c:1417
#, 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:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "l'objet %s n'existe pas"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "dépôt amont non défini pour la branche de suivi à distance"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "dépôt amont non défini pour l'étiquette distante"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "type de branche inconnu"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15520,22 +15779,22 @@
"aucune branche source trouvée.\n"
"Vous devez spécifier exactement une branche avec l'option --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "impossible de récupérer '%s' (code de sortie : %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15543,58 +15802,58 @@
"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:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
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:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
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:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
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 "
"sens"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15602,11 +15861,11 @@
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant"
@@ -15672,7 +15931,7 @@
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
@@ -15828,130 +16087,140 @@
msgid "notice: No default references"
msgstr "note : pas de référence par défaut"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s : incohérence de hachage,trouvé à : %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s : objet corrompu ou manquant : %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s : l'objet a un type '%s' inconnu : %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s : impossible d'analyser : %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "mauvais fichier de sha1 : %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Vérification du répertoire d'objet"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Vérification du lien %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pointe sur quelque chose bizarre (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s : la HEAD détachée ne pointe sur rien"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "note : %s pointe sur une branche non-née (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Vérification de l'arbre cache"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "non-arbre dans l'arbre de cache"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
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:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s : objet manquant"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
@@ -15975,7 +16244,7 @@
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
@@ -15984,13 +16253,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\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 rapporté l'erreur suivante. Veuillez corriger\n"
-"la cause et supprimer %s.\n"
+"la cause et supprimer %s\n"
"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
"supprimé.\n"
"\n"
@@ -16075,154 +16344,194 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "argument de --schedule non reconnu, '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "échec de l'écriture du graphe de commits"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "échec de la pré-récupération des distants"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "impossible de démarrer le processus 'git pack-objects'"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "impossible de finir le processus 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "échec de l'écriture de l'index de multi-paquet"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "échec de 'git multi-pack-index expire'"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "échec de 'git multi-pack-index repack'"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "le fichier verrou '%s' existe, pas de maintenance"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "échec de la tâche '%s'"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' n'est pas une tâche valide"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "lancer les tâches selon l'état du dépôt"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "fréquence"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "lancer les tâches selon une fréquence"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "ne pas afficher le progrès ou d'autres informations sur stderr"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "tâche"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "lancer une tâche spécifique"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "échec du lancement de 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "impossible d'étendre le chemin '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "échec de démarrage de launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "échec de la création des répertoires pour '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "échec de l'amorçage du service %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "échec de création du fichier temporaire xml"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "échec du démarrage de schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
"'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "échec à l'ouverture de stdin de 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' est mort"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "échec du démarrage de systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "échec pour lancer systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "échec de la suppression de '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argument '%s' de --scheduler non reconnu"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni les minuteurs systemd ni crontab ne sont disponibles"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "le planificateur %s n'est pas disponible"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr ""
"un autre processus est en train de programmer une maintenance en tâche de "
"fond"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificateur>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planificateur"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificateur qui lancera les maintenances git"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "échec de l'ajout du dépôt à la config globale"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <subcommand> [<options>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "sous-commande invalide : %s"
@@ -16231,12 +16540,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -16245,270 +16554,270 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend une valeur numérique"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
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:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "afficher le numéro de colonne de la première correspondance"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "n'afficher que les parties correspondantes d'une ligne"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
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:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
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:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
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:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
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:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked non supportée avec --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "option de combinaison invalide, ignore --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
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:1157
+#: builtin/grep.c:1171
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:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked ne peut pas être utilisé avec --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
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:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16516,97 +16825,109 @@
"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
"[--] <fichier>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "afficher toutes les commandes disponibles"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "exclure les guides"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "afficher une liste de guides utiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "afficher tous les noms de variables de configuration"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "afficher la page de manuel"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "afficher le manuel dans un navigateur web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "afficher la page info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "afficher la description de la commande"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "afficher une liste de guides utiles"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "afficher tous les noms de variables de configuration"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<commande>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Échec de démarrage d'emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16615,7 +16936,7 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16624,332 +16945,323 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mauvais chaîne alias.%s : %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "Cette option n'accepte pas d'autre argument"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' pour plus d'information"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "impossible d'ouvrir le fichier paquet '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "erreur de fsck dans l'objet empaqueté"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossible d'écrire le fichier %s '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "impossible de fermer le fichier %s écrit '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "impossible de renommer un fichier temporaire '*.%s' en '%s'"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "impossible de stocker le fichier paquet"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "impossible de stocker le fichier d'index"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algorithme d'empreinte inconnu '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format ne peut pas être utilisé avec --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "erreur de fsck dans les objets paquets"
@@ -17601,132 +17913,136 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "séparer les chemins par un caractère NUL"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "les motifs d'exclusion sont lus depuis <fichier>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "lire les motifs d'exclusion depuis <fichier>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "afficher les données de débogage"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "supprimer les entrées dupliquées"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<dépôt> [<références>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<dépôt> [<réf>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "exécutable"
@@ -17847,7 +18163,7 @@
msgid "use headers in message's body"
msgstr "utiliser l'entête dans le corps de message"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
@@ -17963,145 +18279,145 @@
msgid "Merging %s with %s\n"
msgstr "Fusion de %s avec %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Déjà à jour. (rien à compresser)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
@@ -18116,33 +18432,33 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Options inconnue pour merge-recursive : -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "option de stratégie inconnue : -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -18154,11 +18470,11 @@
"branche de sujet.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Un message vide abandonne la validation.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18167,74 +18483,74 @@
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
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:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit n'accepte pas d'argument"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18242,7 +18558,7 @@
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18250,90 +18566,86 @@
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
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:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
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:1431
+#: builtin/merge.c:1435
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:1433
+#: builtin/merge.c:1437
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:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
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:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Pas possible d'avancer rapidement, abandon."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, 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:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18368,15 +18680,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
@@ -18397,36 +18709,52 @@
msgstr "autoriser la création de plus d'un arbre"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<paquet>][--refs-"
+"snapshot=<chemin>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<options>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<options>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"répertoire objet contenant un ensemble de paires de fichiers paquet et "
"d'index de paquet"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "paquet-préféré"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "écriture du bitmap de multi-paquet"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "écrire l'index multi-paquet ne contenant que les index fournis"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "instantané des réfs pour sélectionner les commits de bitmap"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18434,11 +18762,6 @@
"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
"dans un lot plus grand que cette taille"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "sous-commande non reconnue : %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<options>] <source>... <destination>"
@@ -18467,72 +18790,72 @@
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "en conflit"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -18713,47 +19036,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "impossible d'écrire l'objet note"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "impossible de lire l'objet '%s'."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "ligne en entrée malformée : '%s'."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "impossible de copier les notes de '%s' vers '%s'"
@@ -18761,48 +19084,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "trop d'arguments"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18811,30 +19134,30 @@
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "trop peu d'arguments"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18843,12 +19166,12 @@
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18857,52 +19180,52 @@
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18910,47 +19233,47 @@
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18961,42 +19284,42 @@
"validez le résultat avec 'git notes merges --commit', ou abandonnez la "
"fusion avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
@@ -19049,86 +19372,90 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "écrire un index de bitmap"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "dépassement de décalage de base de delta pour %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "décalage de base de delta est hors limite pour %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "impossible d'analyser l'entête d'objet de %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "l'objet %s ne peut être lu"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19137,7 +19464,7 @@
"la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-"
"objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19145,17 +19472,18 @@
"l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' "
"reçu)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "impossible de trouver le paquet '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -19164,7 +19492,7 @@
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -19173,256 +19501,256 @@
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "valeur invalide pour --missing"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "l'objet libre à %s n'a pas pu être examiné"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleure correspondance des "
"deltas"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "lire les paquets depuis l'entrée standard"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "utiliser l'algorithme de joignabilité creuse"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "écrire un index de bitmap si possible"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protocole"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
"transférer"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "la taille limite minimale d'un paquet est 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "impossible d'utiliser --filter avec --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19477,7 +19805,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
@@ -19490,44 +19818,48 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "remiser et réappliquer automatiquement avant et après"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19535,14 +19867,14 @@
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
"venez de récupérer."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
"vous venez de récupérer."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19550,7 +19882,7 @@
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19562,43 +19894,43 @@
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19608,20 +19940,20 @@
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19633,8 +19965,8 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Tirer sans spécifier comment réconcilier les branches divergentes\n"
-"est découragé. Vous pouvez éliminer ce message en lançant une des\n"
+"Vous avez des branches divergentes et vous devez spécifier comment\n"
+"les réconcilier. Vous pouvez le faire en lançant une des\n"
"commandes suivantes avant votre prochain tirage :\n"
"\n"
" git config pull.rebase false # fusion (stratégie par défaut)\n"
@@ -19646,21 +19978,21 @@
"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n"
"remplacer à l'invocation la valeur par défaut configurée.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19671,7 +20003,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19688,15 +20020,23 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Impossible d'aller en avance rapide sur de multiples branches."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -19889,15 +20229,15 @@
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "refléter toutes les références"
@@ -19910,19 +20250,19 @@
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nom-de-ref>:<attendu>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "exiger des mises à jours distantes pour une intégration locale"
@@ -19930,12 +20270,12 @@
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
@@ -19955,11 +20295,11 @@
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
@@ -20074,83 +20414,83 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre-esque> [<arbre-"
-"esque 2> [<arbre-esque 3>]])"
+"prefix=<préfixe>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<fichier>] (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-"
+"esque3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "écrire l'index résultant dans <fichier>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "juste vider l'index"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Fusion"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "effectuer une fusion en plus d'une lecture"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "fusion à 3 points en présence d'ajouts et suppressions"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "comme -m, mais annule les éléments non fusionnés"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<sous-répertoire>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "ne pas vérifier la copie de travail après la fusion"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "ne pas mettre à jour l'index ou la copie de travail"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "sauter l'application du filtre d'extraction creuse"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "supprimer les messages d'information de suivi"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Vous devez d'abord résoudre votre index courant"
@@ -20173,193 +20513,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "liste à faire inutilisable : '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "impossible de créer un fichier temporaire %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "impossible de marquer comme interactif"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "impossible de générer la liste à-faire"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit de base doit être fourni avec --upstream ou --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<options>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "conserver les commits qui commencent vides"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "autoriser les validations avec des messages vides"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebaser les commits de fusion"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "conserver les points de branchement de cousins originaux"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "déplacer les commits qui commencent par squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signer les commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "afficher un diffstat de ce qui a changé en amont"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuer le rebasage"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "sauter le commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "éditer la liste à-faire"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "afficher le patch courant"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "raccourcir les identifiants de commits dans la liste à-faire"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "étendre les identifiants de commit dans la liste à-faire"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "vérifier la liste à-faire"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "réarranger les lignes fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insérer les commandes exec dans la liste à-faire"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "sur"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restreindre la révision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "écraser-sur"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "écraser sur"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "le commit amont"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "stratégie de rebasage"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la branche ou le commit à extraire"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "sur-le-nom"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "sur le nom"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "la commande à lancer"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "re-planifier automatiquement tout `exec` qui échoue"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s requiert un moteur de fusion"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossible d'accéder 'onto' : '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head invalide : '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20373,7 +20564,7 @@
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20392,7 +20583,7 @@
"\n"
"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20401,7 +20592,7 @@
"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
"\"keep\" (garder) et \"ask\" (demander)."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20418,7 +20609,7 @@
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20432,186 +20623,195 @@
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "commande exec vide"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "rebaser sur la branche %s au lieu de la branche amont"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
"utiliser la base de fusion de l'amont et la branche comme base actuelle"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "afficher un diffstat de ce qui a changé en amont"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "mettre la date de validateur à la date auteur"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignorer la date d'auteur et utilise la date actuelle"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "synonyme pour --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git apply"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignorer des modifications d'espaces"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "éditer la liste à faire lors d'un rebasage interactif"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "afficher le patch en cours d'application ou de fusion"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "utiliser des stratégies d'application pour rebaser"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "comment gérer les commits qui deviennent vides"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "déplace les commits qui commencent par squash!/fixup! sous -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "ajouter les lignes exec après chaque commit de la liste éditable"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "essayer de rebaser les fusions au lieu de les garder"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "utiliser la stratégie de fusion indiquée"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "passer les arguments jusqu'à la stratégie de fusion"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "rebaser tous les objets inatteignables depuis les racines"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "re-planifier automatiquement tout `exec` qui échoue"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
"appliquer toutes les modifications, même celles déjà présentes en amont"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la "
-"place."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges a été remplacé par --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "impossible de combiner '--keep-base' avec '--onto'"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "impossible de combiner '--keep-base' avec '--root'"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "impossible de combiner '--root' avec '--fork-point'"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
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."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20619,16 +20819,16 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "impossible de revenir à %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20650,145 +20850,134 @@
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode inconnu : %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr ""
"impossible de combiner les options d'application avec les options de fusion"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebasage inconnu : %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-"
-"failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': exactement une base de fusion nécessaire avec une branche"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': exactement une base de fusion nécessaire"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Ne pointe pas sur une validation valide : '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal : pas de branche ou commit '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "pas de branche ou commit '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Impossible de résoudre le commit HEAD vers un révision"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "impossible de basculer vers %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branche courante %s est à jour.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branche courante %s est à jour, rebasage forcé.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
"dessus...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rapide de %s sur %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20818,7 +21007,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20838,11 +21027,11 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -20883,7 +21072,7 @@
msgid "%s points nowhere!"
msgstr "%s ne pointe nulle part !"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "pas de journal de références à supprimer spécifié"
@@ -21043,7 +21232,7 @@
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
@@ -21053,27 +21242,32 @@
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s non géré ; 'true' supposé"
+
+#: builtin/remote.c:366
#, 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:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "impossible d'assigner '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -21084,17 +21278,17 @@
"\t%s%d\n"
"nomme à présent le distant inexistant '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Pas de serveur remote : '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, 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:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -21105,17 +21299,17 @@
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -21130,118 +21324,118 @@
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, 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:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebase de manière interactive (avec fusions) sur la distante %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(pas d'URL)"
@@ -21249,25 +21443,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21275,162 +21469,166 @@
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (état non demandé)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
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:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
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:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
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:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "être verbeux : doit être placé avant une sous-commande"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21439,147 +21637,160 @@
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
"les objects de paquet."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"impossible de terminer pack-objects pour ré-empaqueter les objets de "
"prometteur"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "impossible d'ouvrir l'index pour %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
"le paquet %s est trop gros pour être pris en compte dans un progression "
"géométrique"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "le paquet %s est trop gros à enrouler"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "impossible d'ouvrir le fichier temporaire %s en écriture"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "trouver une progression géométrique avec un facteur <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "écrire un index de multi-paquet des paquets résultants"
+
+#: builtin/repack.c:678
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:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric est incompatible avec -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "fichier nécessaire manquant : %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "impossible de délier : '%s'"
@@ -21891,95 +22102,95 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr ""
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
"tard"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21994,12 +22205,12 @@
"de\n"
"config reset.quiet à true pour avoir ce comportement en permanence.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
@@ -22180,15 +22391,19 @@
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "autoriser les validations avec des messages vides"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -22238,73 +22453,72 @@
msgstr[0] "le fichier suivant a des modifications locales :"
msgstr[1] "les fichiers suivants ont des modifications locales :"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> "
-"[<référence>...]\n"
-" --all et la spécification explicite de <référence> sont mutuellement "
-"exclusifs."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<hôte>:]<répertoire> (--all | <réf>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "lire les références depuis l'entrée standard"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
@@ -22364,21 +22578,21 @@
msgid "group by field"
msgstr "grouper par champ"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "trop d'arguments fournis hors d'un dépôt"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+" [--current] [--color[=<quand>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22391,117 +22605,117 @@
msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "aucune référence correspond à %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
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:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
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:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
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"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
"base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "--reflog requiert un nom de branche"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "impossible de gérer plus de %d révision."
msgstr[1] "impossible de gérer plus de %d révisions."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
@@ -22577,72 +22791,86 @@
"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
"pourrait ne pas exister)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
+"cone d'extraction clairsemée"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "échec de suppression du répertoire '%s'"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr ""
"échec de la création du répertoire pour le fichier d'extraction clairsemée"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
"impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "échec de paramétrage extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "initialiser l'extraction clairsemée en mode cone"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "bascule l'utilisation d'index clairsemé"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "impossible de modifier la configuration d'index clairsemé"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "impossible de normaliser le chemin '%s'"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "impossible de décoter la chaîne en style C '%s'"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "lire les motifs depuis l'entrée standard"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
@@ -22678,7 +22906,7 @@
" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
" [--] [<spécificateur-de-chemin>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22708,6 +22936,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<spécificateur-de-chemin>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22731,7 +22967,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear avec des arguments n'est pas implémenté"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22743,168 +22979,168 @@
" %s -> %s\n"
" pour faire de la place.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "impossible d'appliquer un remisage en cours de fusion"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "impossible de générer %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "conflits dans l'index. Essayez sans --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "impossible de sauvegarder l'arbre d'index"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Fusion de %s avec %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "tentative de recréer l'index"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s supprimé (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s : Impossible de supprimer l'élément de stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' n'est pas une référence de remisage"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr ""
"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "échec de l'analyse de l'arbre"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "échec du dépaquetage des arbres"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "inclure les fichiers non suivis dans le remisage"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "ne montrer que les fichiers non suivis dans le remisage"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22930,7 +23166,7 @@
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
@@ -22944,27 +23180,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
+"son propre amont d'autorité."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrée dans '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22973,7 +23217,7 @@
"run_command a retourné un statut non-nul pour %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22984,83 +23228,74 @@
"modules inclus de %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr ""
"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
-"son propre amont d'autorité."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<options>] [<chemin>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, 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:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "supprimer la sortie d'état du sous-module"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -23068,98 +23303,98 @@
"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
"du sous-module"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "mode %o inattendu\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
"utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "comparer le commit dans l'index avec celui dans la HEAD du sous-module"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "limiter la taille du résumé"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "impossible de récupérer une révision pour HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached et --files sont mutuellement exclusifs"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr ""
"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23169,7 +23404,7 @@
"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23178,48 +23413,48 @@
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossible de créer le répertoire vide du sous-module %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23231,69 +23466,69 @@
"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
"clonez avec '--reference-if-able' au lieu de '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, 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:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "le répertoire n'est pas vide : '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, 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:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "interdire de cloner dans un répertoire non-vide"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23303,84 +23538,183 @@
"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
"--path <chemin>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Impossible d'extraire '%s' dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Impossible de rebaser '%s' dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Impossible de fusionner '%s' dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "L'exécution de '%s %s' a échoué dans le chemin de sous-module '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de "
+"rapatriement direct de %s :"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Chemin de sous-module '%s' récupéré, mais il ne contenait pas %s. La "
+"récupération directe de ce commit a échoué."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+"supprimer la sortie lors de la mise à jour par un rebasage ou une fusion"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "forcer les mises à jour d'extraction"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "ne pas récupérer les nouveaux objets depuis le site distant"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"passer outre le mode mise à jour dans le cas où le dépôt est un clone nouveau"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "profondeur pour une récupération superficielle"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 attendu par le super-projet"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "sous-sha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 de la HEAD du sous-module"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<options>] <chemin>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23389,147 +23723,202 @@
"La branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "désactiver la configuration dans le fichier .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [<valeur>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nom>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "régler la branche de suivi par défaut à master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "régler la branche de suivi par défaut"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> "
"<chemin>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch ou --default requis"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch et --default sont mutuellement exclusifs"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Ajout du dépôt existant à '%s' dans l'index\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' existe déjà et n'est pas un dépôt git valide"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) distant(s) :"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) "
+"distant(s) :\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n"
+"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner "
+"depuis\n"
" %s\n"
-"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct\n"
-"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'.\n"
+"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
+"correct\n"
+"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Impossible d'extraire le sous-module '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "la branche du dépôt à extraire lors du clonage"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Échec d'ajout du sous-module '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Échec d'enregistrement du sous-module '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existe déjà dans l'index"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' existe déjà dans l'index et n'est pas un sous-module"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "la branche du dépôt à ajouter comme sous-module"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr "git submodule--helper add-clone [<options>...] --url <url> --path <chemin> --name <nom>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "afficher seulement les messages d'erreur"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "emprunter les objets depuis des dépôts de références"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"configurer le nom du sous-module avec la chaîne fournie au lieu d'utiliser "
+"par défaut son chemin"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
+
+#: builtin/submodule--helper.c:3297
+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"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' n'est pas un nom valide de sous-module"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<options>] nom [<référence>]"
+msgstr "git symbolic-ref [<options>] <nom> [<référence>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
@@ -23548,41 +23937,41 @@
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "raison de la mise à jour"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <fichier>]\n"
-"\t\t<nom-étiquette> [<head>]"
+"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>]\n"
+" <nom-d-étiquette> [<tête>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nométiquette>..."
+msgstr "git tag -d <nom-d-étiquette>..."
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <objet>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<motif>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<format>] <nométiquette>..."
+msgstr "git tag -v [--format=<format>] <nom-d-étiquette>..."
#: builtin/tag.c:100
#, c-format
@@ -23645,131 +24034,131 @@
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, 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:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --no-contains est autorisée seulement en mode liste"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "l'option --points-at est autorisée seulement en mode liste"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -23783,209 +24172,204 @@
msgid "failed to create directory %s"
msgstr "échec de la création du répertoire %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "échec de la création du fichier %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "échec de la suppression du fichier %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "échec de la suppression du répertoire %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"l'information de stat du répertoire change après mise à jour d'un fichier"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
"un sous-répertoire"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"fichier<"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"répertoire"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "ne pas toucher aux entrées restreintes à l'index"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "tester si le système de fichier supporte le cache de non-suivis"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "activer le cache de non-suivis sans tester le système de fichier"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "écrire l'index même s'il n'est pas marqué comme modifié"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr ""
"activer ou désactiver la surveillance du système de fichier (fsmonitor)"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "marquer les fichiers comme valides pour fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "effacer le bit de validité fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23993,7 +24377,7 @@
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer l'index coupé"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -24001,7 +24385,7 @@
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver l'index coupé"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -24009,11 +24393,11 @@
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -24021,29 +24405,29 @@
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer le cache des fichiers non-suivis"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "
"activer la surveillance du système de fichiers"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor activé"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver la surveillance du système de fichiers"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor désactivé"
@@ -24061,19 +24445,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
@@ -24089,20 +24473,20 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "sortir immédiatement après l'annonce initiale des références"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir l'information et les références pour git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
@@ -24138,63 +24522,58 @@
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<options>] <chemin> [<commit>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<options>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<options>] <arbre-de-travail>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "échec de la suppression de '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Suppression de %s/%s : %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "arbre de travail destination '%s' inutilisable"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -24204,7 +24583,7 @@
"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
"pour corriger"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -24213,149 +24592,149 @@
"'%s' est un arbre de travail manquant mais déjà enregistré ;\n"
"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "initialisation"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
"précédemment sur %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
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:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "essayer de nommer la nouvelle branche comme la branche amont"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason exige --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "ajouté avec --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "afficher les annotations étendues et les raisons, si disponible"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose et --porcelain sont mutuellement exclusifs"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"les arbres de travail contenant des sous-modules ne peuvent pas être "
"déplacés ou supprimés"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -24365,7 +24744,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -24373,39 +24752,39 @@
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
"supprimer"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "impossible de lancer 'git status' sur '%s', code %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24415,7 +24794,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24423,18 +24802,18 @@
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
"la validation a échoué, impossible de supprimer l'arbre de travail : %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "réparation : %s : '%s'"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "erreur : %s : %s"
@@ -24563,17 +24942,17 @@
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "impossible d'utiliser %s comme une fonction intégrée"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24582,13 +24961,13 @@
"usage : %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "échec au lancement de la commande '%s' : %s\n"
@@ -24635,68 +25014,34 @@
msgid "exit immediately after advertising capabilities"
msgstr "sortir immédiatement après l'annonce des capacités"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe déjà en cours d'utilisation : '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "impossible de démarrer les serveur sur : '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "échec du lancement d'un daemon en tâche de fond"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "échec du waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "daemon pas encore en ligne"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "échec du démarrage du daemon"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid est embrouillé"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "le daemon n'est pas encore arrêté"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc-is-active [<nom>] [<options>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<nom>] [<fils-d'exécution>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-"
"max>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<nom>] [<attente-max>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<nom>] [<jeton>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
"test-helper simple-ipc sendbytes [<nom>] [<nombre-d'octets>] [<octets>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24704,87 +25049,83 @@
"test-helper simple-ipc multiple [<nom>] [<fils-d'exécution>] [<nombre-"
"d'octets>] [<taille-de-lot>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "nom ou nom de chemin du socket unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "nom du pipe nommé"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
"nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "nombre de secondes à attendre que le daemon démarre ou s'arrête"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "nombre d'octets"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "nombre de requêtes par fil d'exécution"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "octet"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "caractère ballast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "jeton"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "jeton de commande à envoyer au serveur"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans "
"dorsale SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24800,45 +25141,51 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "citation invalide dans la valeur push-option : '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "réponse du serveur invalide ; '%s' reçu"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "dépôt '%s' non trouvé"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Échec d'authentification pour '%s'"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"impossible d'accéder à '%s' avec la configuration http.pinnedPubkey : %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossible d'accéder à '%s' : %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "redirection vers %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
@@ -24848,83 +25195,83 @@
"impossible de rembobiner le données post rpc - essayer d'augmenter http."
"postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl : paquet de fin de réponse inattendu"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "échec RPC ; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "impossible de gérer des poussées aussi grosses"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d octets de longueur d'entête ont été reçus"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d octets de corps sont encore attendus"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "le protocole http idiot ne supporte la capacité superficielle"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "échec du récupération."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "impossible de récupérer par sha1 sur http intelligent"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "le transport http ne supporte pas %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "échec de git-http-push"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl : récupération tentée sans dépôt local"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
@@ -24945,46 +25292,46 @@
msgid "object filtering"
msgstr "filtrage d'objet"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "date-d'expiration"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "utiliser <n> chiffres pour afficher les noms des objets"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "lire les spécificateurs de fichier depuis fichier"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un "
"caractère NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "clé"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
@@ -25696,41 +26043,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "la bissection a échoué : aucune commande fournie."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "lancement de $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"la bissection a échoué :\n"
-"le code retour $res de '$command' est < 0 ou >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "la bissection ne peut plus continuer"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"la bissection a échoué :\n"
-"'bisect-state $state' a retourné le code erreur $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "succès de la bissection"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25771,55 +26083,19 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-submodule.sh:179
-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:189
-#, 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:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' existe déjà dans l'index"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' n'a pas de commit extrait"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Échec d'ajout du sous-module '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, 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:542
+#: git-submodule.sh:411
#, 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:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25828,402 +26104,11 @@
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
-"de rapatriement direct de $sha1 :"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
-"$sha1. La récupération directe de ce commit a échoué."
-
-#: git-submodule.sh:578
-#, 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:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-
-#: git-submodule.sh:583
-#, 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:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-
-#: git-submodule.sh:589
-#, 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:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
-"'$displaypath'"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autoremisage appliqué."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Impossible de stocker $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"L'application de l'autoremisage a provoqué des conflits\n"
-"Vos modifications sont à l'abri dans la remise.\n"
-"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasage ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Commandes :\n"
-" p, pick <commit> = utiliser le commit\n"
-" r, reword <commit> = utiliser le commit, mais reformuler son message\n"
-" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"
-" s, squash <commit> = utiliser le commit, mais le fusionner avec le "
-"précédent\n"
-" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"
-" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
-" d, drop <commit> = supprimer le commit\n"
-" l, label <label> = étiqueter la HEAD courante avec un nom\n"
-" t, reset <label> = réinitialiser HEAD à label\n"
-" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n"
-" créer un commit de fusion utilisant le message de fusion original\n"
-" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n"
-" Utilisez -c <commit> pour reformuler le message de validation.\n"
-"\n"
-"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Vous pouvez corriger le commit maintenant, avec\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"après avoir réalisé vos modifications, lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1 n'est pas un commit qui peut être picorer"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de commit invalide : $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rapide sur $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Avance rapide impossible sur $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Impossible de déplacer HEAD sur $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Refus d'écraser un commit de fusion: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Erreur lors de la réapplication de la fusion $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Impossible de picorer $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Ceci est le ${n}ième message de validation :"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Le message de validation ${n} sera ignoré :"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Ceci est la combinaison de $count commit."
-msgstr[1] "Ceci est la combinaison de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Impossible d'écrire $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Ceci est la combinaison de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Impossible d'appliquer $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Impossible de corriger le commit après avoir réussi à picorer $sha1... "
-"$rest\n"
-"C'est probablement dû à un message de validation vide ou le crochet pre-"
-"commit\n"
-"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre "
-"le\n"
-"problème avant de pouvoir reformuler le message du commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Arrêté à $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "'$squash_style' impossible avec le commit précédent"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Exécution : $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'exécution a échoué : $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "et a mis à jour l'index ou la copie de travail"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Vous pouvez corriger le problème, puis lancer\n"
-"\n"
-"git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"L'exécution a réussi : $rest\n"
-"mais a laissé des modifications dans l'index ou la copie de travail\n"
-"Validez ou remisez vos modification, puis lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Commande inconnue : $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Rebasage et mise à jour de $head_name avec succès."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Vous avez des modifications indexées dans votre copie de travail.\n"
-"Si ces modifications devaient être ajoutées\n"
-"dans le commit précédent, lancez :\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si elles devaient aller dans un nouveau commit, lancez :\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Dans les deux cas, une fois fini, continuez avec :\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Vous avez des modifications non validées dans votre copie de travail.\n"
-"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "impossible de valider les modifications indexées."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Impossible de lancer l'éditeur"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Impossible d'extraire $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Pas de HEAD ?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Impossible de créer un répertoire temporaire $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Impossible de marquer comme interactif"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
-msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Veuillez noter que les commits vides sont en commentaire"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Impossible d'initialiser les commits réécrits"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -26242,52 +26127,32 @@
msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Impossible de rebaser : vous avez des modifications non indexées."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action est impossible : vous avez des modifications non indexées."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Impossible de rebaser : votre index contient des modifications non validées."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"impossible de tirer avec rebasage : votre index contient des modifications "
-"non validées."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"$action est impossible : votre index contient des modifications non validées."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Vous devez lancer cette commande depuis la racine de votre copie de travail."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
@@ -26929,7 +26794,7 @@
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
@@ -26954,30 +26819,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26988,12 +26853,12 @@
"%s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -27002,13 +26867,13 @@
"fatal : %s : %d est plus long que 998 caractères \n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
diff --git a/po/git.pot b/po/git.pot
index fcd45ef..78fea37 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,223 +8,223 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"POT-Creation-Date: 2021-11-10 08:55+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"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr ""
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr ""
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr ""
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr ""
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr ""
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr ""
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr ""
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr ""
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr ""
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr ""
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr ""
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr ""
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr ""
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr ""
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr ""
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr ""
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr ""
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr ""
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr ""
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr ""
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr ""
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr ""
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr ""
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr ""
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr ""
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr ""
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr ""
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr ""
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr ""
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr ""
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr ""
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr ""
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr ""
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr ""
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr ""
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr ""
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr ""
@@ -661,79 +661,85 @@
msgid "'git apply' failed"
msgstr ""
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:270
+#: advice.c:196
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 ""
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -889,487 +895,488 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3056
+#: apply.c:3057
#, 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] ""
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr ""
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr ""
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr ""
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr ""
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr ""
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr ""
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr ""
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr ""
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr ""
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr ""
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr ""
@@ -1439,194 +1446,193 @@
msgid "cannot read %s"
msgstr ""
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr ""
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr ""
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr ""
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr ""
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr ""
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr ""
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr ""
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr ""
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr ""
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr ""
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr ""
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr ""
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr ""
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr ""
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr ""
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr ""
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr ""
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1634,7 +1640,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1642,43 +1648,43 @@
"We continue anyway."
msgstr ""
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path arguments?\n"
msgstr ""
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1688,7 +1694,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1707,11 +1713,12 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr ""
@@ -1874,8 +1881,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -1933,7 +1940,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr ""
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -1975,7 +1982,7 @@
msgid "invalid color value: %.*s"
msgstr ""
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr ""
@@ -2020,217 +2027,217 @@
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2242,27 +2249,27 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2273,7 +2280,7 @@
msgid "memory exhausted"
msgstr ""
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2283,35 +2290,35 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr ""
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr ""
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr ""
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
@@ -2321,295 +2328,295 @@
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr ""
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr ""
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr ""
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr ""
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr ""
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr ""
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr ""
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr ""
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr ""
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -2640,79 +2647,79 @@
msgid "expected flush after capabilities"
msgstr ""
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr ""
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr ""
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr ""
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2720,77 +2727,77 @@
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr ""
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr ""
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr ""
@@ -2924,17 +2931,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr ""
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr ""
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr ""
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr ""
@@ -3036,23 +3043,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr ""
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr ""
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr ""
@@ -3066,596 +3073,596 @@
"tree"
msgstr ""
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr ""
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr ""
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr ""
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr ""
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr ""
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr ""
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr ""
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr ""
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr ""
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr ""
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr ""
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr ""
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr ""
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr ""
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr ""
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr ""
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr ""
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr ""
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr ""
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr ""
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr ""
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr ""
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr ""
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr ""
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr ""
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr ""
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr ""
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr ""
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr ""
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr ""
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr ""
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3666,7 +3673,7 @@
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr ""
@@ -3704,476 +3711,550 @@
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr ""
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:383 fetch-pack.c:1423
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:389 fetch-pack.c:1429
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:391 fetch-pack.c:1431
-#, c-format
-msgid "object not found: %s"
-msgstr ""
-
#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
+msgid "invalid shallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:400 fetch-pack.c:1440
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:402 fetch-pack.c:1442
+#, c-format
+msgid "object not found: %s"
+msgstr ""
+
+#: fetch-pack.c:405 fetch-pack.c:1445
+#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr ""
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr ""
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr ""
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr ""
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr ""
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr ""
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr ""
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr ""
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr ""
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr ""
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr ""
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr ""
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr ""
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr ""
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr ""
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr ""
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr ""
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr ""
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr ""
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr ""
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr ""
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr ""
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr ""
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr ""
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr ""
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr ""
-#: help.c:527
+#: help.c:543
#, 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 ""
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr ""
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4183,16 +4264,16 @@
msgstr[0] ""
msgstr[1] ""
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr ""
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4202,6 +4283,13 @@
msgstr[0] ""
msgstr[1] ""
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr ""
@@ -4253,7 +4341,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr ""
@@ -4340,7 +4428,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr ""
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr ""
@@ -4348,44 +4441,44 @@
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr ""
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr ""
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4396,42 +4489,42 @@
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4439,47 +4532,47 @@
"majority of the files."
msgstr ""
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4487,67 +4580,67 @@
"markers."
msgstr ""
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr ""
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr ""
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr ""
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4557,192 +4650,192 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr ""
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, 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:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, 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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4750,86 +4843,86 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr ""
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr ""
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr ""
@@ -4837,189 +4930,221 @@
msgid "failed to read the cache"
msgstr ""
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr ""
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr ""
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr ""
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr ""
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr ""
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr ""
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr ""
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr ""
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr ""
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr ""
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr ""
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr ""
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr ""
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr ""
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr ""
@@ -5074,257 +5199,257 @@
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr ""
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr ""
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr ""
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr ""
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
@@ -5436,12 +5561,25 @@
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
@@ -5471,45 +5609,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr ""
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr ""
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr ""
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
@@ -5529,71 +5667,71 @@
msgid "malformed object name '%s'"
msgstr ""
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr ""
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr ""
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr ""
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr ""
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr ""
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr ""
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr ""
@@ -5601,97 +5739,121 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr ""
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr ""
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr ""
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
@@ -5712,7 +5874,7 @@
msgid "flush packet write failed"
msgstr ""
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr ""
@@ -5720,7 +5882,7 @@
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
@@ -5729,25 +5891,25 @@
msgid "packet write failed: %s"
msgstr ""
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr ""
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
@@ -5761,7 +5923,7 @@
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr ""
@@ -5790,32 +5952,32 @@
msgid "Removing duplicate objects"
msgstr ""
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr ""
@@ -5842,7 +6004,7 @@
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
@@ -5862,166 +6024,166 @@
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
@@ -6071,19 +6233,19 @@
msgstr[0] ""
msgstr[1] ""
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6092,21 +6254,21 @@
"\n"
msgstr ""
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr ""
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr ""
@@ -6129,11 +6291,9 @@
"\n"
msgstr ""
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
msgstr ""
#: ref-filter.c:42 wt-status.c:2036
@@ -6155,257 +6315,277 @@
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr ""
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr ""
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr ""
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr ""
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6420,81 +6600,81 @@
"\tgit branch -m <name>\n"
msgstr ""
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr ""
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr ""
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr ""
@@ -6769,7 +6949,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr ""
@@ -6814,8 +6994,8 @@
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr ""
@@ -6853,44 +7033,41 @@
msgid "could not determine HEAD revision"
msgstr ""
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr ""
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr ""
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
@@ -6909,118 +7086,132 @@
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr ""
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr ""
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr ""
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr ""
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -7028,65 +7219,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7103,11 +7294,11 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7122,7 +7313,7 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7136,359 +7327,364 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:3031
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3034
-msgid "cherry-pick is already in progress"
-msgstr ""
-
-#: sequencer.c:3036
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
-
#: sequencer.c:3050
#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3053
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:3055
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3069
+#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7500,27 +7696,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7530,11 +7726,11 @@
"\n"
msgstr ""
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7545,90 +7741,90 @@
"\n"
msgstr ""
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -7636,29 +7832,29 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7671,108 +7867,117 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr ""
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr ""
@@ -7916,27 +8121,15 @@
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr ""
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
@@ -7993,13 +8186,13 @@
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr ""
@@ -8023,7 +8216,7 @@
msgid "invalid value for %s"
msgstr ""
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
@@ -8046,147 +8239,147 @@
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr ""
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr ""
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr ""
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr ""
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr ""
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr ""
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8194,11 +8387,11 @@
"'%s'\n"
msgstr ""
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
@@ -8220,7 +8413,7 @@
msgstr ""
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr ""
@@ -8235,11 +8428,11 @@
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr ""
@@ -8305,7 +8498,7 @@
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr ""
@@ -8323,7 +8516,7 @@
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr ""
@@ -8332,7 +8525,7 @@
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr ""
@@ -8345,111 +8538,111 @@
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr ""
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr ""
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr ""
@@ -8463,53 +8656,53 @@
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr ""
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -8525,11 +8718,11 @@
"\n"
msgstr ""
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr ""
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr ""
@@ -8742,16 +8935,16 @@
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr ""
@@ -8788,7 +8981,7 @@
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr ""
@@ -8884,17 +9077,27 @@
msgid "gitdir file points to non-existent location"
msgstr ""
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr ""
@@ -9408,25 +9611,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -9435,131 +9638,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr ""
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr ""
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr ""
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9577,191 +9779,191 @@
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr ""
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr ""
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1126
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
-
#: builtin/am.c:1127
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
#: builtin/am.c:1128
#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1129
+#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr ""
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr ""
@@ -9769,35 +9971,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
@@ -9816,201 +10018,201 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr ""
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr ""
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr ""
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr ""
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr ""
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -10018,42 +10220,33 @@
msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr ""
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr ""
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr ""
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr ""
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
-
#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
#: builtin/bisect--helper.c:25
@@ -10089,79 +10282,92 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr ""
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr ""
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr ""
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr ""
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr ""
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr ""
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr ""
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10169,7 +10375,7 @@
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr ""
@@ -10178,74 +10384,74 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr ""
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr ""
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr ""
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr ""
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr ""
@@ -10253,104 +10459,148 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr ""
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr ""
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr ""
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr ""
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr ""
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr ""
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr ""
-#: builtin/bisect--helper.c:1056
-msgid "reset the bisection state"
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
msgstr ""
-#: builtin/bisect--helper.c:1058
-msgid "check whether bad or good terms exist"
-msgstr ""
-
-#: builtin/bisect--helper.c:1060
-msgid "print out the bisect terms"
-msgstr ""
-
-#: builtin/bisect--helper.c:1062
-msgid "start the bisect session"
-msgstr ""
-
-#: builtin/bisect--helper.c:1064
-msgid "find the next bisection commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1066
-msgid "mark the state of ref (or refs)"
-msgstr ""
-
-#: builtin/bisect--helper.c:1068
-msgid "list the bisection steps so far"
-msgstr ""
-
-#: builtin/bisect--helper.c:1070
-msgid "replay the bisection process from the given file"
-msgstr ""
-
-#: builtin/bisect--helper.c:1072
-msgid "skip some commits for checkout"
-msgstr ""
-
-#: builtin/bisect--helper.c:1074
-msgid "no log for BISECT_WRITE"
-msgstr ""
-
-#: builtin/bisect--helper.c:1089
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1100
-msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ""
-
-#: builtin/bisect--helper.c:1109
-msgid "--bisect-next requires 0 arguments"
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
msgstr ""
#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr ""
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr ""
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr ""
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+
+#: builtin/bisect--helper.c:1192
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:1194
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:1196
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:1198
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:1200
+msgid "find the next bisection commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1202
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:1204
+msgid "list the bisection steps so far"
+msgstr ""
+
+#: builtin/bisect--helper.c:1206
+msgid "replay the bisection process from the given file"
+msgstr ""
+
+#: builtin/bisect--helper.c:1208
+msgid "skip some commits for checkout"
+msgstr ""
+
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr ""
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr ""
+
+#: builtin/bisect--helper.c:1214
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:1229
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1234
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/bisect--helper.c:1243
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr ""
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr ""
@@ -10362,149 +10612,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr ""
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr ""
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr ""
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr ""
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr ""
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr ""
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr ""
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr ""
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr ""
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr ""
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr ""
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
@@ -10516,18 +10768,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr ""
@@ -10622,74 +10874,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10697,246 +10949,246 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr ""
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr ""
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr ""
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr ""
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr ""
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr ""
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr ""
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr ""
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr ""
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -10955,38 +11207,33 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr ""
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr ""
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr ""
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr ""
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr ""
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
@@ -11007,129 +11254,129 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr ""
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr ""
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr ""
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr ""
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr ""
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
msgstr ""
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
msgstr ""
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr ""
@@ -11149,7 +11396,7 @@
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr ""
@@ -11157,8 +11404,8 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr ""
@@ -11216,11 +11463,10 @@
msgstr ""
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr ""
@@ -11371,61 +11617,61 @@
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11440,7 +11686,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11457,26 +11703,26 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -11488,281 +11734,281 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr ""
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr ""
@@ -11882,8 +12128,8 @@
msgstr ""
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
@@ -11968,19 +12214,20 @@
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr ""
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr ""
@@ -11996,8 +12243,8 @@
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr ""
@@ -12005,8 +12252,8 @@
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr ""
@@ -12015,16 +12262,16 @@
msgstr ""
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr ""
@@ -12053,21 +12300,21 @@
msgstr ""
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr ""
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr ""
@@ -12080,196 +12327,190 @@
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr ""
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr ""
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -12305,105 +12546,103 @@
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr ""
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr ""
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr ""
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr ""
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr ""
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr ""
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr ""
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12415,77 +12654,72 @@
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr ""
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr ""
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr ""
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr ""
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr ""
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr ""
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr ""
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -12494,15 +12728,15 @@
"\n"
msgstr ""
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr ""
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -12515,136 +12749,136 @@
"\n"
msgstr ""
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr ""
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr ""
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr ""
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored.\n"
msgstr ""
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, 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:899
+#: builtin/commit.c:900
#, 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"
msgstr ""
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12652,7 +12886,7 @@
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -12661,7 +12895,7 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -12670,369 +12904,369 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr ""
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr ""
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
msgstr ""
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr ""
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr ""
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr ""
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr ""
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr ""
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr ""
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr ""
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr ""
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13375,7 +13609,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
@@ -13569,7 +13803,7 @@
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr ""
@@ -13593,109 +13827,109 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr ""
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
@@ -13703,7 +13937,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr ""
@@ -13731,95 +13965,95 @@
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr ""
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr ""
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr ""
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr ""
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr ""
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr ""
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
@@ -13877,15 +14111,15 @@
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
@@ -13893,7 +14127,7 @@
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr ""
@@ -13905,7 +14139,7 @@
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr ""
@@ -13921,7 +14155,7 @@
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
@@ -13929,7 +14163,7 @@
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr ""
@@ -13941,7 +14175,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr ""
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr ""
@@ -13949,16 +14183,16 @@
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr ""
@@ -13972,19 +14206,19 @@
"files)"
msgstr ""
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
@@ -13996,7 +14230,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
@@ -14012,69 +14246,69 @@
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14083,164 +14317,169 @@
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, 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:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1618
-msgid "multiple branches detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
msgstr ""
#: builtin/fetch.c:1633
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
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:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr ""
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr ""
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
@@ -14305,7 +14544,7 @@
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr ""
@@ -14459,129 +14698,139 @@
msgid "notice: No default references"
msgstr ""
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr ""
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr ""
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr ""
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr ""
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr ""
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr ""
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
@@ -14605,7 +14854,7 @@
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr ""
@@ -14614,7 +14863,7 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -14690,147 +14939,187 @@
msgid "unrecognized --schedule argument '%s'"
msgstr ""
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr ""
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr ""
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr ""
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr ""
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr ""
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr ""
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr ""
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr ""
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr ""
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr ""
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr ""
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr ""
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr ""
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr ""
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr ""
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr ""
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr ""
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr ""
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr ""
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr ""
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr ""
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr ""
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr ""
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr ""
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr ""
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr ""
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr ""
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr ""
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr ""
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr ""
@@ -14839,12 +15128,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
@@ -14853,694 +15142,695 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr ""
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr ""
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr ""
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr ""
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr ""
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr ""
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr ""
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr ""
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr ""
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr ""
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr ""
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr ""
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr ""
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr ""
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr ""
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr ""
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr ""
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr ""
@@ -16162,126 +16452,130 @@
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr ""
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
msgstr ""
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr ""
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr ""
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr ""
@@ -16398,7 +16692,7 @@
msgid "use headers in message's body"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr ""
@@ -16512,142 +16806,142 @@
msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr ""
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr ""
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr ""
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr ""
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
@@ -16662,207 +16956,203 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
msgstr ""
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
msgstr ""
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr ""
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr ""
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr ""
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -16896,15 +17186,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr ""
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr ""
@@ -16925,44 +17215,53 @@
msgstr ""
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr ""
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr ""
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr ""
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr ""
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr ""
@@ -16989,72 +17288,72 @@
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr ""
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr ""
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -17226,47 +17525,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
@@ -17274,186 +17573,186 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr ""
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr ""
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr ""
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -17461,41 +17760,41 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
@@ -17542,357 +17841,362 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr ""
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr ""
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr ""
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr ""
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr ""
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17940,7 +18244,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr ""
@@ -17953,61 +18257,65 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18015,61 +18323,61 @@
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -18082,19 +18390,19 @@
"invocation.\n"
msgstr ""
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18102,7 +18410,7 @@
"commit %s."
msgstr ""
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18113,15 +18421,23 @@
"to recover."
msgstr ""
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr ""
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -18249,15 +18565,15 @@
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr ""
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr ""
@@ -18269,19 +18585,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr ""
@@ -18289,12 +18605,12 @@
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr ""
@@ -18314,11 +18630,11 @@
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr ""
@@ -18420,79 +18736,79 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr ""
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr ""
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr ""
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr ""
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr ""
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr ""
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr ""
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr ""
@@ -18511,193 +18827,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr ""
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr ""
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr ""
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr ""
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr ""
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr ""
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr ""
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr ""
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr ""
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr ""
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr ""
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr ""
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr ""
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr ""
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr ""
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18706,7 +18873,7 @@
"abort\"."
msgstr ""
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -18718,14 +18885,14 @@
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -18736,7 +18903,7 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18745,195 +18912,206 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr ""
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr ""
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr ""
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr ""
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr ""
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr ""
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
msgstr ""
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr ""
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr ""
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr ""
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18946,140 +19124,131 @@
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
+msgid "no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19096,7 +19265,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -19108,11 +19277,11 @@
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr ""
@@ -19148,7 +19317,7 @@
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr ""
@@ -19298,7 +19467,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr ""
@@ -19308,25 +19477,30 @@
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr ""
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr ""
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19334,17 +19508,17 @@
"now names the non-existent remote '%s'"
msgstr ""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr ""
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19352,17 +19526,17 @@
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19372,118 +19546,118 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr ""
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr ""
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr ""
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr ""
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1127
-msgid "local out of date"
-msgstr ""
-
-#: builtin/remote.c:1134
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
-msgstr ""
-
#: builtin/remote.c:1137
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
-msgstr ""
-
-#: builtin/remote.c:1141
-#, c-format
-msgid " %-*s forces to %s"
+msgid "local out of date"
msgstr ""
#: builtin/remote.c:1144
#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1147
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1151
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1154
+#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr ""
@@ -19491,322 +19665,339 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr ""
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr ""
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr ""
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr ""
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr ""
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr ""
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr ""
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr ""
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr ""
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr ""
@@ -20105,91 +20296,91 @@
msgid "keep"
msgstr ""
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -20198,12 +20389,12 @@
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr ""
@@ -20378,15 +20569,19 @@
msgid "preserve initially empty commits"
msgstr ""
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr ""
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr ""
@@ -20428,65 +20623,65 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr ""
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr ""
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr ""
@@ -20543,16 +20738,16 @@
msgid "group by field"
msgstr ""
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr ""
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
#: builtin/show-branch.c:17
@@ -20566,113 +20761,113 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
@@ -20739,70 +20934,82 @@
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr ""
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr ""
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr ""
@@ -20834,7 +21041,7 @@
" [--] [<pathspec>...]]"
msgstr ""
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -20859,6 +21066,12 @@
" [--] [<pathspec>...]]"
msgstr ""
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -20882,7 +21095,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr ""
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -20890,166 +21103,166 @@
" to make room.\n"
msgstr ""
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr ""
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr ""
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr ""
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr ""
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr ""
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr ""
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:635
-#, c-format
-msgid "Dropped %s (%s)"
-msgstr ""
-
-#: builtin/stash.c:638
-#, c-format
-msgid "%s: Could not drop stash entry"
-msgstr ""
-
#: builtin/stash.c:651
#, c-format
+msgid "Dropped %s (%s)"
+msgstr ""
+
+#: builtin/stash.c:654
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr ""
+
+#: builtin/stash.c:667
+#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr ""
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr ""
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr ""
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr ""
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr ""
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -21071,7 +21284,7 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -21085,34 +21298,40 @@
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -21120,220 +21339,213 @@
"."
msgstr ""
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr ""
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr ""
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr ""
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -21341,282 +21553,422 @@
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr ""
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr ""
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr ""
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr ""
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr ""
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr ""
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr ""
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr ""
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr ""
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr ""
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr ""
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr ""
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr ""
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
msgstr ""
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr ""
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr ""
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -21641,18 +21993,18 @@
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr ""
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
#: builtin/tag.c:27
@@ -21663,7 +22015,7 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
@@ -21717,130 +22069,130 @@
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr ""
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -21854,241 +22206,236 @@
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr ""
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr ""
@@ -22104,19 +22451,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr ""
@@ -22132,19 +22479,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
msgstr ""
#: builtin/upload-pack.c:29
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
@@ -22180,274 +22527,269 @@
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr ""
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr ""
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr ""
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr ""
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr ""
@@ -22561,29 +22903,29 @@
msgid "close failed on standard output"
msgstr ""
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
@@ -22630,147 +22972,109 @@
msgid "exit immediately after advertising capabilities"
msgstr ""
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr ""
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr ""
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr ""
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr ""
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr ""
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr ""
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22783,45 +23087,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr ""
@@ -22829,83 +23138,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr ""
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr ""
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr ""
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr ""
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
@@ -22926,44 +23235,44 @@
msgid "object filtering"
msgstr ""
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr ""
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr ""
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr ""
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr ""
@@ -23647,37 +23956,6 @@
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23716,385 +23994,28 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -24111,44 +24032,28 @@
msgstr ""
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr ""
@@ -24675,7 +24580,7 @@
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr ""
@@ -24700,30 +24605,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -24731,25 +24636,25 @@
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
diff --git a/po/id.po b/po/id.po
index 7db807a..c1afc2a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
"PO-Revision-Date: 2021-08-14 09:35+0700\n"
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
"Language-Team: Indonesian\n"
@@ -17,213 +17,213 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Huh (%s)"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "tidak dapat membaca indeks"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "biner"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "tidak ada"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "tak berubah"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Perbarui"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "tidak dapat menggelar '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "tidak dapat menulis indeks"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d jalur diperbarui\n"
msgstr[1] "%d jalur diperbarui\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "catatan: %s sekarang tak terlacak.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gagal untuk jalur '%s'"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Kembalikan"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Tidak dapat menguraikan HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d jalur dikembalikan\n"
msgstr[1] "%d jalur dikembalikan\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Tidak ada berkas tak terlacak.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Tambahkan tak terlacak"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d jalur ditambahkan\n"
msgstr[1] "%d jalur ditambahkan\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "mengabaikan tak tergabung: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Hanya berkas biner yang berubah.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Tidak ada perubahan.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Pembaruan tambalan"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Tinjau diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "perlihatkan jalur dengan perubahan"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
-msgstr "ambil hunk dan perbarui secara selektif"
+msgstr "ambil bingkah dan perbarui secara selektif"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "lihat diff antara HEAD dan indeks"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Permintaan bantuan:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "pilih satu item"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "pilih kisaran item"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "pilih banyak kisaran"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "pilih item berdasarkan prefiks unik"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "batal pilih item yang disebutkan"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "pilih semua item"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(kosong) sudah memilih"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "pilih item bernomor"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(empty) tidak pilih apapun"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Perintah ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Apa sekarang"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "tergelar"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "tak tergelar"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "jalur"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "tidak dapat menyegarkan indeks"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Sampai jumpa.\n"
@@ -246,15 +246,15 @@
#: add-patch.c:37 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Gelar hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk digelar."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk digelar."
#: add-patch.c:42
msgid ""
@@ -264,11 +264,11 @@
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - gelar hunk ini\n"
-"n - jangan gelar hunk ini\n"
-"q - keluar; jangan gelar hunk ini atau yang sisanya\n"
-"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - gelar bingkah ini\n"
+"n - jangan gelar bingkah ini\n"
+"q - keluar; jangan gelar bingkah ini atau yang sisanya\n"
+"a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
@@ -288,15 +288,15 @@
#: add-patch.c:59 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Stase hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk distase."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk distase."
#: add-patch.c:64
msgid ""
@@ -306,11 +306,11 @@
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - stase hunk ini\n"
-"n - jangan stase hunk ini\n"
-"q - keluar; jangan stase hunk ini atau yang sisanya\n"
-"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - stase bingkah ini\n"
+"n - jangan stase bingkah ini\n"
+"q - keluar; jangan stase bingkah ini atau yang sisanya\n"
+"a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
@@ -330,15 +330,15 @@
#: add-patch.c:83 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Batal gelar hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibatalgelarkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibatalgelarkan."
#: add-patch.c:88
msgid ""
@@ -348,11 +348,11 @@
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - batal gelar hunk ini\n"
-"n - jangan batal gelar hunk ini\n"
-"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n"
-"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - batal gelar bingkah ini\n"
+"n - jangan batal gelar bingkah ini\n"
+"q - keluar; jangan batal gelar bingkah ini atau yang sisanya\n"
+"a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
@@ -372,15 +372,15 @@
#: add-patch.c:106 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Terapkan hunk ini ke indeks [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk diterapkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk diterapkan."
#: add-patch.c:111
msgid ""
@@ -390,11 +390,11 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke indeks\n"
-"n - jangan terapkan hunk ini ke indeks\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks\n"
+"n - jangan terapkan bingkah ini ke indeks\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:126 git-add--interactive.perl:1455
#: git-add--interactive.perl:1473
@@ -418,15 +418,15 @@
#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Buang hunk ini dari pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibuang."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibuang."
#: add-patch.c:134 add-patch.c:202
msgid ""
@@ -436,11 +436,11 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - buang hunk ini dari pohon kerja\n"
-"n - jangan buang hunk ini dari pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari pohon kerja\n"
+"n - jangan buang bingkah ini dari pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
@@ -460,7 +460,7 @@
#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Buang hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:157
msgid ""
@@ -470,11 +470,11 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - buang hunk ini dari indeks dan pohon kerja\n"
-"n - jangan buang hunk ini dari indeks dan pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari indeks dan pohon kerja\n"
+"n - jangan buang bingkah ini dari indeks dan pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
@@ -494,7 +494,7 @@
#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Terapkan hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
#: add-patch.c:179
msgid ""
@@ -504,11 +504,11 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke indeks dan pohon kerja\n"
-"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks dan pohon kerja\n"
+"n - jangan terapkan bingkah ini ke indeks dan pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:224
msgid ""
@@ -518,21 +518,21 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-"y - terapkan hunk ini ke pohon kerja\n"
-"n - jangan terapkan hunk ini ke pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke pohon kerja\n"
+"n - jangan terapkan bingkah ini ke pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
+"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah '%.*s'"
#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'"
#: add-patch.c:420
msgid "could not parse diff"
@@ -576,14 +576,14 @@
"\tdoes not end with:\n"
"%.*s"
msgstr ""
-"hunk tidak tumpang tindih:\n"
+"bingkah tidak tumpang tindih:\n"
"%.*s\n"
"tidak berakhir dengan:\n"
"%.*s"
#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n"
+msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n"
#: add-patch.c:1086
#, c-format
@@ -606,12 +606,12 @@
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n"
-"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n"
-"dibatalkan dan hunk tetap tidak berubah.\n"
+"untuk menyunting lagi. Jika semua baris dalam bingkah dihapus, suntingan\n"
+"dibatalkan dan bingkah tetap tidak berubah.\n"
#: add-patch.c:1133
msgid "could not parse hunk header"
-msgstr "tidak dapat menguraikan kepala hunk"
+msgstr "tidak dapat menguraikan kepala bingkah"
#: add-patch.c:1178
msgid "'git apply --cached' failed"
@@ -633,12 +633,12 @@
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) "
-"[y/n]?"
+"Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" "
+"buang!) [y/n]?"
#: add-patch.c:1290
msgid "The selected hunks do not apply to the index!"
-msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"
+msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
@@ -660,35 +660,35 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n"
-"J - biarkan hunk ini ragu, lihat hunk berikutnya\n"
-"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n"
-"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n"
-"g - pilih satu hunk untuk dikunjungi\n"
-"/ - cari satu hunk yang cocok dengan regex yang diberikan\n"
-"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n"
-"e - sunting hunk saat ini secara manual\n"
+"j - biarkan bingkah ini ragu, lihat bingkah ragu berikutnya\n"
+"J - biarkan bingkah ini ragu, lihat bingkah berikutnya\n"
+"k - biarkan bingkah ini ragu, lihat bingkah ragu sebelumnya\n"
+"K - biarkan bingkah ini ragu, lihat bingkah sebelumnya\n"
+"g - pilih satu bingkah untuk dikunjungi\n"
+"/ - cari satu bingkah yang cocok dengan regex yang diberikan\n"
+"s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n"
+"e - sunting bingkah saat ini secara manual\n"
"? - cetak bantuan\n"
#: add-patch.c:1517 add-patch.c:1527
msgid "No previous hunk"
-msgstr "Tidak ada hunk sebelumnya"
+msgstr "Tidak ada bingkah sebelumnya"
#: add-patch.c:1522 add-patch.c:1532
msgid "No next hunk"
-msgstr "Tidak ada hunk selanjutnya"
+msgstr "Tidak ada bingkah selanjutnya"
#: add-patch.c:1538
msgid "No other hunks to goto"
-msgstr "Tidak ada hunk lainnya untuk dikunjungi"
+msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
#: add-patch.c:1549 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
-msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? "
+msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
-msgstr "pergi ke hunk yang mana?"
+msgstr "pergi ke bingkah yang mana?"
#: add-patch.c:1561
#, c-format
@@ -699,12 +699,12 @@
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
-msgstr[0] "Maaf, hanya %d hunk yang tersedia."
-msgstr[1] "Maaf, hanya %d hunk yang tersedia."
+msgstr[0] "Maaf, hanya %d bingkah yang tersedia."
+msgstr[1] "Maaf, hanya %d bingkah yang tersedia."
#: add-patch.c:1575
msgid "No other hunks to search"
-msgstr "Tidak ada hunk lainnya untuk dicari"
+msgstr "Tidak ada bingkah lainnya untuk dicari"
#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
@@ -717,98 +717,104 @@
#: add-patch.c:1613
msgid "No hunk matches the given pattern"
-msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"
+msgstr "Tidak ada bingkah yang cocok dengan pola yang diberikan"
#: add-patch.c:1620
msgid "Sorry, cannot split this hunk"
-msgstr "Maaf, tidak dapat membelah hunk ini"
+msgstr "Maaf, tidak dapat membelah bingkah ini"
#: add-patch.c:1624
#, c-format
msgid "Split into %d hunks."
-msgstr "Terbelah ke dalam %d hunk."
+msgstr "Terbelah ke dalam %d bingkah."
#: add-patch.c:1628
msgid "Sorry, cannot edit this hunk"
-msgstr "Maaf, tidak dapat menyunting hunk ini"
+msgstr "Maaf, tidak dapat menyunting bingkah ini"
#: add-patch.c:1680
msgid "'git apply' failed"
msgstr "'git apply' gagal"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:270
+#: advice.c:196
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 ""
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Tidak mungkin untuk maju cepat, batalkan."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -842,73 +848,75 @@
#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr ""
+msgstr "opsi spasi putih tidak dikenal '%s'"
#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
+msgstr "opsi abai spasi putih tidak dikenal '%s'"
#: apply.c:136
msgid "--reject and --3way cannot be used together."
-msgstr ""
+msgstr "--reject dan --3way tidak dapat digunakan bersamaan."
#: apply.c:139
msgid "--3way outside a repository"
-msgstr ""
+msgstr "--3way di luar repositori"
#: apply.c:150
msgid "--index outside a repository"
-msgstr ""
+msgstr "--index di luar repositori"
#: apply.c:153
msgid "--cached outside a repository"
-msgstr ""
+msgstr "--cached di luar repositori"
#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
+msgstr "Tidak dapat menyiapkan ekspresi reguler stempel waktu %s"
#: apply.c:809
#, c-format
msgid "regexec returned %d for input: %s"
-msgstr ""
+msgstr "regexec kembalikan %d untuk input: %s"
#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr ""
+msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d"
#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
+msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d"
#: apply.c:927
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
+"git apply: git-diff jelek - nama berkas baru tidak konsisten pada baris %d"
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
+"git apply: git-diff jelek - nama berkas lama tidak konsisten pada baris %d"
#: apply.c:933
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
+msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d"
#: apply.c:962
#, c-format
msgid "invalid mode on line %d: %s"
-msgstr ""
+msgstr "mode tidak valid pada baris %d: %s"
#: apply.c:1281
#, c-format
msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "kepala baris %d dan %d tidak konsisten"
#: apply.c:1371
#, c-format
@@ -919,534 +927,548 @@
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
msgstr[1] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
#: apply.c:1384
#, c-format
msgid "git diff header lacks filename information (line %d)"
-msgstr ""
+msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)"
#: apply.c:1480
#, c-format
msgid "recount: unexpected line: %.*s"
-msgstr ""
+msgstr "recount: baris tidak diharapkan: %.*s"
#: apply.c:1549
#, c-format
msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
+msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s"
#: apply.c:1752
msgid "new file depends on old contents"
-msgstr ""
+msgstr "berkas baru bergantung pada konten yang lama"
#: apply.c:1754
msgid "deleted file still has contents"
-msgstr ""
+msgstr "berkas terhapus masih ada konten"
#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
-msgstr ""
+msgstr "tambalan rusak pada baris %d"
#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
-msgstr ""
+msgstr "berkas baru %s bergantung pada konten yang lama"
#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
-msgstr ""
+msgstr "berkas yang dihapus %s masih ada konten"
#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
+msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
+msgstr "tambalan biner rusak pada baris %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
-msgstr ""
+msgstr "tambalan biner tidak dikenal pada baris %d"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
-msgstr ""
+msgstr "tambal dengan hanya sampah pada baris %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca tautan simbolik %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
-msgstr ""
+msgstr "tidak dapat membuka atau membaca %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
-msgstr ""
+msgstr "awal baris tidak valid: '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, 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] ""
+msgstr[0] "Bingkah #%d berhasil pada %d (ganti %d baris)."
+msgstr[1] "Bingkah #%d berhasil pada %d (ganti %d baris)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
+msgstr "Konteks dikurangi menjadi (%ld/%ld) untuk terapkan pecahan pada %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
+"ketika mencari:\n"
+"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
-msgstr ""
+msgstr "data tambalan biner hilang untuk '%s'"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
+"tidak dapat menerapkan balik tambalan biner tanpa membalikkan bingkah ke '%s'"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
+msgstr "tidak dapat menerapkan tambalan biner ke '%s' tanpa baris indeks penuh"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
+"tambalan diterapkan ke '%s' (%s), yang tidak cocok dengan konten saat ini."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr ""
+msgstr "tambalan diterapkan ke '%s' kosong tapi tidak kosong"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr ""
+msgstr "pascacitra %s yang diperlukan untuk '%s' tidak dapat dibaca"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
-msgstr ""
+msgstr "tambalan biner tidak dapat diterapkan ke '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
+"tambalan biner ke '%s' membuat hasil yang salah (diharapkan %s, dapat %s)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
-msgstr ""
+msgstr "tambalan gagal: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
-msgstr ""
+msgstr "tidak dapat men-checkout %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
-msgstr ""
+msgstr "gagal membaca %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
+msgstr "membaca dari '%s' diluar tautan simbolik"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
-msgstr ""
+msgstr "jalus %s sudah dinamai ulang/dihapus"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
-msgstr ""
+msgstr "%s: tidak ada di indeks"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
-msgstr ""
+msgstr "%s: tidak cocok dengan indeks"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr ""
+"repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "
+"arah."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
-msgstr ""
+msgstr "Melakukan penggabungan 3 arah...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
-msgstr ""
+msgstr "tidak dapat membaca konten saat ini dari '%s'"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
-msgstr ""
-
-#: apply.c:3620
-#, c-format
-msgid "Applied patch to '%s' with conflicts.\n"
-msgstr ""
-
-#: apply.c:3625
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr ""
+msgstr "Gagal melakukan penggabungan 3 arah...\n"
#: apply.c:3642
#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
+
+#: apply.c:3647
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
+
+#: apply.c:3664
+#, c-format
msgid "Falling back to direct application...\n"
-msgstr ""
+msgstr "Mundur ke penerapan langsung...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
-msgstr ""
+msgstr "tambalan penghapusan meninggalkan isi berkas"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
-msgstr ""
+msgstr "%s: salah tipe"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
-msgstr ""
+msgstr "%s bertipe %o, diharapkan %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
-msgstr ""
+msgstr "jalur tidak valid '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
-msgstr ""
+msgstr "%s: sudah ada di indeks"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
-msgstr ""
+msgstr "%s: sudah ada di direktori kerja"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
+msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
-msgstr ""
+msgstr "%s: tambalan tak diterapkan"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
-msgstr ""
+msgstr "Memeriksa tambalan %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
-msgstr ""
-
-#: apply.c:4119
-#, c-format
-msgid "mode change for %s, which is not in current HEAD"
-msgstr ""
-
-#: apply.c:4122
-#, c-format
-msgid "sha1 information is lacking or useless (%s)."
-msgstr ""
-
-#: apply.c:4131
-#, c-format
-msgid "could not add %s to temporary index"
-msgstr ""
+msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
#: apply.c:4141
#, c-format
-msgid "could not write temporary index to %s"
-msgstr ""
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
-#: apply.c:4279
+#: apply.c:4144
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "informasi sha1 kurang atau tidak berguna (%s)"
+
+#: apply.c:4153
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "tidak dapat menambahkan %s ke indeks sementara"
+
+#: apply.c:4163
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "tidak dapat menulis indeks sementara ke %s"
+
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
-msgstr ""
+msgstr "tidak dapat menghapus %s dari indeks"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
-msgstr ""
+msgstr "tambalan rusak untuk submodul %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr ""
+msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
+"tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
-msgstr ""
+msgstr "tidak dapat menambahkan entri tembolok untuk %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
-msgstr ""
+msgstr "gagal menulis ke '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
-msgstr ""
+msgstr "menutup berkas '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr ""
-
-#: apply.c:4548
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr ""
-
-#: apply.c:4556
-msgid "internal error"
-msgstr ""
-
-#: apply.c:4559
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr "tidak dapat menulis berkas '%s' mode %o"
#: apply.c:4570
#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
+msgid "Applied patch %s cleanly."
+msgstr "Tambalan %s diterapkan dengan rapi."
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4578
+msgid "internal error"
+msgstr "kesalahan internal"
+
+#: apply.c:4581
#, c-format
-msgid "cannot open %s"
-msgstr ""
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."
+msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."
#: apply.c:4592
#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr ""
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "memotong nama berkas .rej ke %.*s.rej"
-#: apply.c:4596
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#, c-format
+msgid "cannot open %s"
+msgstr "tidak dapat membuka %s"
+
+#: apply.c:4614
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Bingkah #%d diterapkan dengan rapi."
+
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
-msgstr ""
+msgstr "Bingkah #%d ditolak."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
-msgstr ""
+msgstr "Tambalan '%s' dilewatkan."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
-msgstr ""
+msgstr "masukan tidak dikenal"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
-msgstr ""
+msgstr "tidak dapa membaca berkas indeks"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
-msgstr ""
+msgstr "tidak dapat membuka tambalan '%s': %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kesalahan spasi putih dipadamkan"
+msgstr[1] "%d kesalahan spasi putih dipadamkan"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d baris menambahkan kesalahan spasi putih."
+msgstr[1] "%d baris menambahkan kesalahan spasi putih."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
+msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
-msgstr ""
+msgstr "Tidak dapat menulis berkas indeks baru"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
-msgstr ""
-
-#: apply.c:4998
-msgid "apply changes matching the given path"
-msgstr ""
-
-#: apply.c:5000 builtin/am.c:2318
-msgid "num"
-msgstr ""
-
-#: apply.c:5001
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: apply.c:5004
-msgid "ignore additions made by the patch"
-msgstr ""
-
-#: apply.c:5006
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
-
-#: apply.c:5010
-msgid "show number of added and deleted lines in decimal notation"
-msgstr ""
-
-#: apply.c:5012
-msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
-
-#: apply.c:5014
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
-
-#: apply.c:5016
-msgid "make sure the patch is applicable to the current index"
-msgstr ""
-
-#: apply.c:5018
-msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
#: apply.c:5020
-msgid "apply a patch without touching the working tree"
-msgstr ""
+msgid "apply changes matching the given path"
+msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
-#: apply.c:5022
-msgid "accept a patch that touches outside the working area"
-msgstr ""
+#: apply.c:5022 builtin/am.c:2320
+msgid "num"
+msgstr "jumlah"
-#: apply.c:5025
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
+#: apply.c:5023
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
-#: apply.c:5027
-msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr ""
+#: apply.c:5026
+msgid "ignore additions made by the patch"
+msgstr "abaikan penambahan yang dibuat oleh tambalan"
-#: apply.c:5029
-msgid "build a temporary index based on embedded index information"
-msgstr ""
+#: apply.c:5028
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
-msgid "paths are separated with NUL character"
+#: apply.c:5032
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
+"perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"
#: apply.c:5034
-msgid "ensure at least <n> lines of context match"
-msgstr ""
-
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
-#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
-msgid "action"
-msgstr ""
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
#: apply.c:5036
-msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
-#: apply.c:5039 apply.c:5042
-msgid "ignore changes in whitespace when finding context"
-msgstr ""
+#: apply.c:5038
+msgid "make sure the patch is applicable to the current index"
+msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
-#: apply.c:5045
-msgid "apply the patch in reverse"
-msgstr ""
+#: apply.c:5040
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "tandai berkas baru dengan `git add --intent-to-add`"
+
+#: apply.c:5042
+msgid "apply a patch without touching the working tree"
+msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
+
+#: apply.c:5044
+msgid "accept a patch that touches outside the working area"
+msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
#: apply.c:5047
-msgid "don't expect at least one line of context"
-msgstr ""
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
#: apply.c:5049
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"
#: apply.c:5051
+msgid "build a temporary index based on embedded index information"
+msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
+
+#: apply.c:5054 builtin/checkout-index.c:196
+msgid "paths are separated with NUL character"
+msgstr "jalur dipisahkan dengan karakter NUL"
+
+#: apply.c:5056
+msgid "ensure at least <n> lines of context match"
+msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
+
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
+msgid "action"
+msgstr "aksi"
+
+#: apply.c:5058
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
+
+#: apply.c:5061 apply.c:5064
+msgid "ignore changes in whitespace when finding context"
+msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
+
+#: apply.c:5067
+msgid "apply the patch in reverse"
+msgstr "terapkan tambalan terbalik"
+
+#: apply.c:5069
+msgid "don't expect at least one line of context"
+msgstr "jangan harap setidaknya satu baris konteks"
+
+#: apply.c:5071
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
+
+#: apply.c:5073
msgid "allow overlapping hunks"
-msgstr ""
+msgstr "perbolehkan bingkah yang tumpang tindih"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
-msgstr ""
+msgstr "jadi berkata-kata"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
+msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
-msgstr ""
+msgstr "jangan percaya hitungan baris pada kepala bingkah"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
-msgstr ""
+msgstr "akar"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
-msgstr ""
+msgstr "tambahkan <akar> di depan semua nama berkas"
#: archive-tar.c:125 archive-zip.c:345
#, c-format
@@ -1516,173 +1538,172 @@
msgid "cannot read %s"
msgstr "Tidak dapat membaca %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "tidak dapat membaca '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "tidak ada referensi seperti: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "bukan nama objek valid: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "bukan objek pohon: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "direktori kerja saat ini tak terlacak"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Berkas tidak ditemukan: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Bukan berkas reguler: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "format arsip"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefiks"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "berkas"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "tambahkan berkas tak terlacak ke arsip"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "tulis arsip ke berkas ini"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "baca .gitattributes dalam direktori kerja"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "laporkan berkas terarsip ke error standar"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "setel level kompresi"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "daftar format arsip yang didukung"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repositori"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "ambil arsip dari repositori remote <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "perintah"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "jalur ke perintah git-upload-archive remote"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Opsi --remote tak diharapkan"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Opsi --output tak diharapkan"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format arsip tidak dikenal '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumen tidak didukung untuk format '%s': -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Kontent terkutip jelek dalam berkas '%s': %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Kami tidak dapat membagi dua lagi!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Bukan sebuah nama komit yang valid %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1691,7 +1712,7 @@
"Dasar penggabungan %s jelek.\n"
"Ini berarti bug telah diperbaiki antara %s dan [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1700,7 +1721,7 @@
"Dasar penggabungan %s baru.\n"
"Properti telah berubah antara %s dan [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1709,7 +1730,7 @@
"Dasar penggabungan %s adalah %s.\n"
"Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1720,7 +1741,7 @@
"git bisect tidak dapat bekerja dengan benar pada kasus ini.\n"
"Mungkin Anda salah mengira revisi %s dan %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1731,36 +1752,36 @@
"Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n"
"Kami tetap lanjutkan."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Membagi dua: dasar penggabungan harus diuji\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "sebuah revisi %s diperlukan"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "tidak dapat membuat berkas '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "tidak dapat membaca berkas '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "gagal membaca berkas referensi bagi dua"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s sama-sama %s dan %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1769,7 +1790,7 @@
"Tidak ada komit yang bisa diuji ditemukan.\n"
"Mungkin Anda mulai dengan argumen jalur jelek?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1779,7 +1800,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1799,11 +1820,12 @@
msgstr ""
"--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "persiapan jalan revisi gagal"
@@ -1951,99 +1973,99 @@
#: bundle.c:44
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
+msgstr "algoritma hash bundel tidak dikenal: %s"
#: bundle.c:48
#, c-format
msgid "unknown capability '%s'"
-msgstr ""
+msgstr "kapabilitas '%s' tidak dikenal"
#: bundle.c:74
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
+msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
-msgstr ""
+msgstr "kepala tidak dikenal: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
-msgstr ""
+msgstr "tidak dapat membuka '%s'"
#: bundle.c:198
msgid "Repository lacks these prerequisite commits:"
-msgstr ""
+msgstr "Repositori kekurangan komit prasyarat berikut:"
#: bundle.c:201
msgid "need a repository to verify a bundle"
-msgstr ""
+msgstr "perlu sebuah repositori untuk verifikasi bundel"
#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bundel berisi referensi ini:"
+msgstr[1] "Bundel berisi %d referensi berikut:"
#: bundle.c:264
msgid "The bundle records a complete history."
-msgstr ""
+msgstr "Bundel merekam riwayat penuh."
#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bundel membutuhkan referensi ini:"
+msgstr[1] "Bundel membutuhkan %d referensi berikut:"
#: bundle.c:333
msgid "unable to dup bundle descriptor"
-msgstr ""
+msgstr "tidak dapat men-dup pendeskripsi bundel"
#: bundle.c:340
msgid "Could not spawn pack-objects"
-msgstr ""
+msgstr "Tidak dapat menghidupkan pack-objects"
#: bundle.c:351
msgid "pack-objects died"
-msgstr ""
+msgstr "pack-objects mati"
#: bundle.c:400
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
+msgstr "referensi '%s' dikecualikan oleh opsi rev-list"
#: bundle.c:504
#, c-format
msgid "unsupported bundle version %d"
-msgstr ""
+msgstr "versi bundle %d tidak didukung"
#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
+msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
-msgstr ""
+msgstr "argumen tidak dikenal: %s"
#: bundle.c:553
msgid "Refusing to create empty bundle."
-msgstr ""
+msgstr "Menolak memuat bundel kosong."
#: bundle.c:563
#, c-format
msgid "cannot create '%s'"
-msgstr ""
+msgstr "tidak dapat membuat '%s'"
#: bundle.c:588
msgid "index-pack died"
-msgstr ""
+msgstr "index-pack mati"
#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
@@ -2069,7 +2091,7 @@
msgid "invalid color value: %.*s"
msgstr ""
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr ""
@@ -2114,217 +2136,217 @@
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr ""
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr ""
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2336,27 +2358,27 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2367,7 +2389,7 @@
msgid "memory exhausted"
msgstr ""
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2382,35 +2404,35 @@
"\t%s\n"
"Ini mungkin disebabkan oleh include sirkular."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "tidak dapat menjabarkan jalur include '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "include konfigurasi relatif harus dari berkas"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "kondisional include konfigurasi relative harus dari berkas"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "format konfigurasi tidak valid: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "kunci tidak berisi bagian: %s"
@@ -2420,298 +2442,298 @@
msgid "key does not contain variable name: %s"
msgstr "kunci tidak berisi nama variabel: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "kunci tidak valid: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "kunci tidak valid (barisbaru): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "kunci konfigurasi kosong"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "parameter konfigurasi gadungan: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "format gadungan dalam %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "hitungan gadungan dalam %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "terlalu banyak entri di %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "kunci konfigurasi %s hilang"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "nilai konfigurasi %s hilang"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "baris konfigurasi %d jelek dalam blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "baris konfigurasi %d jelek dalam berkas %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "baris konfigurasi %d jelek pada masukan standar"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "baris konfigurasi %d jelek pada baris perintah %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "baris konfigurasi %d jelek dalam %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "di luar rentang"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "satuan tidak valid"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gagal menjabarkan direktori pengguna di: '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' untuk '%s' bukan stempel waktu valid"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "panjang singkatan di luar rentang: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "level kompresi zlib jelek %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar harusnya hanya satu karakter"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode tidak valid untuk pembuatan objek: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "nilai rusak untuk %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "nilai rusak untuk %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "level kompresi pak jelek %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "gagal menguraikan %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "gagal menguraikan konfigurasi baris perintah"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s tidak valid: '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nama bagian '%s' tidak valid"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s punya banyak nilai"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gagal menulis berkas konfigurasi baru %s"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "tidak dapat mengunci berkas konfigurasi %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "membuka %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "pola tidak valid: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "berkas konfigurasi %s tidak valid"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat pada %s gagal"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "tidak dapat me-mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod pada %s gagal"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "tidak dapat menulis berkas konfigurasi %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "tidak dapat menyetel '%s' ke '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "tidak dapat mem-batal setel '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nama bagian tidak valid: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "nilai hilang untuk '%s'"
@@ -2742,79 +2764,79 @@
msgid "expected flush after capabilities"
msgstr ""
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr ""
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr ""
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr ""
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2822,77 +2844,77 @@
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr ""
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr ""
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr ""
@@ -3026,17 +3048,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr ""
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr ""
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr ""
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr ""
@@ -3138,23 +3160,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr ""
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr ""
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr ""
@@ -3168,17 +3190,17 @@
"tree"
msgstr ""
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gagal mengurai persentase potongan dirstat '%s'\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parameter dirstat tidak ditketahui '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3186,7 +3208,7 @@
"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
"'dimmed-zebra', 'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3196,7 +3218,7 @@
"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3204,12 +3226,12 @@
"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
"spasi yang lainnya"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3218,26 +3240,26 @@
"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff eksternal mati, berhenti pada %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S dan --find-object saling eksklusif"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3245,22 +3267,22 @@
"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
"dengan -G dan -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow butuh tepatnya satu spek jalur"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "nilai --stat tidak valid: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s harap nilai numerik"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3269,42 +3291,42 @@
"Gagal menguraikan parameter opsi --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "tidak dapat menguraikan '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s butuh bentuk <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s butuh sebuah karakter, dapat '%s'"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumen --color-moved jelek: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode tidak valid '%s' dalam --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3312,162 +3334,162 @@
"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "argumen tidak valid ke %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "regex tidak valid diberikan ke -I: '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argumen --word-diff jelek: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opsi format keluaran diff"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "buat tambalan"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "sembunyikan keluaran diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "buat diff dengan <n> baris konteks"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "buat diff dalam format mentah"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "sinonim untuk '-p --raw'"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "sinonim untuk '-p --stat'"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat yang ramah mesin"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "keluarkan hanya baris terakhir --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<parameter 1,parameter 2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "sinonim untuk --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonim untuk --dirstat=files,param1,param2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "perlihatkan hanya nama berkas yang berubah"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "perlihatkan hanya nama dan status berkas yang berubah"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "buat diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<lebar>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "buat diffstat dengan lebar yang diberikan"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "buat diffstat dengan nama lebar yang diberikan"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "buat diffstat dengan lebar grafik yang diberikan"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<hitungan>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "buat diffstat dengan baris yang terbatas"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "buat ringkasan singkat dalam diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "keluarkan diff biner yang dapat diterapkan"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "perlihatkan diff berwarna"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<tipe>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3475,91 +3497,91 @@
"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
"pada --raw atau --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefiks>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "perlihatkan prefiks tujuan daripada \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"
+"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "sebutkan karakter yang menandai konteks daripada ' '"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opsi penamaan ulang diff"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
"pembuatan"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "deteksi penamaan ulang"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "lewati pracitra untuk penghapusan"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "deteksi penyalinan"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr ""
"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "nonaktifkan deteksi penamaan ulang"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3567,231 +3589,232 @@
"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
"ulang/penyalinan melebihi batas yang diberikan"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opsi algoritma diff"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "abaikan spasi saat membandingkan baris"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "abaikan perubahan dalam jumlah spasi"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "abaikan perubahan spasi pada EOL"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "abaikan kembalian-kurir pada akhir baris"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "abaikan perubahan yang semua baris kosong"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"
+msgstr ""
+"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff sabar\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff histogram\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "pilih algoritma diff"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<teks>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "gunakan <regex> untuk menentukan apa itu kata"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "baris kode yang berpindah diwarnai berbeda"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "bagaimana spasi diabaikan di --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Opsi diff yang lainnya"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "
"perlihatkan jalur relatif"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "perlakukan semua berkas sebagai teks"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "tukar dua masukkan, balikkan diff"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "nonaktifkan semua keluaran program"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<kapan>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "abaikan perubahan submodul dalam pembuatan diff"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "sembunyikan entri 'git add -N' dari indeks"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<untai>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "kontrol urutan berkas yang muncul dalam keluaran"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<jalur>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "lewati keluaran ke jalur yang disebutkan"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id objek>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "pilih berkas oleh tipe diff"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<berkas>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Keluarkan ke berkas yang disebutkan"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3804,7 +3827,7 @@
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr ""
@@ -3842,337 +3865,417 @@
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nama direktori tidak dapat ditebak.\n"
+"Mohon sebutkan direktori pada baris perintah"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr ""
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
-msgstr ""
-
-#: fetch-pack.c:185
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
+msgstr "git fetch-pack: daftar dangkal diharapkan"
#: fetch-pack.c:196
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal"
-#: fetch-pack.c:216
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
+#: fetch-pack.c:207
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
#: fetch-pack.c:227
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
+
+#: fetch-pack.c:238
msgid "unable to write to remote"
-msgstr ""
+msgstr "tidak dapat menulis ke remote"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:389 fetch-pack.c:1429
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr ""
-
-#: fetch-pack.c:391 fetch-pack.c:1431
-#, c-format
-msgid "object not found: %s"
-msgstr ""
+msgstr "--stateless-rpc memerlukan multi_ack_detailed"
#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
-msgid "error in object: %s"
-msgstr ""
+msgid "invalid shallow line: %s"
+msgstr "baris dangkal tidak valid: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:400 fetch-pack.c:1440
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "baris dangkal-balik tidak valid: %s"
+
+#: fetch-pack.c:402 fetch-pack.c:1442
+#, c-format
+msgid "object not found: %s"
+msgstr "object tidak ditemukan: %s"
+
+#: fetch-pack.c:405 fetch-pack.c:1445
+#, c-format
+msgid "error in object: %s"
+msgstr "kesalahan dalam objek: %s"
+
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
-msgstr ""
+msgstr "tidak ada dangkal yang ditemukan: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
-msgstr ""
+msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
-msgstr ""
+msgstr "dapat %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
-msgstr ""
+msgstr "komit tidak valid %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
-msgstr ""
+msgstr "menyerah"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
-msgstr ""
+msgstr "selesai"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
-msgstr ""
+msgstr "dapat %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
-msgstr ""
+msgstr "Menandai %s sebagai lengkap"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
-msgstr ""
+msgstr "sudah punya %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
+msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
-msgstr ""
+msgstr "kesalahan protokol: kepala pak jelek"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
-msgstr ""
+msgstr "fetch-pack: tidak dapat menggarpu %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "fetch-pack: keluaran index-pack tidak valid"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
-msgstr ""
+msgstr "%s gagal"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
-msgstr ""
+msgstr "kesalahan dalam pemultipleks-balik pita samping"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
-msgstr ""
+msgstr "Versi peladen %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
-msgstr ""
+msgstr "Peladen mendukung %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:1089
-msgid "Server does not support --shallow-since"
-msgstr ""
-
-#: fetch-pack.c:1094
-msgid "Server does not support --shallow-exclude"
-msgstr ""
-
-#: fetch-pack.c:1098
-msgid "Server does not support --deepen"
-msgstr ""
+msgstr "Peladen tidak mendukung klien dangkal"
#: fetch-pack.c:1100
+msgid "Server does not support --shallow-since"
+msgstr "Peladen tidak mendukung --shallow-since"
+
+#: fetch-pack.c:1105
+msgid "Server does not support --shallow-exclude"
+msgstr "Peladen tidak mendukung --shallow-exclude"
+
+#: fetch-pack.c:1109
+msgid "Server does not support --deepen"
+msgstr "Peladen tidak mendukung --deepen"
+
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
-msgstr ""
+msgstr "Peladen tidak mendukung objek format repositori ini"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
-msgstr ""
+msgstr "tidak ada komit umum"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
-msgstr ""
+msgstr "repositori sumber dangkal, menolak mengkloning."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
-msgstr ""
+msgstr "git fetch-pack: pengambilan gagal."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
+msgstr "algoritma tidak cocok: klien %s; peladen %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
-msgstr ""
+msgstr "peladen tidak mendukung algoritma '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
-msgstr ""
+msgstr "Peladen tidak mendukung permintaan dangkal"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
-msgstr ""
+msgstr "Peladen mendukung saringan"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
-msgstr ""
+msgstr "tidak dapat menulis permintaan kepada remote"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
-msgstr ""
+msgstr "kesalahan membaca kepala seksi '%s'"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
-msgstr ""
+msgstr "diharapkan '%s', diterima '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "baris pengakuan tidak diharapkan: %s"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
-msgstr ""
+msgstr "kesalahan memproses ack: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+msgstr "berkas pak diharapkan dikirim setelah 'ready'"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
+"tidak ada seksi lainnya yang diharapkan dikirim setelah tidak ada 'ready'"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
-msgstr ""
+msgstr "gagal memproses info dangkal: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
-msgstr ""
+msgstr "wanted-ref diharapkan, dapat '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr ""
+msgstr "wanted-ref tidak diharapkan: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "kesalahan memproses referensi yang diminta: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
-msgstr ""
+msgstr "git fetch-pack: paket jawaban akhir diharapkan"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
-msgstr ""
+msgstr "tidak ada kepala remote yang cocok"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
-msgstr ""
+msgstr "remote tidak mengirim semua objek yang dibutuhkan"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
-msgstr ""
+msgstr "'ready' tidak diharapkan dari remote"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
-msgstr ""
+msgstr "tidak ada referensi remote seperti %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
-msgstr ""
+msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
-msgstr ""
+msgstr "tidak dapat membuat berkas sementara"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
-msgstr ""
+msgstr "gagal menulis tandatangan terlepas ke '%s'"
-#: gpg-interface.c:470
-msgid "gpg failed to sign the data"
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
msgstr ""
+"gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi "
+"tandatangan ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan "
+"ssh (tersedia di openssh versi 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "tanda tangan '%s' jelek/tidak kompatibel"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
+
+#: gpg-interface.c:874
+msgid "gpg failed to sign the data"
+msgstr "gpg gagal menandatangani data"
+
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey perlu disetel untuk penandatanganan ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di "
+"openssh versi 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
-msgstr ""
+msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4180,109 +4283,109 @@
"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
"didukung dengan -P di bawah PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': tidak dapat membaca %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "gagal men-stat '%s'"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s': baca pendek"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "mulai area kerja (lihat pula: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "kolaborasi (lihat pula: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Perintah Porselen Utama"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Perintah Tambahan / Peubah"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Perintah Tambahan / Pemeriksa"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Berinteraksi dengan yang Lain"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Perintah Tingkat Rendah / Peubah"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Perintah Tingkat Rendah / Pemeriksa"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Perintah Tingak Rendah / Pembantu Internal"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "perintah git yang tersedia di '%s'"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipe daftar perintah '%s' tidak didukung"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Panduan konsep Git adalah:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Perintah eksternal"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Alias perintah"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4291,31 +4394,36 @@
"'%s' sepertinya perintah git, tetapi kami tidak dapat\n"
"menjalankannya. Mungkin git-%s rusak?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr ""
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4329,16 +4437,16 @@
"\n"
"Perintah paling mirip adalah"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opsi>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4352,6 +4460,13 @@
"\n"
"Mungkin maksud Anda salah satu dari yang ini?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr ""
@@ -4403,7 +4518,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr ""
@@ -4490,7 +4605,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr ""
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr ""
@@ -4498,44 +4618,44 @@
msgid "quoted CRLF detected"
msgstr ""
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr ""
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr ""
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr ""
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4546,42 +4666,42 @@
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4589,47 +4709,47 @@
"majority of the files."
msgstr ""
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4637,67 +4757,67 @@
"markers."
msgstr ""
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr ""
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr ""
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr ""
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4707,192 +4827,192 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Sudah terbaru."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, 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:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, 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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4900,278 +5020,311 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr ""
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr ""
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr ""
#: merge.c:41
msgid "failed to read the cache"
-msgstr ""
+msgstr "gagal membaca tembolok"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
-msgstr ""
+msgstr "gagal menulis berkas indeks baru"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr ""
+msgstr "OID kipas-keluar indeks multipak salah ukuran"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
-msgstr ""
+msgstr "berkas indeks multipak %s terlalu kecil"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr ""
+msgstr "tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr ""
+msgstr "versi indeks multipak %d tidak dikenal"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
-
-#: midx.c:148
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
-
-#: midx.c:150
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
#: midx.c:152
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
#: midx.c:154
-msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
-#: midx.c:170
+#: midx.c:156
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
+
+#: midx.c:158
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
+
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
+msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
+msgstr "pack-int-id jelek: %u (total pak %u)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
+msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
-msgstr ""
+msgstr "gagal menambah berkas pak '%s'"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
-msgstr ""
+msgstr "gagal membuka indeks pak '%s'"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
-msgstr ""
+msgstr "gagal melokasi objek %d di dalam berkas pak"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "tidak dapat menyimpan berkas indeks balik"
-#: midx.c:920
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr ""
-
-#: midx.c:943
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
-
-#: midx.c:989
+#: midx.c:990
#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
+msgid "could not parse line: %s"
+msgstr "tidak dapat menguraikan baris: %s"
-#: midx.c:1034
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "baris jelek '%s'."
+
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
+
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "tidak dapat memuat pak"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "tidak dapat membuka indeks untuk %s"
+
+#: midx.c:1201
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Menambahkan berkas pak ke indeks multipak"
+
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
-msgstr ""
+msgstr "pak yang disukai tidak dikenal: '%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
-msgstr ""
+msgstr "pak yang disukai '%s' kadaluarsa"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
-msgstr ""
+msgstr "tidak ada berkas pak untuk diindeks."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "tidak dapat menulis bitmap multipak"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "gagal menulis indeks multipak"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "gagal menghapus %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
-msgstr ""
+msgstr "gagal membersihkan indeks multipak pada %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
+msgstr "berkas indeks multipak ada, tetapi gagal diurai"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
-msgstr ""
+msgstr "checksum salah"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
-msgstr ""
+msgstr "Mencari berkas pak yang direferensikan"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
+"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
-msgstr ""
+msgstr "midx tidak berisi oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
-msgstr ""
+msgstr "Memverifikasi urutan OID di dalam indeks multipak"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
+msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
-msgstr ""
+msgstr "Mengurutkan objek oleh berkas pak"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
-msgstr ""
+msgstr "Memverifikasi offset objek"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
+msgstr "gagal memuat entri pak untuk oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
-msgstr ""
+msgstr "gagal memuat indeks pak untuk berkas pak %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
+msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
-msgstr ""
+msgstr "Menghitung objek tereferensi"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
+msgstr "Mencari dan menghapus berkas pak tak tereferensi"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
-msgstr ""
+msgstr "tidak dapat menyelesaikan pack-objects"
#: name-hash.c:542
#, c-format
@@ -5224,257 +5377,257 @@
msgid "Bad %s value: '%s'"
msgstr ""
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr ""
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr ""
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr ""
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr ""
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr ""
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr ""
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr ""
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr ""
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr ""
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr ""
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr ""
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "tidak dapat membuka %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
@@ -5586,12 +5739,25 @@
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr ""
@@ -5621,45 +5787,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr ""
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr ""
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr ""
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr ""
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr ""
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
@@ -5679,71 +5845,71 @@
msgid "malformed object name '%s'"
msgstr ""
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr ""
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr ""
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr ""
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr ""
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr ""
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr ""
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr ""
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr ""
@@ -5751,97 +5917,121 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr ""
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr ""
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr ""
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
@@ -5862,7 +6052,7 @@
msgid "flush packet write failed"
msgstr ""
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr ""
@@ -5870,7 +6060,7 @@
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
@@ -5879,25 +6069,25 @@
msgid "packet write failed: %s"
msgstr ""
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr ""
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr ""
@@ -5911,7 +6101,7 @@
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr ""
@@ -5940,32 +6130,32 @@
msgid "Removing duplicate objects"
msgstr ""
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr ""
@@ -5992,7 +6182,7 @@
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
@@ -6012,166 +6202,166 @@
msgid "unable to stat '%s'"
msgstr ""
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr ""
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
@@ -6182,12 +6372,16 @@
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
+"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan 'git "
+"rebase --continue'.\n"
+"Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n"
#: rebase-interactive.c:33
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
+"setelan %s tidak dikenal untuk opsi rebase.missingCommitsCheck. Abaikan."
#: rebase-interactive.c:42
msgid ""
@@ -6213,27 +6407,52 @@
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
+"\n"
+"Perintah:\n"
+"p, pick <komit> = gunakan komit\n"
+"r, reword <komit> = gunakan komit, tapi sunting pesan komit\n"
+"e, edit <komit> = gunakan komit, tapi berhenti untuk amandemen\n"
+"s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n"
+"f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n"
+" pesan komit sebelumnya, kecuali -C digunakan, dimana\n"
+" hanya pertahankan pesan komit ini; -c sama dengan -C tapi\n"
+" buka penyunting"
+"x, exec <perintah> = jalankan perintah (sisa baris) menggunakan cangkang\n"
+"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git rebase --continue')\n"
+"d, drop <komit> = hapus komit\n"
+"l, label <label> = tandai HEAD saat ini dengan nama\n"
+"t, reset <label> = setel ulang HEAD ke sebuah label\n"
+"m, merge [-C <komit> | -c <komit>] <label> [# <satu baris>]\n"
+". buat komit penggabungan dengan pesan komit penggabungan asli\n"
+". (atau satu baris, jika tidak ada komit penggabungan asli yang\n"
+". disebutkan); gunakan -c <komit> untuk menulis ulang pesan komit\n"
+"\n"
+"Baris diatas dapat disusun ulang; hal itu dieksekusi dari atas ke bawah.\n"
#: rebase-interactive.c:66
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dasarkan ulang %s kepada %s (%d perintah)"
+msgstr[1] "Dasarkan ulang %s kepada %s (%d perintah)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
+"\n"
+"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus komit.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
+"\n"
+"Jika Anda menghapus sebaris disini KOMIT TERSEBUT AKAN HILANG.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6241,25 +6460,33 @@
" git rebase --continue\n"
"\n"
msgstr ""
+"\n"
+"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang sedang berjalan.\n"
+"Untuk melanjutkan pendasaran ulang setelah menyunting, jalankan:\n"
+" git rebase --continue\n"
+"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
+"\n"
+"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan dibatalkan.\n"
+"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
-msgstr ""
+msgstr "tidak dapat menulis '%s'."
#: rebase-interactive.c:196
#, c-format
@@ -6267,6 +6494,8 @@
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
+"Peringatan: beberapa komit mungkin sudah tidak sengaja dihapus.\n"
+"Komit terhapus (terbaru ke terlama):\n"
#: rebase-interactive.c:203
#, c-format
@@ -6278,13 +6507,16 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
+"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit eksplisit.\n"
+"Gunakan 'git config rebase.missingCommitsCheck untuk' mengganti tingkat "
+"peringatan.\n"
+"Kelakuan yang mungkin adalah: ignore, warn, error.\n"
+"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr ""
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' digantikan oleh 'merges'"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6305,257 +6537,277 @@
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr ""
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr ""
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr ""
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr ""
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr ""
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6570,81 +6822,81 @@
"\tgit branch -m <name>\n"
msgstr ""
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr ""
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr ""
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr ""
@@ -6930,269 +7182,282 @@
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR rusak"
#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
-msgstr ""
+msgstr "tidak dapat menulis rekaman rerere"
#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
-msgstr ""
+msgstr "ada kesalahan saat menulis '%s' (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
-msgstr ""
+msgstr "gagal membilas '%s'"
#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai bingkah konflik di '%s'"
#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
-msgstr ""
+msgstr "utime() gagal pada '%s'"
#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
-msgstr ""
+msgstr "gagal menulis '%s'"
#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' digelarkan menggunakan resolusi sebelumnya."
#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Resolusi direkam untuk '%s'."
#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' diselesaikan menggunakan resolusi sebelumnya."
#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut simpangan '%s'"
#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
-msgstr ""
+msgstr "Pracitra direkam untuk '%s'"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori '%s'"
#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr ""
+msgstr "gagal memperbarui keadaan konflik di '%s'"
#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
-msgstr ""
+msgstr "tidak ada resolusi yang diingat untuk '%s'"
#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut '%s'"
#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
-msgstr ""
+msgstr "Pracitra diperbarui untuk '%s'"
#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
-msgstr ""
+msgstr "Resolusi dilupakan untuk '%s'\n"
#: rerere.c:1191
msgid "unable to open rr-cache directory"
-msgstr ""
+msgstr "tidak dapat membuka direktori rr-cache"
#: reset.c:42
msgid "could not determine HEAD revision"
msgstr "tidak dapat menentukan revisi HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "gagal menemukan pohon %s"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr ""
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr ""
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
+msgstr "paket bilas tidak diharapkan ketika membaca status pembongkaran remote"
#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
-msgstr ""
+msgstr "tidak dapat menguraikan status pembongkaran remote: %s"
#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
-msgstr ""
+msgstr "pembongkaran remote gagal: %s"
#: send-pack.c:378
msgid "failed to sign the push certificate"
-msgstr ""
+msgstr "gagal menandatangani sertifikat dorong"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
-msgstr ""
+msgstr "send-pack: tidak dapat menggarpu subproses pengambilan"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
+msgstr "negosiasi pendorongan gagal; langsung dilanjutkan dengan mendorong"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
-
-#: send-pack.c:535
-msgid "the receiving end does not support --signed push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung algoritma hash repositori ini"
#: send-pack.c:537
+msgid "the receiving end does not support --signed push"
+msgstr "ujung penerima tidak mendukung dorongan --signed"
+
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
+"tidak mengirim sertifikat pendorongan karena ujung penerima tidak mendukung "
+"dorongan --signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung dorongan --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
-msgstr ""
+msgstr "ujung penerima tidak mendukung opsi dorong"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr ""
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr ""
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -7200,65 +7465,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7275,11 +7540,11 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7294,7 +7559,7 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7308,359 +7573,364 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr ""
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr ""
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:3031
-#, c-format
-msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
-
-#: sequencer.c:3034
-msgid "cherry-pick is already in progress"
-msgstr ""
-
-#: sequencer.c:3036
-#, c-format
-msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
-
#: sequencer.c:3050
#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3053
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:3055
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3069
+#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7672,27 +7942,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr ""
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7702,11 +7972,11 @@
"\n"
msgstr ""
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7717,90 +7987,90 @@
"\n"
msgstr ""
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr ""
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr ""
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -7808,29 +8078,29 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7843,108 +8113,117 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr ""
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr ""
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr ""
@@ -8088,27 +8367,15 @@
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr ""
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr ""
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
@@ -8165,13 +8432,13 @@
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr ""
@@ -8195,7 +8462,7 @@
msgid "invalid value for %s"
msgstr "nilai tidak valid untuk %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Tidak dapat memperbarui entri .gitmodules %s"
@@ -8220,22 +8487,22 @@
msgid "staging updated .gitmodules failed"
msgstr "gagal menggelar .gitmodules terbarui"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dalam submodul tak terisi '%s'"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "argumen --ignore-submodules jelek: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8244,12 +8511,12 @@
"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
"bernama sama. Melewati itu."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8258,36 +8525,36 @@
"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
"dalam submodul %s"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "proses untuk submodul '%s' gagal"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gagal menguraikan HEAD sebagai referensi valid."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Mendorong submodul '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Tidak dapat mendorong submodul '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Mengambil submodul %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Tidak dapat mengakses submodul '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8296,61 +8563,61 @@
"Kesalahan saat pengambilan submodul:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' tak dikenal sebagai repositori git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Tidak dapat menjalankan 'git status --porcelain=2' dalam submodul %s"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' gagal dalam submodul %s"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Tidak dapat batal setel setelan core.worktree dalam submodul '%s'"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "tidak dapat rekursi ke dalam submodul '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "tidak dapat reset indeks submodul"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submodul '%s' punya indeks kotor"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodul '%s' tidak dapat diperbarui."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8358,17 +8625,17 @@
"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
"didukung"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "tidak dapat mencari nama untuk submodul '%s'"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8379,11 +8646,11 @@
"'%s' ke\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "tidak dapat memulai ls-files dalam .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
@@ -8405,7 +8672,7 @@
msgstr ""
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr ""
@@ -8420,11 +8687,11 @@
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr ""
@@ -8490,7 +8757,7 @@
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr ""
@@ -8508,7 +8775,7 @@
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr ""
@@ -8517,7 +8784,7 @@
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr ""
@@ -8530,111 +8797,111 @@
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr ""
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr ""
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr ""
@@ -8648,53 +8915,53 @@
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr ""
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -8710,11 +8977,11 @@
"\n"
msgstr ""
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr ""
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr ""
@@ -8927,18 +9194,18 @@
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr ""
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
-msgstr ""
+msgstr "bilasan diharapkan setelah argumen pengambilan"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
@@ -8973,7 +9240,7 @@
msgid "Fetching objects"
msgstr ""
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "gagal membaca '%s'"
@@ -9070,17 +9337,27 @@
msgid "gitdir file points to non-existent location"
msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr ""
@@ -9625,25 +9902,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -9652,131 +9929,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opsi>] [--] <pathspec>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "tidak dapat chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "status diff tak diharapkan %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "gagal memperbarui berkas"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "hapus '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Tidak dapat membaca indeks"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Tidak dapat membuka '%s' untuk ditulis."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Tidak dapat menulis tambalan"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "Gagal menyunting tambalan"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Tidak dapat men-stat '%s'"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Tambalan kosong. Dibatalkan."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Tidak dapat terapkan '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "latihan"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "pengambilan interaktif"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "pilih bingkah secara interaktif"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "sunting diff saat ini dan terapkan"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "perbolehkan tambah berkas yang diabaikan"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "perbarui berkas terlacak"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "jangan tambahkan, hanya segarkan indeks"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr ""
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "peringatkan ketika menambahkan repositori tertanam"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "tulang belakang untuk `git stash -p`"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9807,12 +10083,12 @@
"\n"
"Lihat \"git help submodule\" untuk selengkapnya."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "menambahkan repositori git tertanam: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9822,51 +10098,51 @@
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "gagal menambahkan berkas"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run tidak kompatibel dengan --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file tidak kompatibel dengan --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A dan -u saling tak kompatibel"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' harus berupa -x atau +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul butuh --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9876,166 +10152,178 @@
"Matikan pesan ini dengan menjalankan\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
-msgstr ""
+msgstr "tidak dapat mengurai skrip pengarang"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr ""
+msgstr "'%s' dihapus oleh kail applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
-msgstr ""
+msgstr "Baris masukan salah format: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
-msgstr ""
+msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
-msgstr ""
+msgstr "fseek gagal"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai tambalan '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
+msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
-msgstr ""
+msgstr "stempel waktu tidak valid"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
-msgstr ""
+msgstr "baris Date tidak valid"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
-msgstr ""
+msgstr "offset zona waktu tidak valid"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
-msgstr ""
+msgstr "Pendeteksian format tambalan gagal."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
-msgstr ""
+msgstr "gagal membuat direktori '%s'"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
-msgstr ""
-
-#: builtin/am.c:1126
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
+msgstr "Gagal memecah tambalan."
#: builtin/am.c:1127
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
#: builtin/am.c:1128
#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+"Jika Anda lebih suka melewati tambalan ini, jalankan \"%s --skip\" sebagai "
+"gantinya."
+
+#: builtin/am.c:1129
+#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
+"Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --"
+"abort\""
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
+"Tambalan dikirimkan dengan format=flowed; spasi pada akhir baris mungkin "
+"hilang."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
-msgstr ""
+msgstr "Tambalan kosong."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
-msgstr ""
+msgstr "baris pengarang hilang dalam komit %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
-msgstr ""
+msgstr "baris identitas tidak valid: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
+"Repositori kekurangan blob yang diperlukan untuk mundur ke penggabungan 3 "
+"arah."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
-msgstr ""
+msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
+"Apakah Anda menyunting tambalan Anda?\n"
+"Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
+msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
-msgstr ""
+msgstr "Gagal menggabungkan perubahan."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
-msgstr ""
+msgstr "menerapkan ke sebuah riwayat kosong"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
-msgstr ""
+msgstr "tidak dapat melanjutkan: %s tidak ada."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
-msgstr ""
+msgstr "Badan komit adalah:"
#. 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:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
+"Terapkan? [y]a/[n] tidak/[e] sunting/[v] lihat tambalan/terim[a] semua: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
-msgstr ""
+msgstr "tidak dapat menulis berkas indeks"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr ""
+msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
-msgstr ""
+msgstr "Menerapkan: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
-msgstr ""
+msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
-msgstr ""
+msgstr "Penambalan gagal pada %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
+"Gunakan 'git am --show-current-patch=diff' untuk melihat tambalan yang gagal"
#: builtin/am.c:1868
msgid ""
@@ -10043,6 +10331,9 @@
"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 ""
+"Tidak ada perubahan - apakah Anda lupa untuk menggunakan 'git add'?\n"
+"Jika tidak ada lagi yang diterapkan, sepertinya sesuatu yang lain sudah \n"
+"memasukkan perubahan yang sama; mungkin Anda ingin melewatkan tambalan ini."
#: builtin/am.c:1875
msgid ""
@@ -10051,248 +10342,250 @@
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
+"Anda masih punya jalur yang belum digabung pada indeks Anda.\n"
+"Anda harus 'git add' setiap berkas dengan konflik terselesai untuk "
+"menandainya.\n"
+"Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
+"mereka\" untuk itu."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Tidak dapat mengurai objek '%s'."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
-msgstr ""
+msgstr "gagal membersihkan indeks"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
+"Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
+"Tidak memutar ulang ke ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
-msgstr ""
+msgstr "Nilai tidak valid untuk --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
-msgstr ""
+msgstr "Nilai tidak valid untuk --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
+msgstr "--show-current-patch=%s tidak kompatibel untuk --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr ""
+msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr ""
-
-#: builtin/am.c:2269
-msgid "run interactively"
-msgstr ""
+msgstr "git am [<opsi>] (--continue | --skip | --abort)"
#: builtin/am.c:2271
-msgid "historical option -- no-op"
-msgstr ""
+msgid "run interactively"
+msgstr "jalankan secara interaktif"
#: builtin/am.c:2273
+msgid "historical option -- no-op"
+msgstr "opsi bersejarah -- no-op"
+
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
-msgstr ""
+msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
-msgstr ""
+msgstr "jadi senyap"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
-msgstr ""
-
-#: builtin/am.c:2279
-msgid "recode into utf8 (default)"
-msgstr ""
+msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
#: builtin/am.c:2281
-msgid "pass -k flag to git-mailinfo"
-msgstr ""
+msgid "recode into utf8 (default)"
+msgstr "koding ulang ke dalam utf8 (asali)"
#: builtin/am.c:2283
-msgid "pass -b flag to git-mailinfo"
-msgstr ""
+msgid "pass -k flag to git-mailinfo"
+msgstr "lewatkan opsi -k ke git-mailinfo"
#: builtin/am.c:2285
-msgid "pass -m flag to git-mailinfo"
-msgstr ""
+msgid "pass -b flag to git-mailinfo"
+msgstr "lewatkan opsi -b ke git-mailinfo"
#: builtin/am.c:2287
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
+msgid "pass -m flag to git-mailinfo"
+msgstr "lewatkan opsi -m ke git-mailinfo"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
+
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-
-#: builtin/am.c:2293
-msgid "strip everything before a scissors line"
-msgstr ""
+"jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
#: builtin/am.c:2295
+msgid "strip everything before a scissors line"
+msgstr "copot semuanya sebelum garis gunting"
+
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
-msgstr ""
+msgstr "lewatkannya melalui git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
-msgstr ""
+msgstr "lewatkannya melalui git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
-msgstr ""
+msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
-msgstr ""
+msgstr "format"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
-msgstr ""
-
-#: builtin/am.c:2328
-msgid "override error message when patch failure occurs"
-msgstr ""
+msgstr "format tambalan yang ada di"
#: builtin/am.c:2330
+msgid "override error message when patch failure occurs"
+msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
+
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
-msgstr ""
+msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
-msgstr ""
+msgstr "sinonim untuk --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
-msgstr ""
+msgstr "lewati tambalan saat ini"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
-msgstr ""
+msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
-msgstr ""
+msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
-msgstr ""
-
-#: builtin/am.c:2351
-msgid "lie about committer date"
-msgstr ""
+msgstr "perlihatkan tambalan yang diterapkan"
#: builtin/am.c:2353
+msgid "lie about committer date"
+msgstr "berbohong soal tanggal pengkomit"
+
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
-msgstr ""
+msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
-msgstr ""
+msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
-msgstr ""
+msgstr "tandatangani komit dengan GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
-msgstr ""
+msgstr "(penggunaan internal untuk git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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 ""
+"Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n"
+"itu akan dihapus. Mohon jangan gunakan itu lagi."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
-msgstr ""
+msgstr "gagal membaca indeks"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
+"direktori pendasaran ulang sebelumnya %s masih ada tapi mbox diberikan."
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
+"Direktori menyimpang %s ditemukan.\n"
+"Gunakan \"git am --abort\" untuk menghapusnya."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
+msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
-msgstr ""
+msgstr "mode interaktif butuh tambalan pada baris perintah"
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr ""
+msgstr "git apply [<opsi>] [<tambalan>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
-msgstr ""
+msgstr "tidak dapat mengalihkan keluaran"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
-msgstr ""
+msgstr "git archive: Remote tanpa URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgstr "git archive: ACK/NAK diharapkan, dapat paket bilasan"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
-msgstr ""
+msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
-msgstr ""
+msgstr "git archive: kesalahan protokol"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
-msgstr ""
-
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-reset [<komit>]"
+msgstr "git archive: sebuah bilasan diharapkan"
#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> "
-"[<istilah>]"
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<komit>]"
#: builtin/bisect--helper.c:25
msgid ""
@@ -10332,73 +10625,86 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <perintah>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "tidak dapat menulis ke berkas '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "tidak dapat membuka berkas '%s' untuk dibaca"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' bukan istilah yang valid"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "tidak dapat mengubah makna istilah '%s'"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "mohon gunakan dua istilah yang berbeda"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Kami tidak sedang membagi dua.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' bukan sebuah komit yang valid"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "argument bisect_write jelek: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "tidak dapat mendapatkan oid revisi '%s'"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "tidak dapat membuka berkas '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10407,7 +10713,7 @@
"Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10418,7 +10724,7 @@
"Lalu Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "membagi dua hanya dengan sebuah komit %s"
@@ -10427,15 +10733,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Anda yakin [Y/n]?"
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "tidak ada istilah yang didefinisikan"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10444,7 +10750,7 @@
"Istilah Anda saat ini adalah %s untuk keadaan lama\n"
"dan %s untuk keadaan baru.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10453,52 +10759,52 @@
"argumen %s tidak valid untuk 'git bisect terms'.\n"
"Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "setup jalan revisi gagal\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "tidak dapat membuka '%s' untuk menambahkan"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' bukan istilah yang valid"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opsi tidak dikenal: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' sepertinya bukan revisi valid"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD jelek - saya butuh HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "tidak akan membagi dua pada pohon yang di-cg-seek"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD jelek - referensi simbolik aneh"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "referensi tidak valid: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Anda perlu memulai dengan \"git bisect start\"\n"
@@ -10506,104 +10812,150 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]"
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' hanya dapat mengambil satu argumen."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Masukan revisi jelek: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Masukan revisi jelek (bukan sebuah komit): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Kami tidak sedang membagi dua."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? Anda bilang tentang apa?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect run gagal: tidak ada perintah yang diberikan"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "menjalankan %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect run gagal: kode keluar %d dari '%s' < 0 atau >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "tidak dapat membuka berkas '%s' untuk ditulis"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect run tidak dapat dilanjutkan lagi"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect run sukses"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "pembagian dua menemukan komit jelek pertama"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode "
+"keluar %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "setel ulang keadaan pembagian dua"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "periksa apakah ada istilah jelek atau bagus"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "cetak istilah pembagian dua"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "mulai sesi pembagian dua"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "temukan komit pembagian dua berikutnya"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "tandai keadaan referensi"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "daftar langkah pembagian dua sejauh ini"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "lewati beberapa komit untuk checkout"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualisasikan pembagian dua"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "gunakan <cmd>... untuk bagi dua otomatis."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "tidak ada log untuk BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check butuh 2 atau 3 argumen"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms butuh 0 atau 1 argumen"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next butuh 0 argumen"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log butuh 0 argumen"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "tidak ada berkas log yang diberikan"
@@ -10615,149 +10967,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "mengharapkan warna: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "harus berakhir dengan warna"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "warna tidak valid '%s' pada color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "nilai tidak valid untuk blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "tidak dapat menemukan revisi %s untuk diabaikan"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "perlihatkan statistik biaya usaha"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "paksa laporkan perkembangan"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "perlihatkan nilai keluaran untuk entri penyalahan"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "perlihatkan nama berkas asli (asali: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "perlihatkan nomor baris asli (asali: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "perlihatkan format porselen dengan informasi komit per baris"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "gunakan mode keluaran yang sama dengan git-annotate (asali: off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "perlihatkan stempel waktu mentah (asali: off)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "perlihatkan SHA1 komit panjang (asali: off)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "perlihatkan email pengarang daripada nama (asali: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "abaikan perbedaan spasi putih"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "revisi"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "abaikan <revisi> ketika menyalahkan"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "abaikan revisi dari <berkas>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "warnai baris oleh umur"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "gunakan konten <berkas> sebagai citra final"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "nilai"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "temukan salinan baris di dalam dan di seluruh berkas"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "temukan gerakan baris di dalam dan di seluruh baris"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "rentang"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress tidak dapat digunakan dengan --incremental atau format porselen"
@@ -10770,18 +11124,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 tahun, 11 bulan yang lalu"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "berkas %s hanya punya %lu baris"
msgstr[1] "berkas %s hanya punya %lu baris"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Menyalahkan baris"
@@ -10882,74 +11236,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Cabang %s (yaitu %s) dihapus.\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "tidak dapat menguraikan untai format"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "tidak dapat menguraikan HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) merujuk diluar refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Cabang %s sedang didasarkan ulang pada %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Cabang %s sedang dibagi dua pada %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada."
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nama cabang tidak valid: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Penggantian nama cabang gagal"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Penyalinan cabang gagal"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Salinan cabang salah nama '%s' dibuat"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Cabang salah nama '%s' berganti nama"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10960,180 +11314,180 @@
" %s\n"
"Baris yang diawali dengan '%c' akan dicopot.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opsi generik"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "sembunyikan pesan informasi"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "pasang mode pelacakan (lihat git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "jangan gunakan"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "hulu"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "ubah info hulu"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "batal-setel info hulu"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "gunakan keluaran berwarna"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "lakukan pada cabang pelacak remote"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "cetak hanya cabang yang berisi komit"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "cetak hanya cabang yang tak berisi komit"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Aksi git-branch spesifik:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "sebut baik cabang pelacak remote dan cabang lokal"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "hapus cabang yang tergabung sepenuhnya"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "hapus cabang (walaupun tak tergabung)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "pindah/ganti nama cabang dan reflog-nya"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "pindah/ganti nama cabang, walaupun target ada"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "salin cabang dan reflog-nya"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "salin cabang, walapun target ada"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "sebut nama cabang"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "perlihatkan nama cabang saat ini"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "buat reflog cabang"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "sunting deskripsi cabang"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "paksa buat, pindah/ganti nama, hapus"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "cetak hanya cabang yang tergabung"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "cetak hanya cabang yang tak tergabung"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "sebut cabang dalam kolom"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objek"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "cetak hanya cabang objek"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "pengurutan dan penyaringan tak peka kapital"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format yang digunakan untuk keluaran"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD tidak ditemukan di bawah refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column dan --verbose tidak kompatibel"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "nama cabang diperlukan"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Belum ada komit pada cabang '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Tidak ada cabang bernama '%s'."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "terlalu banyak cabang untuk operasi penyalinan"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "terlalu banyak argumen untuk operasi penggantian nama"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "terlalu banyak argumen untuk menyetel hulu baru"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11141,32 +11495,32 @@
"tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "tidak ada cabang '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "cabang '%s' tidak ada"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "terlalu banyak argumen untuk batal-setel hulu"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang "
"apapun."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Cabang '%s' tidak ada informasi hulu"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11174,7 +11528,7 @@
"Opsi -a dan -r tidak mengambil nama cabang.\n"
"Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11182,32 +11536,32 @@
"opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--"
"set-upstream-to' sebagai gantinya."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr ""
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr ""
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr ""
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr ""
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr ""
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11226,183 +11580,184 @@
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr ""
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr ""
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr ""
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr ""
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr ""
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
#: builtin/bundle.c:15 builtin/bundle.c:23
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr ""
+msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>"
#: builtin/bundle.c:16 builtin/bundle.c:28
msgid "git bundle verify [<options>] <file>"
-msgstr ""
+msgstr "git bundle verify [<opsi>] <berkas>"
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle list-heads <berkas> [<nama referensi>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle unbundle <berkas> [<nama referensi>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
-msgstr ""
+msgstr "jangan perlihatkan meteran perkembangan"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan saat fase penulisan objek"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
+msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr ""
+msgstr "sebutkan versi format bundel"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membuat bundel."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
-msgstr ""
+msgstr "jangan perlihatkan detail bundel"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
-msgstr ""
+msgstr "%s oke \n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membongkar bundel."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Membongkar bundel objek"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
-msgstr ""
+msgstr "Subperintah tidak dikenal: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipe> | --textconv | --filters) [--path=<jalur>] <objek>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
msgstr ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
-msgstr ""
-
-#: builtin/cat-file.c:636
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr ""
-
-#: builtin/cat-file.c:637
-msgid "show object type"
-msgstr ""
-
-#: builtin/cat-file.c:638
-msgid "show object size"
-msgstr ""
-
-#: builtin/cat-file.c:640
-msgid "exit with zero when there's no error"
-msgstr ""
-
-#: builtin/cat-file.c:641
-msgid "pretty-print object's content"
-msgstr ""
-
-#: builtin/cat-file.c:643
-msgid "for blob objects, run textconv on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:645
-msgid "for blob objects, run filters on object's content"
-msgstr ""
-
-#: builtin/cat-file.c:646
-msgid "blob"
-msgstr ""
-
-#: builtin/cat-file.c:647
-msgid "use a specific path for --textconv/--filters"
-msgstr ""
-
-#: builtin/cat-file.c:649
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr ""
-
-#: builtin/cat-file.c:650
-msgid "buffer --batch output"
-msgstr ""
-
-#: builtin/cat-file.c:652
-msgid "show info and content of objects fed from the standard input"
-msgstr ""
-
-#: builtin/cat-file.c:656
-msgid "show info about objects fed from the standard input"
-msgstr ""
-
-#: builtin/cat-file.c:660
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr ""
+msgstr "hanya satu opsi setumpuk yang mungkin disebutkan"
#: builtin/cat-file.c:662
-msgid "show all objects with --batch or --batch-check"
-msgstr ""
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<tipe> bisa salah satu dari: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:663
+msgid "show object type"
+msgstr "perlihatkan tipe objek"
#: builtin/cat-file.c:664
-msgid "do not order --batch-all-objects output"
+msgid "show object size"
+msgstr "perlihatkan ukuran objek"
+
+#: builtin/cat-file.c:666
+msgid "exit with zero when there's no error"
+msgstr "keluar dengan nol ketika tidak ada kesalahan"
+
+#: builtin/cat-file.c:667
+msgid "pretty-print object's content"
+msgstr "cetak-cantik isi objek"
+
+#: builtin/cat-file.c:669
+msgid "for blob objects, run textconv on object's content"
+msgstr "untuk objek blob, jalankan textconv pada isi objek"
+
+#: builtin/cat-file.c:671
+msgid "for blob objects, run filters on object's content"
+msgstr "untuk objek blob, jalankan penyaring pada isi objek"
+
+#: builtin/cat-file.c:672
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:673
+msgid "use a specific path for --textconv/--filters"
+msgstr "gunakan jalur spesifik untuk --textconv/--filters"
+
+#: builtin/cat-file.c:675
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "perbolehkan -s dan -t bekerja dengan objek rusak"
+
+#: builtin/cat-file.c:676
+msgid "buffer --batch output"
+msgstr "sannga keluaran --batch"
+
+#: builtin/cat-file.c:678
+msgid "show info and content of objects fed from the standard input"
+msgstr "perlihatkan info dan isi objek yang disuap dari masukan standar"
+
+#: builtin/cat-file.c:682
+msgid "show info about objects fed from the standard input"
+msgstr "perlihatkan info tentang objek yang disuap dari masukan standar"
+
+#: builtin/cat-file.c:686
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
+"ikuti tautan simbolik dalam pohon (digunakan dengan --batch atau --batch-"
+"check)"
+
+#: builtin/cat-file.c:688
+msgid "show all objects with --batch or --batch-check"
+msgstr "perlihatkan semua objek dengan --batch atau --batch-check"
+
+#: builtin/cat-file.c:690
+msgid "do not order --batch-all-objects output"
+msgstr "jangan urutkan keluaran --batch-all-objects"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11420,7 +11775,7 @@
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr ""
@@ -11428,8 +11783,8 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr ""
@@ -11487,11 +11842,10 @@
msgstr ""
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr ""
@@ -11644,11 +11998,11 @@
msgid "path '%s' is unmerged"
msgstr "jalur '%s' tak tergabung"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11658,50 +12012,50 @@
"berikut:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD sekarang berada di"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "tidak dapat memperbarui HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ganti ulang cabang '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Sudah berada pada '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Ganti ke dan ganti cabang '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Ganti ke cabang baru '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Ganti ke cabang '%s'\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr "... dan %d lainnya.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11724,7 +12078,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11747,19 +12101,19 @@
"saat yang tepat untuk dilakukan dengan:\n"
"git branch <nama-cabang-baru> %s\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "kesalahan internal dalam jalan revisi"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Posisi HEAD sebelumnya adalah"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Anda berada pada cabang yang belum lahir"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11768,7 +12122,7 @@
"'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -11788,51 +12142,51 @@
"seperti remote 'origin', pertimbangkan untuk menyetel\n"
"checkout.defaultRemote=origin di konfigurasi Anda"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "hanya satu referensi yang diharapkan"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "hanya satu referensi yang diharapkan, %d diberikan"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "referensi tidak valid: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensi bukan pohon: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "sebuah cabang diharapkan, dapat tag '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "sebuah cabang diharapkan, dapat '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "sebuah cabang diharapkan, dapat komit '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11841,7 +12195,7 @@
"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11849,7 +12203,7 @@
"tidak dapat mengganti cabang di tengah sesi am\n"
"Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11858,7 +12212,7 @@
"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11867,7 +12221,7 @@
"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
"worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11876,138 +12230,138 @@
"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
"\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "Anda mengganti cabang saat pembagian dua"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' tidak dapat digunakan dengan '%s'"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' tidak bisa mengambil <titik-awal>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "kehilangan argumen cabang atau komit"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "lakukan penggabungan 3 arah dengan cabang baru"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "gaya"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "gaya konflik (merge atau diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "lepas HEAD pada komit bernama"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "setel info hulu untuk cabang baru"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "paksa checkout (buang modifikasi lokal)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "cabang baru"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "cabang baru tanpa induk"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "perbarui berkas yang diabaikan (default)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "checkout versi kami untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "checkout versi mereka untuk berkas yang tak tergabung"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "jangan batasi jalur spek hanya ke entri tipis"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c dan --orphan saling eksklusif"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p dan --overlay saling eksklusif"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track butuh nama cabang"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "kehilangan nama cabang; coba -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "tidak dapat menyelesaikan %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "spesifikasi jalur tidak valid"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file tidak kompatible dengan --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12015,71 +12369,71 @@
"git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
"men-checkout index"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "Anda harus sebutkan jalur untuk dipulihkan"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "cabang"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "buat dan checkout cabang baru"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "buat/setel ulang dan checkout cabang"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "buat reflog untuk cabang baru"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "gunakan mode hamparan (default)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "buat dan ganti ke cabang baru"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "buat/setel ulang dan ganti ke cabang"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "buang modifikasi lokal"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "mana mirip-cabang untuk di-checkout"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "pulihkan indeks"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "pulihkan pohon kerja (default)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "abaikan entri yang tak tergabung"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "gunakan mode hamparan"
@@ -12219,8 +12573,8 @@
msgstr "hapus keseluruhan direktori"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "pola"
@@ -12309,19 +12663,20 @@
msgid "directory from which templates will be used"
msgstr "direktori dimana templat akan digunakan"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repositori rujukan"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "gunakan --reference hanya pada saat kloning"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nama"
@@ -12337,8 +12692,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "jalur ke git-upload-pack pada remote"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "kedalaman"
@@ -12346,8 +12701,8 @@
msgid "create a shallow clone of that depth"
msgstr "buat klon dangkal sedalam kedalaman tersebut"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "waktu"
@@ -12356,16 +12711,16 @@
msgstr "buat klon dangkal sejak waktu yang disebutkan"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revisi"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "klon hanya satu cabang, HEAD atau --branch"
@@ -12394,21 +12749,21 @@
msgstr "setel konfigurasi di dalam repositori baru"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "spesifik ke server"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "opsi untuk transmisi"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "gunakan hanya alamat IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "gunakan hanya alamat IPv6"
@@ -12422,50 +12777,42 @@
msgstr ""
"inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nama direktori tidak dapat ditebak.\n"
-"Mohon sebutkan direktori pada baris perintah"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s ada dan bukan direktori"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "gagal memulai iterator pada '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "gagal membuat tautan '%s'"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gagal menyalin berkas ke '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "gagal iterasi pada '%s'"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "selesai.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12475,105 +12822,105 @@
"Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
"dan coba lagi dengan 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "tidak dapat memperbarui %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "gagal menginisalisasi checkout tipis"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "tidak dapat men-checkout pohon kerja"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "tidak dapat memaket ulang untuk pembersihan"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "tidak dapat batal-taut berkas alternatif sementara"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Terlalu banyak argumen."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Anda harus sebutkan repositori untuk diklon."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare dan --origin %s tidak kompatibel."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare dan --separate-git-dir tidak kompatibel."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositori '%s' tidak ada"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "kedalaman %s bukan bilangan positif"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "jalur tujuan '%s' sudah ada dan bukan direktori kosong"
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong"
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "pohon kerja '%s' sudah ada."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "tidak dapat membuat direktori pendahulu '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "tidak dapat membuat direktori pohon kerja '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Kloning ke repositori bare '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Kloning ke '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12581,47 +12928,47 @@
"clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
"if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' bukan nama remote yang valid"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "repositori sumber dangkal, abaikan --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local diabaikan"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "transportasi remote melaporkan kesalahan"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Cabang remote %s tidak ditemukan di hulu %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Anda tampaknya mengklon repositori kosong."
@@ -12657,180 +13004,175 @@
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr ""
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr ""
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr ""
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr ""
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr ""
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr ""
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr ""
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
+"git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...] [(-F "
+"<berkas>)...] <pohon>"
#: builtin/commit-tree.c:31
#, c-format
msgid "duplicate parent %s ignored"
-msgstr ""
+msgstr "induk duplikat %s diabaikan"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
-msgstr ""
+msgstr "bukan nama objek valid %s"
-#: builtin/commit-tree.c:93
+#: builtin/commit-tree.c:94
#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: gagal membaca '%s'"
#: builtin/commit-tree.c:96
#, c-format
-msgid "git commit-tree: failed to read '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:98
-#, c-format
msgid "git commit-tree: failed to close '%s'"
-msgstr ""
+msgstr "git commit-tree: gagal menutup '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
-msgstr ""
+msgstr "induk"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
-msgstr ""
+msgstr "id objek komit induk"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
-msgstr ""
+msgstr "pesan"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
-msgstr ""
+msgstr "pesan komit"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
-msgstr ""
+msgstr "baca pesan log komit dari berkas"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
-msgstr ""
+msgstr "Tandatangani komit dengan GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
-msgstr ""
+msgstr "harus berikan tepat satu pohon"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
-msgstr ""
+msgstr "git commit-tree: gagal membaca"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opsi>] [--] <spek jalur>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opsi>] [--] <spek jalur>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -12841,7 +13183,7 @@
"dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n"
"dengan \"git reset HEAD^\".\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -12855,15 +13197,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Selain itu, gunakan 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -12884,73 +13226,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "gagal membuka objek pohon HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file dengan -a tidak masuk akal"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "tidak dapat membuat indeks sementara"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "penambahan interaktif gagal"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "tidak dapat memperbarui indeks sementara"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "gagal memperbarui tembolok pohon utama"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "tidak dapat menulis berkas new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "tidak dapat melakukan komit sebagian selama penggabungan."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "tidak dapat membaca indeks"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "tidak dapat menulis berkas indeks sementara"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "komit '%s' kurang kepala pengarang"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "komit '%s' ada baris pengarang cacat"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "parameter --author cacat"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12958,43 +13300,43 @@
"tidak dapat memilih karakter komentar yang tidak terpakai\n"
"dalam pesan komit saat ini"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "tidak dapat mencari komit %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(baca pesan log dari standar masukan)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "tidak dapat membaca log dari standar masukan"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "tidak dapat membaca berkas log '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "tidak dapat menggabungkan -m dengan --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "tidak dapat membaca SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "tidak dapat membaca MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "tidak dapat menulis templat komit"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13003,7 +13345,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan diabaikan.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13012,7 +13354,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13021,7 +13363,7 @@
"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13032,7 +13374,7 @@
"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
"Pesan kosong batalkan komit.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13046,7 +13388,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"dan coba lagi.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13060,175 +13402,175 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"dan coba lagi.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sPengarang: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sTanggal: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sPengkomit: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Tidak dapat membaca indeks"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "tidak dapat melewatkan trailer ke --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Kesalahan membangun pohon"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' bukan 'Nama <email>' dan tidak cocok dengan pengarang yang ada"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode terabaikan '%s' tidak valid"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode berkas tak terlacak '%s' tidak valid"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long dan -z tidak kompatibel"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
msgstr ""
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Anda tidak punya apapun untuk diubah."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend."
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Hanya salah satu dari --include/--only/--all/--interactive/--patch yang "
"dapat digunakan."
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr ""
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "jalur '%s ...' dengan -a tidak masuk akal"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "perlihatkan status dengan ringkas"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "perlihatkan informasi cabang"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "perlihatkan informasi stase"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "hitung nilai didepan/dibelakang penuh"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "versi"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "keluaran yang dapat dibaca mesin"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "perlihatkan status dalam format panjang (asali)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "akhiri entri dengan NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13236,11 +13578,11 @@
"perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
"(Asali: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "bila"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13248,192 +13590,192 @@
"abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
"all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "sebut berkas tak terlacak dalam kolom"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "jangan deteksi penggantian nama"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "sembunyikan rangkuman setelah komit berhasil"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "perlihatkan diff dalam templat pesan komit"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opsi pesan komit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "Baca pesan dari berkas"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "pengarang"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "timpa pengarang komit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "tangal"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "timpa tanggal komit"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "komit"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "gunakan kembali pesan dari komit tersebut"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]komit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang "
"komit yang disebutkan"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "tambahkan trailer Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "gunakan templat berkas tersebut"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "paksa sunting komit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "masukkan status dalam templat pesaan komit"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opsi isi komit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "komit semua berkas terubah"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "tambah berkas secara interaktif"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "tambah perubahan secara interaktif"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "hanya komit berkas tersebut"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
-msgstr "lewati hook pre-commit dan commit-msg"
+msgstr "lewati kail pre-commit dan commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "perlihatkan apa yang akan dikomit"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "ubah komit sebelumnya"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
-msgstr "lewati hook post-rewrite"
+msgstr "lewati kail post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok merekam perubahan kosong"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "ok merekam perubahan dengan pesan kosong"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Berkas MERGE_HEAD (%s) rusak"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "tidak dapat membaca MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "tidak dapat membaca pesan komit: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Batalkan komit karena pesan komit kosong.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Batalkan komit karena badan pesan komit kosong.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13771,11 +14113,11 @@
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr ""
+msgstr "git count-objects [-v] [-H | --human-readable]"
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
-msgstr ""
+msgstr "cetak ukuran dalam format yang bisa dibaca manusia"
#: builtin/credential-cache--daemon.c:227
#, c-format
@@ -13794,7 +14136,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr ""
@@ -13996,7 +14338,7 @@
msgid "Not a git repository"
msgstr "bukan repositori git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objek yang diberikan '%s' tidak valid"
@@ -14018,119 +14360,123 @@
#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr ""
+msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
-#: builtin/difftool.c:261
+#: builtin/difftool.c:293
#, c-format
-msgid "failed: %d"
-msgstr ""
+msgid "could not read symlink %s"
+msgstr "tidak dapat membaca tautan simbolik %s"
+
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "tidak dapat membaca berkas tautan simbolik %s"
#: builtin/difftool.c:303
#, c-format
-msgid "could not read symlink %s"
-msgstr ""
-
-#: builtin/difftool.c:305
-#, c-format
-msgid "could not read symlink file %s"
-msgstr ""
-
-#: builtin/difftool.c:313
-#, c-format
msgid "could not read object %s for symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca objek %s untuk symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
+"format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
+"mode diff direktori ('-d' dan '--dir-diff')."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
-msgstr ""
+msgstr "kedua berkas berubah: '%s' dan '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
-msgstr ""
+msgstr "berkas pohon kerja telah ditinggalkan."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
-msgstr ""
+msgstr "berkas sementara ada di '%s'."
+
+#: builtin/difftool.c:646
+msgid "you may want to cleanup or recover these."
+msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
#: builtin/difftool.c:651
-msgid "you may want to cleanup or recover these."
-msgstr ""
+#, c-format
+msgid "failed: %d"
+msgstr "gagal: %d"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr ""
+msgstr "gunakan `diff.guitool` daripada `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
-msgstr ""
+msgstr "lakukan diff direktori penuh"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
-msgstr ""
+msgstr "jangan bisiki sebelum meluncurkan alat diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
-msgstr ""
+msgstr "gunakan tautan simbolik dalam mode diff direktori"
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr "alat"
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr "gunakan alat diff yang disebutkan"
#: builtin/difftool.c:709
-msgid "tool"
-msgstr ""
-
-#: builtin/difftool.c:710
-msgid "use the specified diff tool"
-msgstr ""
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`"
#: builtin/difftool.c:712
-msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
-
-#: builtin/difftool.c:715
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
+"buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
+"kode keluar bukan nol"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
-msgstr ""
+msgstr "sebutkan perintah kustom untuk melihat diff"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
-msgstr ""
+msgstr "dilewatkan ke `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
-msgstr ""
+msgstr "difftool butuh pohon kerja atau --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
+msgstr "--dir-diff tidak kompatibel dengan --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
+msgstr "--gui, --tool dan --extcmd saling eksklusif"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
-msgstr ""
+msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr ""
+msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr ""
@@ -14156,133 +14502,137 @@
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
-msgstr ""
+msgstr "git fast-export [opsi rev-list]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
+"Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags "
+"disebutkan."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
-msgstr ""
+msgstr "token --anonymize-map tidak bisa kosong"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
-msgstr ""
+msgstr "perlihatkan perkembangan setelah <n> objek"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
-msgstr ""
+msgstr "pilih penanganan tag bertandatangan"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
-msgstr ""
+msgstr "pilih penanganan tag yang men-tag objek tersaring"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
-msgstr ""
+msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
-msgstr ""
+msgstr "buang tanda ke berkas ini"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
-msgstr ""
+msgstr "impor tanda dari berkas ini"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
-msgstr ""
+msgstr "impor tanda dari berkas ini jika ada"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
-msgstr ""
+msgstr "palsukan pen-tag ketika tidak ada pada tag"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
-msgstr ""
-
-#: builtin/fast-export.c:1220
-msgid "use the done feature to terminate the stream"
-msgstr ""
+msgstr "keluarkan pohon penuh untuk setiap komit"
#: builtin/fast-export.c:1221
+msgid "use the done feature to terminate the stream"
+msgstr "gunakan fitur selesai untuk mengakhiri arus"
+
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
-msgstr ""
+msgstr "lewati keluaran data blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
-msgstr ""
-
-#: builtin/fast-export.c:1223
-msgid "apply refspec to exported refs"
-msgstr ""
+msgstr "spek referensi"
#: builtin/fast-export.c:1224
-msgid "anonymize output"
-msgstr ""
+msgid "apply refspec to exported refs"
+msgstr "terapkan spek referensi ke referensi terekspor"
#: builtin/fast-export.c:1225
-msgid "from:to"
-msgstr ""
+msgid "anonymize output"
+msgstr "anonimkan keluaran"
#: builtin/fast-export.c:1226
+msgid "from:to"
+msgstr "dari:ke"
+
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
-msgstr ""
+msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
-msgstr ""
+msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
-msgstr ""
+msgstr "perlihatkan id objek asli dari blob/komit"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
-msgstr ""
+msgstr "label tag dengan id tanda"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
+msgstr "--anonymize-map tanpa --anonymize tidak masuk akal"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
+"Tidak dapat melewatkan baik --import-marks dan --import-marks-if-exists"
#: builtin/fast-import.c:3088
#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr ""
+msgstr "Kehilangan tanda dari untuk submodul '%s'"
#: builtin/fast-import.c:3090
#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr ""
+msgstr "Kehilangan tanda ke untuk submodul '%s'"
#: builtin/fast-import.c:3225
#, c-format
msgid "Expected 'mark' command, got %s"
-msgstr ""
+msgstr "Perintah 'mark' diharapkan, dapat %s"
#: builtin/fast-import.c:3230
#, c-format
msgid "Expected 'to' command, got %s"
-msgstr ""
+msgstr "Perintah 'to' diharapkan, dapat %s"
#: builtin/fast-import.c:3322
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
+"Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul"
#: builtin/fast-import.c:3377
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
+msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
#: builtin/fetch-pack.c:242
#, c-format
msgid "Lockfile created but not reported: %s"
-msgstr ""
+msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s"
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
@@ -14304,15 +14654,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel tidak dapat bernilai negatif"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "ambil dari semua remote"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "setel hulu untuk git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
@@ -14320,7 +14670,7 @@
msgid "use atomic transaction to update references"
msgstr ""
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "jalur ke paket unggah pada sisi remote"
@@ -14332,7 +14682,7 @@
msgid "fetch from multiple remotes"
msgstr "ambil dari banyak remote"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "ambil semua tag dan objek yang bersesuaian"
@@ -14348,7 +14698,7 @@
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "buang cabang pelacak remote yang tidak ada pada remote"
@@ -14356,7 +14706,7 @@
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "sesuai permintaan"
@@ -14368,7 +14718,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "simpan paket yang diunduh"
@@ -14376,16 +14726,16 @@
msgid "allow updating of HEAD ref"
msgstr "bolehkan perbarui referensi HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "perdalam riwayat klon dangkal"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "ubah ke repositori penuh"
@@ -14401,19 +14751,19 @@
"default untuk ambil submodul secara rekursif (prioritas lebih rendah "
"dariberkas konfigurasi)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "terima referensi yang memperbarui .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "peta referensi"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "sebutkan ambil peta referensi"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
@@ -14421,12 +14771,13 @@
#: builtin/fetch.c:210
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
msgstr ""
+"jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi"
#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
msgstr "lakukan 'maintenance --auto' setelah pengambilan"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "periksa pembaruan terpaksa pada semua cabang"
@@ -14442,62 +14793,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "tidak dapat menemukan referensi remote HEAD"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objek %s tidak ditemukan"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[terkini]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[tertolak]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "tidak dapat mengambil di cabang saat ini"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[pembaruan tag]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "tidak dapat memperbarui referensi lokal"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "akan klob tag yang ada"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[tag baru]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[cabang baru]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[referensi baru]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "pembaruan terpaksa"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "bukan-maju-cepat"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14508,7 +14859,7 @@
"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
"true'."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14521,22 +14872,22 @@
"'git config fetch.showForcedUpdates false'\n"
" untuk menghindari pemeriksaan ini.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tidak mengirim semua objek yang diperlukan\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Dari %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14545,56 +14896,61 @@
"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s akan menjadi terjuntai)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s telah menjadi terjuntai)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[dihapus]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(tidak ada)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opsi \"%s\" diabaikan untuk %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objek '%s' tidak ada"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "tidak setel hulu untuk cabang remote pelacak remote"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "tidak setel hulu untuk tag remote"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "tipe cabang tidak diketahui"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14602,22 +14958,22 @@
"cabang sumber tidak ditemukan.\n"
"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Mengambil %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Tidak dapat mengambil %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14625,56 +14981,56 @@
"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n"
"cabang yang mana revisi baru sebaiknya diambil."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Anda perlu sebutkan nama tag"
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Kedalaman negatif di --deepen tidak didukung"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen dan --depth saling eksklusif"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow pada repositori penuh tidak masuk akal"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tidak mengambil argumen repositori"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all tidak masuk akal dengan spek referensi"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "tidak ada remote atau grup remote seperti itu: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "harus suplai remote ketika menggunakan --negotiate-only"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+msgstr "Protokol tidak mendukung --negotiate-only, keluar."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14682,11 +15038,11 @@
"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
"extensions.partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
@@ -14751,7 +15107,7 @@
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr ""
@@ -14793,28 +15149,28 @@
#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
-msgstr ""
+msgstr "tidak dikenal"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:78 builtin/fsck.c:100
#, c-format
msgid "error in %s %s: %s"
-msgstr ""
+msgstr "kesalahan pada %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:94
#, c-format
msgid "warning in %s %s: %s"
-msgstr ""
+msgstr "peringatan pada %s %s: %s"
#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
-msgstr ""
+msgstr "tautan rusak dari %7s %s"
#: builtin/fsck.c:136
msgid "wrong object type in link"
-msgstr ""
+msgstr "tipe objek salah dalam tautan"
#: builtin/fsck.c:152
#, c-format
@@ -14822,475 +15178,540 @@
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
+"tautan rusak dari %7s %s\n"
+" ke %7s %s"
#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
-msgstr ""
+msgstr "kehilangan %s %s"
#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
-msgstr ""
+msgstr "tidak dapat dicapai %s %s"
#: builtin/fsck.c:311
#, c-format
msgid "dangling %s %s"
-msgstr ""
+msgstr "teruntai %s %s"
#: builtin/fsck.c:321
msgid "could not create lost-found"
-msgstr ""
+msgstr "tidak dapat membuat lost-found"
#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
-msgstr ""
+msgstr "tidak dapat menyelesaikan '%s'"
#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
-msgstr ""
+msgstr "Memeriksa %s"
#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
-msgstr ""
+msgstr "Memerika konektivitas (%d objek)"
#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
-msgstr ""
+msgstr "Memeriksa %s %s"
#: builtin/fsck.c:411
msgid "broken links"
-msgstr ""
+msgstr "tautan rusak"
#: builtin/fsck.c:420
#, c-format
msgid "root %s"
-msgstr ""
+msgstr "akar %s"
#: builtin/fsck.c:428
#, c-format
msgid "tagged %s %s (%s) in %s"
-msgstr ""
+msgstr "ter-tag %s %s (%s) di %s"
#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
-msgstr ""
+msgstr "%s: objek rusak atau hilang"
#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
-msgstr ""
+msgstr "%s: entri log referensi tidak valid %s"
#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
-msgstr ""
+msgstr "Memeriksa log referensi %s->%s"
#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid %s"
#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
-msgstr ""
+msgstr "%s: bukan sebuah komit"
#: builtin/fsck.c:591
msgid "notice: No default references"
+msgstr "catatan: Tidak ada referensi asali"
+
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
msgstr ""
-#: builtin/fsck.c:606
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
-msgstr ""
+msgstr "%s: objek rusak atau hilang: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objek bertipe tidak dikenal '%s': %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
-msgstr ""
+msgstr "%s: objek tidak dapat diuraikan: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
-msgstr ""
+msgstr "sha1 berkas jelek: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
-msgstr ""
+msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
-msgstr ""
+msgstr "Memeriksa direktori objek"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
-msgstr ""
+msgstr "Memeriksa tautan %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s tidak valid"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
-msgstr ""
+msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
+msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
-msgstr ""
+msgstr "Memeriksa pohon tembolok"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
-msgstr ""
+msgstr "bukan pohon pada pohon tembolok"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
-msgstr ""
+msgstr "git fsck [<opsi>] [<objek>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
-msgstr ""
+msgstr "perlihatkan objek yang tak dapat dicapai"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
-msgstr ""
+msgstr "perlihatkan objek teruntai"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
-msgstr ""
+msgstr "laporkan tag"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
-msgstr ""
+msgstr "laporkan simpul akar"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
-msgstr ""
+msgstr "buat objek indeks simpul kepala"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
-msgstr ""
+msgstr "buat log referensi simpul kepala (asali)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
-msgstr ""
+msgstr "juga pertimbangkan pak dan objek alternatif"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
-msgstr ""
+msgstr "hanya periksa konektivitas"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
-msgstr ""
+msgstr "aktifkan pemeriksaan lebih ketat"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
-msgstr ""
+msgstr "tulis objek teruntai dalam .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
-msgstr ""
+msgstr "perlihatkan perkembangan"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
-msgstr ""
+msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Memeriksa objek"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
-msgstr ""
+msgstr "%s: objek hilang"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
-msgstr ""
+msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
#: builtin/gc.c:39
msgid "git gc [<options>]"
-msgstr ""
+msgstr "git gc [<opsi>]"
#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
-msgstr ""
+msgstr "Gagal men-fstat %s: %s"
#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
-msgstr ""
+msgstr "gagal menguraikan nilai '%s' '%s'"
#: builtin/gc.c:487 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
-msgstr ""
+msgstr "tidak dapat men-stat '%s'"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
-msgstr ""
+msgstr "tidak dapat membaca '%s'"
#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
+"Aksi gc terakhir melaporkan berikut. Mohon koreksi akar masalah\n"
+"dan hapus %s\n"
+"Pembersihan otomatis tidak akan dilakukan sampai berkas dihapus.\n"
+"\n"
+"%s"
#: builtin/gc.c:551
msgid "prune unreferenced objects"
-msgstr ""
+msgstr "pangkas objek tak tereferensi"
#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
-msgstr ""
+msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
#: builtin/gc.c:554
msgid "enable auto-gc mode"
-msgstr ""
+msgstr "aktifkan mode gc otomatis"
#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
-msgstr ""
+msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan"
#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
-msgstr ""
+msgstr "pak ulang semua pak yang lain kecuali pak terbesar"
#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr ""
+msgstr "gagal menguraikan nilai gc.logexpiry %s"
#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr ""
+msgstr "gagal menguraikan nilai pangkas kadaluarsa %s"
#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr ""
+msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n"
#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
+msgstr "Mempak otomatis repositori untuk performa optimal.\n"
#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr ""
+msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n"
#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
+"gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)"
#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
+"Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
+"prune' untuk menghapusnya."
#: builtin/gc.c:715
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]"
#: builtin/gc.c:745
msgid "--no-schedule is not allowed"
-msgstr ""
+msgstr "--no-schedule tidak diperbolehkan"
#: builtin/gc.c:750
#, c-format
msgid "unrecognized --schedule argument '%s'"
-msgstr ""
+msgstr "argumen --schedule tidak dikenal '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
-msgstr ""
+msgstr "gagal menulis grafik komit"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
-msgstr ""
+msgstr "gagal mem-praambil remote"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
-msgstr ""
+msgstr "gagal memulai proses 'git pack-objects'"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
-msgstr ""
+msgstr "gagal menyelesaikan proses 'git pack-objects'"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
-msgstr ""
+msgstr "gagal menulis indeks multipak"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
-msgstr ""
+msgstr "'git multi-pack-index expire' gagal"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
-msgstr ""
+msgstr "'git multi-pack-index repack' gagal"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
+"melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
-msgstr ""
+msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
-msgstr ""
+msgstr "tugas '%s' gagal"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
-msgstr ""
+msgstr "'%s' bukan tugas yang valid"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr ""
+msgstr "tugas '%s' tidak dapat dipilih berulang kali"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
-msgstr ""
+msgstr "jalankan tugas berdasarkan keadaan repositori"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
-msgstr ""
+msgstr "frekuensi"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
-msgstr ""
+msgstr "jalankan tugas berdasarkan frekuensi"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr ""
+"jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
-msgstr ""
+msgstr "tugas"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
-msgstr ""
+msgstr "jalankan tugas spesifik"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
+msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
-msgstr ""
+msgstr "gagal menjalankan 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
-msgstr ""
+msgstr "gagal memperluas jalur '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
-msgstr ""
+msgstr "gagal menjalankan launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
-msgstr ""
+msgstr "gagal membuat direktori untuk '%s'"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
-msgstr ""
+msgstr "gagal men-tali-botkan layanan %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
-msgstr ""
+msgstr "gagal membuat berkas xml sementara"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
-msgstr ""
+msgstr "gagal menjalankan schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
+"gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
+"gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
-msgstr ""
+msgstr "gagal membuka masukan standar dari 'crontab'"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
-msgstr ""
+msgstr "'crontab' mati"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "gagal memulai systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "gagal menjalankan systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "gagal menghapus '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumen --scheduler tidak dikenal '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "baik pewaktu systemd atau crontab tidak tersedia"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "penjadwal %s tidak tersedia"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
-msgstr ""
+msgstr "proses lainnya sedang menjadwalkan peme"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<penjadwal>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "penjadwal"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "penjadwal untuk memicu git maintenance run"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
-msgstr ""
+msgstr "gagal menambahkan repositori ke konfigurasi global"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
-msgstr ""
+msgstr "git maintenance <subperintah> [<opsi>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
-msgstr ""
+msgstr "subperintah tidak valid: %s"
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gagal membuat utas: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "jumlah utas yang diberikan (%d) tidak valid untuk %s"
@@ -15299,357 +15720,372 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "tidak ada dukungan utas, abaikan %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "tidak dapat membaca pohon (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "tidak dapan men-grep dari objek dengan tipe %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "saklar '%c' mengharapkan nilai numerik"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "cari dalam index daripada dalam pohon kerja"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "temukan dalam konten yang tak dikelola oleh git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "cari dalam berkas terlacak dan tak terlacak"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "abaikan berkas yang disebutkan via '.gitignore'"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "cari secara rekursif dalam setiap submodul"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "perlihatkan baris nir-cocok"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "pencocokan tak peka kapital"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "cocokkan pola hanya pada batas kata"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "proses berkas biner sebagai teks"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "jangan cocokkan pola pada berkas biner"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "proses berkas biner dengan saringan textconv"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "cari dalam subdirektori (asali)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "turun paling banyak <kedalaman> tingkat"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "gunakan ekspresi reguler POSIX diperpanjang"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "gunakan ekspresi reguler POSIX dasar (asali)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "tafsirkan pola sebagai untai tetap"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "gunakan ekspresi reguler kompatibel dengan Perl"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "perlihatkan nomor baris"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "perlihatkan nomor kolom cocokan pertama"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "jangan perlihatkan nama berkas"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "perlihatkan nama berkas"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "perlihatkan nama berkas relatif terhadap direktori puncak"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "hanya perlihatkan nama berkas daripada baris yang cocok"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "sinonim untuk --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "hanya perlihatkan nama berkas tanpa cocok"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "cetak NUL setelah nama berkas"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "hanya perlihatkan bagian cocokan baris"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "perlihatkan jumlah cocokan daripada baris yang cocok"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "sorot cocokan"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "perlihatkan <n> baris konteks sebelum cocokan"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "perlihatkan <n> baris konteks setelah cocokan"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "gunakan <n> utas pekerja"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "pintasan untuk -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "perlihatkan fungsi di sekitar"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "baca pola dari berkas"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "cocokkan <pola>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "kombinasikan pola yang disebutkan dengan -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "tunjukkan kena dengan status keluar tanpa keluaran"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "penghalaman"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "perlihatkan berkas yang cocok dalam penghalaman"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "tidak ada pola yang diberikan"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "tidak dapat menguraikan revisi: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked tidak didukung dengan --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "kombinasi opsi tidak valid, abaikan --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "tidak ada dukungan utas, abaikan --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "jumlah utas tersebut (%d) tidak valid"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager hanya bekerja pada pohon kerja"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached atau --untracked tidak dapat digunakan dengan --no-index"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked tidak dapat digunakan dengan --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "baik --cached dan pohon diberikan"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
+"git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters] [--stdin] "
+"[--] <berkas>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
-msgstr ""
+msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
-msgstr ""
+msgstr "tipe objek"
+
+#: builtin/hash-object.c:97
+msgid "write the object into the object database"
+msgstr "tulis objek ke dalam basis data objek"
#: builtin/hash-object.c:99
-msgid "write the object into the object database"
-msgstr ""
+msgid "read the object from stdin"
+msgstr "baca objek dari masukan standar"
#: builtin/hash-object.c:101
-msgid "read the object from stdin"
-msgstr ""
-
-#: builtin/hash-object.c:103
msgid "store file as is without filters"
-msgstr ""
+msgstr "simpan berkas apa adanya tanpa penyaring"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
+"hanya hash sampah acak apapun untuk membuat objek rusak demi menirkutukan Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
-msgstr ""
+msgstr "proses berkas seperti dari jalur ini"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "cetak semua perintah yang tersedia"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "kecualikan panduan"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "cetak daftar panduan berguna"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "cetak semua nama variabel konfigurasi"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "perlihatkan halaman man"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "perlihatkan manual dalam penjelajah web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "perlihatkan halaman info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "perlihatkan deskripsi perintah"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "cetak daftar panduan berguna"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "cetak semua nama variabel konfigurasi"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<perintah>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr ""
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr ""
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format bantuan tidak dikenal '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "gagal menjalankan emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "gagal menguraikan versi emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "versi emacsclient '%d' terlalu usang (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "gagal menjalankan '%s'"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -15658,7 +16094,7 @@
"'%s': jalur untuk pembaca man yang tidak didukung.\n"
"Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -15667,331 +16103,322 @@
"'%s': cmd untuk pembaca man yang didukung.\n"
"Mohon gunakan 'man.<tool>.path' sebagai gantinya."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': pembaca man tidak dikenal"
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "tidak ada pembaca man yang menangani permintaan"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "tidak ada pembaca info yang menangani permintaan"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' dialiaskan ke '%s'"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "untai alias.%s jelek: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "opsi ini tidak mengambil argumen lainnya"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "penggunaan: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' untuk informasi lebih lanjut"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "tipe objek tidak cocok pada %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "tidak menerima objek yang diharapkan %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objek %s: yang diharapkan %s, yang didapat %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF awal"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "kesalahan baca pada masukan"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "gunakan lebih banyak pita dari pada yang tersedia"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paket terlalu besar untuk definisi off_t saat ini"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "tidak dapat membuat '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "tidak dapat membuka berkas paket '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "tanda tangan paket tidak cocok"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versi paket %<PRIu32> tidak didukung"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "inflate mengembalikan %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "nilai offset meluap untuk objek basis delta"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "offset basis delta di luar jangkauan"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "tipe objek tidak diketahui %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "tidak dapat pread berkas paket"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "inkonsistensi inflate serius"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "tidak dapat membaca %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "tidak dapat membaca info objek yang ada %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "tidak dapat membaca objek yang ada %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "objek blob tidak valid %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "kesalahan fsck dalam objek terpaket"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tidak semua objek anak dari %s bisa dicapai"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "gagal menerapkan delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Menerima objek"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Mengindeks objek"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paket rusak (SHA1 tidak cocok)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "tidak dapat fstat berkas paket"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "paket memiliki sampah pada ujung"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "bingung di luar kegilaan di parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Menguraikan delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "tidak dapat membuat utas: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "bingung di luar kegilaan"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "tidak dapat menggemboskan objek tertambah (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "objek lokal %s rusak"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "tidak dapat menulis %s berkas '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "tidak dapat menutup %s berkas tertulis '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "tidak dapat menamai ulang berkas sementara '*.%s' ke '%s'"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "kesalahan menutup berkas paket"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "tidak dapat menyimpan berkas paket"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "tidak dapat menyimpan berkas indeks"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> jelek"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "tidak dapat membuka berkas paket yang ada '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "tidak dapat kembali ke direktori kerja saat ini"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "%s jelek"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "algoritma hash tak dikenal '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin memerlukan repositori git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format tidak dapat digunakan dengan --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify tanpa nama berkas paket diberikan"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "kesalahan fsck dalam objek paket"
@@ -16631,192 +17058,203 @@
"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
"secara manual.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
+msgstr "git ls-files [<opsi>] [<berkas>...]"
+
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "pisahkan jalur dengan karakter NUL"
+
+#: builtin/ls-files.c:617
+msgid "identify the file status with tags"
+msgstr "identifikasi status berkas dengan tag"
#: builtin/ls-files.c:619
-msgid "identify the file status with tags"
-msgstr ""
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
#: builtin/ls-files.c:621
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
#: builtin/ls-files.c:623
-msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
+msgid "show cached files in the output (default)"
+msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
#: builtin/ls-files.c:625
-msgid "show cached files in the output (default)"
-msgstr ""
+msgid "show deleted files in the output"
+msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
#: builtin/ls-files.c:627
-msgid "show deleted files in the output"
-msgstr ""
+msgid "show modified files in the output"
+msgstr "perlihatkan berkas yang berubah di dalam keluaran"
#: builtin/ls-files.c:629
-msgid "show modified files in the output"
-msgstr ""
+msgid "show other files in the output"
+msgstr "perlihatkan berkas lainnya di dalam keluaran"
#: builtin/ls-files.c:631
-msgid "show other files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:633
msgid "show ignored files in the output"
-msgstr ""
+msgstr "perlihatkan berkas terabaikan di dalam keluaran"
+
+#: builtin/ls-files.c:634
+msgid "show staged contents' object name in the output"
+msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
#: builtin/ls-files.c:636
-msgid "show staged contents' object name in the output"
-msgstr ""
+msgid "show files on the filesystem that need to be removed"
+msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
#: builtin/ls-files.c:638
-msgid "show files on the filesystem that need to be removed"
-msgstr ""
+msgid "show 'other' directories' names only"
+msgstr "hanya perlihatkan nama direktori 'lainnya'"
#: builtin/ls-files.c:640
-msgid "show 'other' directories' names only"
-msgstr ""
+msgid "show line endings of files"
+msgstr "perlihatkan akhiran baris berkas"
#: builtin/ls-files.c:642
-msgid "show line endings of files"
-msgstr ""
-
-#: builtin/ls-files.c:644
msgid "don't show empty directories"
-msgstr ""
+msgstr "jangan perlihatkan direktori kosong"
+
+#: builtin/ls-files.c:645
+msgid "show unmerged files in the output"
+msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
#: builtin/ls-files.c:647
-msgid "show unmerged files in the output"
-msgstr ""
+msgid "show resolve-undo information"
+msgstr "perlihatkan informasi resolve-undo"
#: builtin/ls-files.c:649
-msgid "show resolve-undo information"
-msgstr ""
-
-#: builtin/ls-files.c:651
msgid "skip files matching pattern"
-msgstr ""
+msgstr "lewati berkas yang cocok dengan pola"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr ""
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "baca pola pengecualian dari <berkas>"
+
+#: builtin/ls-files.c:655
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
#: builtin/ls-files.c:657
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
-
-#: builtin/ls-files.c:659
msgid "add the standard git exclusions"
-msgstr ""
+msgstr "tambahkan pengecualian git standar"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
-msgstr ""
+msgstr "buat keluaran relatif terhadap direktori puncak proyek"
+
+#: builtin/ls-files.c:664
+msgid "recurse through submodules"
+msgstr "rekursi melalui submodul"
#: builtin/ls-files.c:666
-msgid "recurse through submodules"
-msgstr ""
-
-#: builtin/ls-files.c:668
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
+"jika <berkas> apapun tidak berada di indeks, perlakukan sebagai kesalahan"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
-msgstr ""
+msgstr "mirip-pohon"
+
+#: builtin/ls-files.c:668
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada"
#: builtin/ls-files.c:670
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
+msgid "show debugging data"
+msgstr "perlihatkan data penirkutuan"
#: builtin/ls-files.c:672
-msgid "show debugging data"
-msgstr ""
-
-#: builtin/ls-files.c:674
msgid "suppress duplicate entries"
-msgstr ""
+msgstr "hapus entri duplikat"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositori> [<referensi>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
-msgstr ""
+msgstr "jangan cetak URL remote"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
-msgstr ""
+msgstr "exec"
#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
-msgstr ""
+msgstr "jalur git-upload-pack pada host remote"
#: builtin/ls-remote.c:66
msgid "limit to tags"
-msgstr ""
+msgstr "batasi ke tag"
#: builtin/ls-remote.c:67
msgid "limit to heads"
-msgstr ""
+msgstr "batasi ke kepala"
#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
-msgstr ""
+msgstr "jangan perlihatkan tag terkupas"
#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
-msgstr ""
+msgstr "perhitungkan url.<dasar>.insteadOf"
#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
+"keluar dengan kode keluar 2 jika tidak ada referensi yang cocok ditemukan"
#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
-msgstr ""
+msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr ""
+msgstr "git ls-tree [<opsi>] <mirip-pohon> [<jalur>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
-msgstr ""
+msgstr "hanya perlihatkan pohon"
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
-msgstr ""
+msgstr "rekursi ke dalam subpohon"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
-msgstr ""
+msgstr "perlihatkan pohon ketika rekursi"
#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
-msgstr ""
+msgstr "akhiri entri dengan bita NUL"
#: builtin/ls-tree.c:136
msgid "include object size"
-msgstr ""
+msgstr "masukkan ukuran objek"
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
-msgstr ""
+msgstr "hanya daftar nama berkas"
#: builtin/ls-tree.c:143
msgid "use full path names"
-msgstr ""
+msgstr "gunakan nama berkas lengkap"
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
+"daftar pohon keseluruhan; bukan hanya direktori saat ini (menyiratkan --full-"
+"name)"
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
@@ -16867,7 +17305,7 @@
msgid "use headers in message's body"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr ""
@@ -16981,143 +17419,143 @@
msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opsi>] [<komit>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "tombol `m' butuh sebuah nilai"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "opsi `%s' butuh sebuah nilai"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Strategi yang tersedia:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Strategi kustom yang tersedia:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "jangan perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "perlihatkan diffstat pada akhir penggabungan"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinonim untuk --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "buat satu komit daripada melakukan penggabungan"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "lakukan komit jika penggabungan sukses (asali)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "sunting pesan sebelum komit"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "perbolehkan maju cepat (asali)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "batalkan jika maju cepat tidak dimungkinkan"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "strategi penggabungan yang digunakan"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "opsi=nilai"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opsi untuk strategi penggabungan yang dipilih"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort tapi biarkan indeks dan pohon kerja"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "perbolehkan penggabungan riwayat yang tak terkait"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "lewati hook pre-merge-commit dan commit-msg"
+msgstr "lewati kail pre-merge-commit dan commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "tidak dapat menjalankan stase."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "stase gagal"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "bukan objek valid: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree gagal"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Lumat komit -- tak perbarui HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
@@ -17132,33 +17570,33 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Untai branch.%s.mergeoptions jelek: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Tak tangani apapun selain penggabungan dua kepala."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opsi merge-recursive tak dikenal: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opsi strategi tidak dikenal: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "tidak dapat menulis %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Tidak dapat membaca dari '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan "
"penggabungan.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17168,11 +17606,11 @@
"diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
"topik.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Pesan kosong membatalkan komit.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17181,72 +17619,72 @@
"Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
"komit.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Pesan komit kosong"
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Luar biasa.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Tidak ada cabang saat ini."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Tidak ada remote untuk cabang saat ini."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort harap tanpa argumen"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit harap tanpa argumen"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue harap tanpa argumen"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17254,7 +17692,7 @@
"Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17262,89 +17700,85 @@
"Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
"Mohon komit perubahan Anda sebelum Anda gabungkan."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)."
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Lumat komit ke kepala kosong belum didukung"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "menolak menggabungkan riwayat tak terkait"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Memperbarui %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Tidak.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Tidak mungkin untuk maju cepat, batalkan."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Memutar ulang pohon ke asli...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Mencoba strategi penggabungan %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Tidak ada strategi yang menangani penggabungan.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Penggabungan dengan strategi %s gagal.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -17380,15 +17814,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr ""
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr ""
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr ""
@@ -17409,44 +17843,53 @@
msgstr ""
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr ""
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr ""
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr ""
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr ""
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr ""
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opsi>] <sumber>... <tujuan>"
@@ -17474,72 +17917,72 @@
msgid "skip move/rename errors"
msgstr "lewati kesalahan pindah/ganti nama"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "tujuan '%s' bukan direktori"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "sumber jelek"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "tidak dapat memindahkan direktori ke dirinya sendiri"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "tidak dapat memindahkan direktori ke berkas"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "direktori asal kosong"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "bukan dalam kontrol versi"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "terkonflik"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "tujuan ada"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "menimpa '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Tidak dapat menimpa"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "banyak asal untuk target yang sama"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "direktori tujuan tidak ada"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Mengganti nama %s ke %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "gagal mengganti nama '%s'"
@@ -17711,47 +18154,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
@@ -17759,186 +18202,186 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr ""
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr ""
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr ""
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -17946,41 +18389,41 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
@@ -18027,357 +18470,362 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr ""
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr ""
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr ""
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr ""
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr ""
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18425,7 +18873,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr ""
@@ -18438,44 +18886,48 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "kontrol pengambilan rekursif submodul"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Opsi yang berkaitan dengan penggabungan"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "masukkan perubahan dengan pendasaran ulang daripada penggabungan"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "perbolehkan maju cepat"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "kontrol penggunaan kail pre-merge-commit dan commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "stash/stash pop otomatis sebelum dan sesudah"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Opsi yang berkaitan dengan pengambilan"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "paksa timpa cabang lokal"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "nomor submodul ditarik dalam paralel"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Nilai tidak valid untuk pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -18483,14 +18935,14 @@
"Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja "
"Anda ambil."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Tidak ada kandidat untuk digabungkan diantara referensi yang baru sajaAnda "
"ambil."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18498,7 +18950,7 @@
"Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n"
"cocok pada ujung remote."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18509,43 +18961,43 @@
"satu cabang. Oleh karena ini bukan remote terkonfigurasi asali untuk\n"
"cabang Anda saat ini, Anda harus sebutkan satu cabang pada baris perintah."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Anda tidak berada pada sebuah cabang."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Mohon sebutkan cabang mana yang Anda ingin didasarkan ulang."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Mohon sebutkan cabang mana yang Anda ingin digabungkan."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Lihat git-pull(1) untuk selengkapnya."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<remote>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<cabang>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Tidak ada informasi pelacakan untuk cabang saat ini."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Jika Anda ingin menyetel informasi pelacakan untuk cabang ini Anda bisa "
"melakukannya dengan:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18554,20 +19006,20 @@
"Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n"
"dari remote, tapi tidak ada referensi seperti itu yang diambil."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "Tidak dapat mengakses komit %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -18579,9 +19031,10 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Menarik tanpa menyebutkan cara merujukkan cabang yang berlainan tidak\n"
-"disarankan. Anda dapat mematikan pesan ini dengan menjalankan salah\n"
-"satu perintah berikut sebelum penarikan berikutnya:\n"
+"Anda punya cabang-cabang yang berlainan dan perlu menyebutkan cara\n"
+"merujukkannya.\n"
+"Anda dapat melakukannya dengan menjalankan salah satu perintah berikut\n"
+"suatu saat sebelum penarikan berikutnya:\n"
"\n"
" git config pull.rebase false # penggabungan (strategi asali)\n"
" git config pull.rebase true # pendasaran ulang\n"
@@ -18592,21 +19045,21 @@
"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
"asali terkonfigurasi untuk setiap invokasi.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke "
"indeks."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "tarik dengan pendasaran ulang"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "mohon komit atau stase itu."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18616,7 +19069,7 @@
"fetch memperbarui kepala cabang saat ini.\n"
"memajukan-cepat pohon kerja Anda dari komit %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18633,15 +19086,23 @@
"$ git reset --hard\n"
"untuk memulihkan."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Tidak dapat maju cepat ke banyak cabang."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
@@ -18817,15 +19278,15 @@
msgid "failed to push some refs to '%s'"
msgstr "gagal dorong beberapa referensi ke '%s'"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repositori"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "dorong semua referensi"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "cermin semua referensi"
@@ -18837,19 +19298,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "paksa pembaruan"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<nama referensi>:<harapan>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "memerlukan nilai lama referensi berada pada nilai saat ini"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
@@ -18857,12 +19318,12 @@
msgid "control recursive pushing of submodules"
msgstr "kontrol dorong rekursif submodul"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "gunakan paket tipis"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program terima paket"
@@ -18876,17 +19337,17 @@
#: builtin/push.c:569
msgid "bypass pre-push hook"
-msgstr "lewati kait pra-dorong"
+msgstr "lewati kail pra-dorong"
#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "dorong tag yang hilang tapi relevan"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "Tandatangan GPG dorong"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "minta transaksi atomik pada sisi remote"
@@ -18997,81 +19458,86 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<berkas>] (--empty | <mirip-pohon 1> [<mirip-pohon 2> <mirip-pohon "
+"3>])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
-msgstr ""
+msgstr "tulis indeks yang dihasilkan ke <berkas>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
-msgstr ""
+msgstr "hanya kosongkan indeks"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
-msgstr ""
+msgstr "Menggabungkan"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
-msgstr ""
+msgstr "lakukan penggabungan selain pembacaan"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr ""
+"penggabungan 3 arah jika tidak ada penggabungan level berkas yang dibutuhkan"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
-msgstr ""
+msgstr "penggabungan 3 arah dengan kehadiran penambahan dan penghapusan"
+
+#: builtin/read-tree.c:129
+msgid "same as -m, but discard unmerged entries"
+msgstr "sama seperti -m, tapi buang entri tak tergabung"
+
+#: builtin/read-tree.c:130
+msgid "<subdirectory>/"
+msgstr "<subdirektori>/"
+
+#: builtin/read-tree.c:131
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "baca pohon ke dalam indeks pada <subdirektori>/"
+
+#: builtin/read-tree.c:134
+msgid "update working tree with merge result"
+msgstr "perbarui pohon kerja dengan hasil penggabungan"
+
+#: builtin/read-tree.c:136
+msgid "gitignore"
+msgstr "gitignore"
#: builtin/read-tree.c:137
-msgid "same as -m, but discard unmerged entries"
-msgstr ""
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "perbolehkan berkas yang diabaikan secara eksplisit untuk ditimpa"
-#: builtin/read-tree.c:138
-msgid "<subdirectory>/"
-msgstr ""
+#: builtin/read-tree.c:140
+msgid "don't check the working tree after merging"
+msgstr "jangan periksa pohon kerja setelah penggabungan"
-#: builtin/read-tree.c:139
-msgid "read the tree into the index under <subdirectory>/"
-msgstr ""
+#: builtin/read-tree.c:141
+msgid "don't update the index or the work tree"
+msgstr "jangan perbarui indeks atau pohon kerja"
-#: builtin/read-tree.c:142
-msgid "update working tree with merge result"
-msgstr ""
-
-#: builtin/read-tree.c:144
-msgid "gitignore"
-msgstr ""
+#: builtin/read-tree.c:143
+msgid "skip applying sparse checkout filter"
+msgstr "lewatkan penerapan saringan checkout tipis"
#: builtin/read-tree.c:145
-msgid "allow explicitly ignored files to be overwritten"
-msgstr ""
-
-#: builtin/read-tree.c:148
-msgid "don't check the working tree after merging"
-msgstr ""
+msgid "debug unpack-trees"
+msgstr "nirkutukan unpack-trees"
#: builtin/read-tree.c:149
-msgid "don't update the index or the work tree"
-msgstr ""
-
-#: builtin/read-tree.c:151
-msgid "skip applying sparse checkout filter"
-msgstr ""
-
-#: builtin/read-tree.c:153
-msgid "debug unpack-trees"
-msgstr ""
-
-#: builtin/read-tree.c:157
msgid "suppress feedback messages"
-msgstr ""
+msgstr "matikan pesan umpan balik"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
-msgstr ""
+msgstr "Anda perlu menguraikan indeks Anda saat ini dulu"
#: builtin/rebase.c:35
msgid ""
@@ -19092,193 +19558,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "daftar todo tidak dapat digunakan: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "tidak dapat membuat %s sementara"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "tidak dapat menandai sebagai interaktif"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "tidak dapat membuat daftar todo"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "basis komit harus diberikan dengan --upstream atau --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opsi>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "simpan komit yang dimulai kosong"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "perbolehkan komit dengan pesan kosong"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "dasarkan ulang komit penggabungan"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "simpan titik cabang sepupu asal "
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "pindahkan komit yang diawali dengan squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "tandatangani komit"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "perlihatkan diffstat apa yang berubah di hulu"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "lanjutkan pendasaran ulang"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "lewatkan komit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sunting daftar todo"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "perlihatkan tambalan saat ini"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "pendekkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "jabarkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "periksa daftar todo"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "susun ulang baris fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "masukkan perintah exec ke dalam daftar todo"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ke"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "batasi revisi"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "lumat ke"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "komit hulu"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nama kepala"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "strategi pendasaran"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opsi strategi"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "cabang atau komit untuk di-checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "nama ke"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "perintah untuk dijalankan"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins tidak ada efek tanpa --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s butuh tulang belakang penggabungan"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "tidak dapat mendapatkan 'ke': '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head tidak valid: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "abaikan allow_rerere_autoupdate yang tak valid: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19293,7 +19610,7 @@
"Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan "
"\"git rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19312,7 +19629,7 @@
"\n"
"Hasilnya git tidak dapat mendasarkan ulang itu."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19321,7 +19638,7 @@
"tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
"dan \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19338,7 +19655,7 @@
" git rebase '<cabang>'.\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19351,183 +19668,193 @@
" git branch --set-upstream-to=%s/<cabang> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "perintah exec tidak dapat berisi baris baru"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "perintah exec kosong"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "gunakan merge-base hulu dan cabang sebagai dasar saat ini"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
-msgstr "perbolehkan hook pre-rebase untuk dijalankan"
+msgstr "perbolehkan kail pre-rebase untuk dijalankan"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "diam. menyiratkan --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "perlihatkan diffstat apa yang berubah di hulu"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "jangan perlihatkan diffstat apa yang berubah di hulu"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "tambahkan trailer Signed-off-by ke setiap komit"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "sinonim dari --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "lewatkan ke 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "abaikan perubahan spasi"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "petik ceri semua komit, bahkan jika tak berubah"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "lanjutkan"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "lewatkan tambalan saat ini dan lanjutkan"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "hentikan dan check out cabang asli"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "hentikan tapi simpan HEAD dimana itu berada"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "sunting daftar todo selama pendasaran ulang interaktif"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "gunakan strategi penerapan ke pendasaran ulang"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "gunakan strategi penggabungan ke pendasaran ulang"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "bagaimana cara menangani komit yang menjadi kosong"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "simpan komit yang dimulai kosong"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr ""
"tambahkan baris exec setelah setiap komit dari daftar yang bisa disunting"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "gunakan strategi penggabungan yang diberikan"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opsi"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "lewatkan argumen ke strategi penggabungan"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "dasarkan ulang semua komit yang bisa dicapai hingga ke akar"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges usang. Gunakan --rebase-merges sebagai gantinya."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges digantikan oleh --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Tidak dapat membaca HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19535,16 +19862,16 @@
"Anda harus menyunting semua konflik penggabungan lalu\n"
"tandai itu sebagai terselesaikan menggunakan git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "tidak dapat menyingkirkan perubahan pohon kerja"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "tidak dapt memindahkan kembali ke %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19565,144 +19892,133 @@
"dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n"
"sesuatu yang berharga di sana.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "tombol `C' harap nilai numerik"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode tidak dikenal: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy butuh --merge atau --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec butuh --exec atau --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "tidak dapat menggabungkan '--preserve-merges' dengan '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: tidak dapat menggabungkan '--preserve-merges' dengan '--reschedule-"
-"failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "hulu tidak valid '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "tidak dapat membuat komit akar baru"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': butuh tepatnya satu dasar penggabungan"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Tidak menunjuk pada komit yang valid '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: tidak ada cabang/komit seperti '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "tidak ada cabang/komit seperti '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Tidak ada referensi seperti: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Mohon komit atau stase itu."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "tidak dapat mengganti ke %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD terbaru."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Cabang saat ini %s terbaru.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD terbaru, pendasaran ulang dipaksa."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Cabang saat ini %s terbaru, pendasaran ulang dipaksa.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
-msgstr "Hook pre-rebase menolak mendasarkan ulang."
+msgstr "Kail pre-rebase menolak mendasarkan ulang."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Perubahan unuk %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Perubahan dari %s ke %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Pertama, memutar ulang kepala untuk memainkan ulang karya Anda diatas "
"itu...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Tidak dapat melepas HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Maju-cepat %s ke %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
-msgstr ""
+msgstr "git receive-pack <direktori git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19718,8 +20034,20 @@
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
+"Secara asali, memperbarui cabang saat ini di dalam repositori non-bare\n"
+"tidak diperbolehkan, karena akan membuat indeks dan pohon kerja inkonsisten\n"
+"dengan yang Anda dorong, dan akan memerlukan 'git reset --hard' untuk\n"
+"mencocokkan pohon kerja dengan HEAD.\n"
+"\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyCurrentBranch' ke\n"
+"'ignore' atau 'warn' di repositori remote untuk memperbolehkan dorong ke\n"
+"cabang saat itu; tetapi tidak disarankan kecuali Anda dapat memperbarui\n"
+"pohon kerjanya agar cocok dengan apa yang Anda dorong dengan cara lain.\n"
+"\n"
+"Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
+"variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -19730,14 +20058,22 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
+"Secara asali, menghapus cabang saat ini tidak diperbolehkan, karena\n"
+"'git clone' selanjutnya tidak berujung pada berkas apapun ter-checkout,\n"
+"dan mengakibatkan kebingungan.\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyDeleteCurrent' ke\n"
+"'warn' atau 'ignore' di dalam repositori remote untuk memperbolehkan\n"
+"menghapus cabang saat ini, dengan atau tanpa pesan peringatan.\n"
+"\n"
+"Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
-msgstr ""
+msgstr "diam"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
-msgstr ""
+msgstr "Anda harus menyebutkan sebuah direktori."
#: builtin/reflog.c:17
msgid ""
@@ -19745,54 +20081,59 @@
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<refs>..."
msgstr ""
+"git reflog expire [--expire=<waktu>] [--expire-unreachable=<waktu>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<referensi>..."
#: builtin/reflog.c:22
msgid ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<refs>..."
msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<referensi>..."
#: builtin/reflog.c:25
msgid "git reflog exists <ref>"
-msgstr ""
+msgstr "git reflog exists <referensi>"
#: builtin/reflog.c:568 builtin/reflog.c:573
#, c-format
msgid "'%s' is not a valid timestamp"
-msgstr ""
+msgstr "'%s' bukan stempel waktu valid"
#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
-msgstr ""
+msgstr "Menandai objek yang bisa dicapai..."
#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
-msgstr ""
+msgstr "%s tidak menunjuk ke apapun!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
-msgstr ""
+msgstr "tidak ada log referensi yang disebutkan untuk dihapus"
#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
-msgstr ""
+msgstr "bukan sebuah log referensi: %s"
#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
-msgstr ""
+msgstr "tidak ada log referensi untuk '%s'"
#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
-msgstr ""
+msgstr "format referensi tidak valid: %s"
#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
+msgstr "git reflog [ show | expire | delete | exists ]"
#: builtin/remote.c:17
msgid "git remote [-v | --verbose]"
@@ -19926,7 +20267,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "menyebutkan cabang untuk dilacak hanya masuk akal dengan cermin ambil"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "remote %s sudah ada"
@@ -19936,25 +20277,30 @@
msgid "Could not setup master '%s'"
msgstr "Tidak dapat mengatur master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr ""
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Tidak dapat mendapatkan peta pengambilan untuk spek referensi %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(sepadan)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(hapus)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "tidak dapat menyetel '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19965,17 +20311,17 @@
"\t%s:%d\n"
"sekarang menamai remote yang tiada '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Tidak ada remote seperti: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19986,17 +20332,17 @@
"\t%s\n"
"\tMohon perbarui konfigurasi secara manual bila diperlukan."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "menghapus '%s' gagal"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "membuat '%s' gagal"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20010,120 +20356,120 @@
"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
"untuk menghapus itu, gunakan:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Tidak dapat menghapus bagian konfigurasi '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " dilacak"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " basi (gunakan 'git remote prune' untuk hapus)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"branch.%s.merge tidak valid; tidak dapat mendasarkan ulang ke lebih dari "
"satu cabang"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "dasarkan ulang secara interaktif ke remote %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "dasarkan ulang ke remote %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " gabungkan dengan remote %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "gabungkan dengan remote %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s dan dengan remote %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "buat"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "hapus"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "terbaru"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "bisa dimaju cepat"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "lokal kuno"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s memaksa untuk %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s mendorong ke %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s memaksa untuk %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s mendorong ke %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "jangan tanyakan remote"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* remote %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL pengambilan: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(tidak ada URL)"
@@ -20131,326 +20477,348 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL pendorongan: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Cabang HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(tidak ditanyakan)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(tidak diketahui)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Cabang HEAD (HEAD remote ambigu, bisa jadi salah satu dari yang berikut):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Cabang remote:%s"
msgstr[1] " Cabang remote:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (status tidak ditanyakan)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Cabang lokal dikonfigurasi untuk 'git pull':"
msgstr[1] " Cabang lokal dikonfigurasi untuk 'git pull':"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referensi lokal yang akan dicerminkan oleh 'git push'"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referensi lokal dikonfigurasi untuk 'git push'%s:"
msgstr[1] " Referensi lokal dikonfigurasi untuk 'git push'%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setel refs/remotes/<nama>/HEAD tergantung remote"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "hapus refs/remotes/<nama>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Tidak dapat menentukan HEAD remote"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Banyak cabang HEAD remote. Mohon pilih satu secara eksplisit dengan:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Tidak dapat menghapus %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Bukan referensi valid: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Tidak dapat mengatur %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s akan menjadi teruntai!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s telah menjadi teruntai!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Memangkas %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [akan pangkas] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [dipangkas] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "pangkas remote setelah pengambilan"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Tidak ada remote seperti '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "tambah cabang"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "tidak ada remote yang disebutkan"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "tanyakan URL pendorongan daripada URL pengambilan"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "kembalikan semua URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipulasi URL pendorongan"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "tambah URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "hapus URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete tidak masuk akal"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "pola URL lama tidak valid: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Tidak ada URL yang ditemukan seperti: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Tidak akan hapus semua URL non-dorong"
-#: builtin/repack.c:26
-msgid "git repack [<options>]"
-msgstr ""
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah"
-#: builtin/repack.c:31
+#: builtin/repack.c:28
+msgid "git repack [<options>]"
+msgstr "git repack [<opsi>]"
+
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
+"Pengepakan ulang tambahan tidak kompatibel dengan indeks bitmap. Gunakan\n"
+" --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
-msgstr ""
+msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
+"tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
-msgstr ""
+msgstr "tidak dapat membuka indeks untuk %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
-msgstr ""
+msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
-msgstr ""
-
-#: builtin/repack.c:460
-msgid "pack everything in a single pack"
-msgstr ""
-
-#: builtin/repack.c:462
-msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
-
-#: builtin/repack.c:465
-msgid "remove redundant packs, and run git-prune-packed"
-msgstr ""
-
-#: builtin/repack.c:467
-msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:469
-msgid "pass --no-reuse-object to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:471
-msgid "do not run git-update-server-info"
-msgstr ""
-
-#: builtin/repack.c:474
-msgid "pass --local to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:476
-msgid "write bitmap index"
-msgstr ""
-
-#: builtin/repack.c:478
-msgid "pass --delta-islands to git-pack-objects"
-msgstr ""
-
-#: builtin/repack.c:479
-msgid "approxidate"
-msgstr ""
-
-#: builtin/repack.c:480
-msgid "with -A, do not loosen objects older than this"
-msgstr ""
-
-#: builtin/repack.c:482
-msgid "with -a, repack unreachable objects"
-msgstr ""
-
-#: builtin/repack.c:484
-msgid "size of the window used for delta compression"
-msgstr ""
-
-#: builtin/repack.c:485 builtin/repack.c:491
-msgid "bytes"
-msgstr ""
-
-#: builtin/repack.c:486
-msgid "same as the above, but limit memory size instead of entries count"
-msgstr ""
-
-#: builtin/repack.c:488
-msgid "limits the maximum delta depth"
-msgstr ""
-
-#: builtin/repack.c:490
-msgid "limits the maximum number of threads"
-msgstr ""
-
-#: builtin/repack.c:492
-msgid "maximum size of each packfile"
-msgstr ""
-
-#: builtin/repack.c:494
-msgid "repack objects in packs marked with .keep"
-msgstr ""
+msgstr "pak %s terlalu besar untuk digulung"
#: builtin/repack.c:496
-msgid "do not repack this pack"
-msgstr ""
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis"
-#: builtin/repack.c:498
-msgid "find a geometric progression with factor <N>"
-msgstr ""
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "tidak dapat menutup berkas sementara jepretan referensi"
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
-msgstr ""
+#: builtin/repack.c:628
+msgid "pack everything in a single pack"
+msgstr "pak semuanya dalam satu pak"
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
+#: builtin/repack.c:630
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
+#: builtin/repack.c:633
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
+
+#: builtin/repack.c:635
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
+
+#: builtin/repack.c:637
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "lewatkan --no-reuse-object ke git-pack-objects"
#: builtin/repack.c:639
-msgid "Nothing new to pack."
-msgstr ""
+msgid "do not run git-update-server-info"
+msgstr "jangan jalankan git-update-server-info"
-#: builtin/repack.c:669
+#: builtin/repack.c:642
+msgid "pass --local to git-pack-objects"
+msgstr "lewatkan --local ke git-pack-objects"
+
+#: builtin/repack.c:644
+msgid "write bitmap index"
+msgstr "tulis indeks bitmap"
+
+#: builtin/repack.c:646
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "lewatkan --delta-islands ke git-pack-objects"
+
+#: builtin/repack.c:647
+msgid "approxidate"
+msgstr "tanggal aproksimasi"
+
+#: builtin/repack.c:648
+msgid "with -A, do not loosen objects older than this"
+msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
+
+#: builtin/repack.c:650
+msgid "with -a, repack unreachable objects"
+msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
+
+#: builtin/repack.c:652
+msgid "size of the window used for delta compression"
+msgstr "ukuran jendela yang digunakan untuk kompresi delta"
+
+#: builtin/repack.c:653 builtin/repack.c:659
+msgid "bytes"
+msgstr "bita"
+
+#: builtin/repack.c:654
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"sama seperti yang diatas, tetapi batasi penggunaan memori daripada hitungan "
+"entri"
+
+#: builtin/repack.c:656
+msgid "limits the maximum delta depth"
+msgstr "batasi kedalaman delta maksimum"
+
+#: builtin/repack.c:658
+msgid "limits the maximum number of threads"
+msgstr "batasi jumlah utas maksimum"
+
+#: builtin/repack.c:660
+msgid "maximum size of each packfile"
+msgstr "ukuran maksimum setiap berkas pak"
+
+#: builtin/repack.c:662
+msgid "repack objects in packs marked with .keep"
+msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
+
+#: builtin/repack.c:664
+msgid "do not repack this pack"
+msgstr "jangan pak ulang pak ini"
+
+#: builtin/repack.c:666
+msgid "find a geometric progression with factor <N>"
+msgstr "temukan deret geometri dengan faktor <N>"
+
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "tulis indeks multipak dari pak yang dihasilkan"
+
+#: builtin/repack.c:678
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
+
+#: builtin/repack.c:682
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable dan -A tidak kompatibel"
+
+#: builtin/repack.c:713
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric tidak kompatibel dengan -A, -a"
+
+#: builtin/repack.c:825
+msgid "Nothing new to pack."
+msgstr "Tidak ada yang baru untuk dipak."
+
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
-msgstr ""
+msgstr "berkas yang diperlukan hilang: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
-msgstr ""
+msgstr "tidak dapat membatal taut: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -20748,92 +21116,92 @@
msgid "keep"
msgstr "simpan"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Anda tidak punya HEAD yang valid."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Gagal menemukan pohon HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gagal menemukan pohon dari %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD sekarang pada %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "diam, hanya laporkan kesalahan"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "setel ulang HEAD dan indeks"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "hanya setel ulang HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "setel ulang HEAD, indeks dan pohon kerja"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "setel ulang HEAD tapi simpan perubahan lokal"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Tidak dapat lakukan reset %s dengan jalur."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N hanya dapat digunakan dengan --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Perubahan tak tergelar setelah setel ulang:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -20846,58 +21214,58 @@
"Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n"
"reset.quiet ke true untuk membuat hal tersebut asali.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Tidak dapat menulis berkas indeks baru."
#: builtin/rev-list.c:541
msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
+msgstr "tidak dapat menggabungkan --exclude-promisor-objects dan --missing"
#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
-msgstr ""
+msgstr "penyaringan objek memerlukan --objects"
#: builtin/rev-list.c:674
msgid "rev-list does not support display of notes"
-msgstr ""
+msgstr "rev-list tidak mendukung penampilan catatan"
#: builtin/rev-list.c:679
msgid "marked counting is incompatible with --objects"
-msgstr ""
+msgstr "penghitungan tertanda tidak kompatibel dengan --objects"
#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr ""
+msgstr "git rev-parse --parseopt [<opsi>] -- [<argumen>...]"
#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
-msgstr ""
+msgstr "tetap `--` dilewatkan sebagai argumen"
#: builtin/rev-parse.c:416
msgid "stop parsing after the first non-option argument"
-msgstr ""
+msgstr "hentikan penguraian setelah argumen non-opsi pertama"
#: builtin/rev-parse.c:419
msgid "output in stuck long form"
-msgstr ""
+msgstr "keluarkan dalam bentuk lengket panjang"
#: builtin/rev-parse.c:438
msgid "premature end of input"
-msgstr ""
+msgstr "akhir masukan prematur"
#: builtin/rev-parse.c:442
msgid "no usage string given before the `--' separator"
-msgstr ""
+msgstr "tidak ada untai penggunaan yang diberikan sebelum pemisah `--'"
#: builtin/rev-parse.c:548
msgid "Needed a single revision"
-msgstr ""
+msgstr "Butuh satu revisi"
#: builtin/rev-parse.c:552
msgid ""
@@ -20907,50 +21275,55 @@
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
+"git rev-parse --parseopt [<opsi>] -- [<argumen>...]\n"
+" atau: git rev-parse --sq-quote [<argumen>...]\n"
+" atau: git rev-parse [<opsi>] [<argumen>...]\n"
+"Jalankan \"git rev-parse --parseopt -h\" untuk informasi lebih lanjut pada "
+"penggunaan pertama."
#: builtin/rev-parse.c:712
msgid "--resolve-git-dir requires an argument"
-msgstr ""
+msgstr "--resolve-git-dir butuh sebuah argumen"
#: builtin/rev-parse.c:715
#, c-format
msgid "not a gitdir '%s'"
-msgstr ""
+msgstr "bukan sebuah gitdir '%s'"
#: builtin/rev-parse.c:739
msgid "--git-path requires an argument"
-msgstr ""
+msgstr "--git-path buth sebuah argumen"
#: builtin/rev-parse.c:749
msgid "-n requires an argument"
-msgstr ""
+msgstr "-n butuh sebuah argumen"
#: builtin/rev-parse.c:763
msgid "--path-format requires an argument"
-msgstr ""
+msgstr "--path-format butuh sebuah argumen"
#: builtin/rev-parse.c:769
#, c-format
msgid "unknown argument to --path-format: %s"
-msgstr ""
+msgstr "argumen ke --path-format tidak dikenal: %s"
#: builtin/rev-parse.c:776
msgid "--default requires an argument"
-msgstr ""
+msgstr "--default butuh sebuah argumen"
#: builtin/rev-parse.c:782
msgid "--prefix requires an argument"
-msgstr ""
+msgstr "--prefix butuh sebuah argumen"
#: builtin/rev-parse.c:851
#, c-format
msgid "unknown mode for --abbrev-ref: %s"
-msgstr ""
+msgstr "mode untuk --abbrev-ref tidak dikenal: %s"
#: builtin/rev-parse.c:1023
#, c-format
msgid "unknown mode for --show-object-format: %s"
-msgstr ""
+msgstr "mode untuk --show-object-format tidak dikenal: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
@@ -21026,15 +21399,19 @@
msgid "preserve initially empty commits"
msgstr "pertahankan komit kosong awal"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "perbolehkan komit dengan pesan kosong"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "simpan komit kosong mubazir"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "pembalikan gagal"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "pemetikan ceri gagal"
@@ -21084,69 +21461,73 @@
msgstr[0] "berkas berikut punya modifikasi lokal:"
msgstr[1] "berkas berikut punya modifikasi lokal:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "jangan daftar berkas terhapus"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "hanya hapus dari indeks"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "timpa pemeriksaan terbaru"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "perbolehkan penghapusan rekursif"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "keluar dengan nol bahkan jika tidak ada yang cocok"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
"Tidak ada spek jalur yang diberikan. Berkas mana yang harusnya saya hapus?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tidak menghapus '%s' secara rekursif tanpa -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: tidak dapat menghapus %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>\n"
+"] [--verbose] [--thin] [--atomic]\n"
+" [<tuan rumah>:]<direktori> (--all | <referensi>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
-msgstr ""
+msgstr "nama remote"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
-msgstr ""
+msgstr "gunakan protokol RPC nirkeadaan"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
-msgstr ""
+msgstr "baca referensi dari masukan standar"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
-msgstr ""
+msgstr "cetak status dari pembantu remote"
#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
@@ -21201,21 +21582,21 @@
msgid "group by field"
msgstr "kelompokkan oleh bidang"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "terlalu banyak argumen diberikan di luar repositori"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
+" [--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21228,116 +21609,116 @@
msgstr[0] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi"
msgstr[1] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "tidak ada referensi yang cocok dengan %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "perlihatkan cabang pelacak remote dan lokal"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "perlihatkan cabang pelacak remote"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "warna '*!+-' bersesuaian pada cabang"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "perlihatkan <n> komit lagi setelah nenek moyang yang sama"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "sinonim untuk more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "sembunyikan untai penamaan"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "masukkan cabang saat ini"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "namai komit dengan nama objeknya"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "perlihatkan dasar penggabungan yang mungkin"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr ""
"perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "perlihatkan komit dalam urutan topologis"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "hanya perlihatkan komit yang bukan pada cabang pertama"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "perlihatkan penggabungan yang bisa dicapai hanya dari satu ujung"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "urutkan secara topologis, pelihara urutan tanggal bila memungkinkan"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<dasar>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
"merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "opsi --reflog butuh satu nama cabang"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "hanya %d entri yang bisa diperlihatkan pada satu waktu."
msgstr[1] "hanya %d entri yang bisa diperlihatkan pada satu waktu."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "tidak ada referensi seperti %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "tidak dapat menangani lebih dari %d revisi."
msgstr[1] "tidak dapat menangani lebih dari %d revisi."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' bukan sebuah referensi yang valid."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "tidak dapat menemukan komit %s (%s)"
@@ -21408,70 +21789,82 @@
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr ""
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr ""
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr ""
@@ -21507,7 +21900,7 @@
" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n"
" [--] [<spek jalur>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21537,6 +21930,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
" [--] [<spek jalur>...]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<pesan>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21560,7 +21961,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear dengan argument tak diimplementasikan"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21572,168 +21973,168 @@
" %s -> %s\n"
" untuk buat ruang.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "tidak dapat membuat diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflik dalam indeks. Coba tanpa --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "tidak dapat menyimpan pohon indeks"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Menggabungkan %s dengan %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indeks tak dibatal-stasekan."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "coba membuat ulang indeks"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) dijatuhkan"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Tidak dapat menjatuhkan entri stase"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bukan referensi stase"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Entri stase disimpan jika Anda butuh itu lagi."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Tidak ada nama cabang yang disebutkan"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "gagal menguraikan pohon"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "gagal membongkar pohon"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Tidak dapat memperbarui %s dengan %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "pesan stase"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" butuh satu argumen <komit>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Tidak ada perubahan yang dipilih"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Anda belum punya komit awal"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Tidak dapat menyimpan berkas tak terlacak"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Tidak dapat merekam keadaan pohon kerja"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Tidak dapat menggunakan --patch dan --include-untracked atau --all pada "
"waktu yang bersamaan"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Anda lupa untuk 'git add'?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Tidak ada perubahan lokal untuk disimpan"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Tidak dapat menginisialisasi stase"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Tidak dapat menyimpan status saat ini"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Direktori kerja dan keadaan indeks %s disimpan"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Tidak dapat menghapus perubahaan pohon kerja"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "jaga indeks"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "stase dalam mode tambalan"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "mode hening"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "masukkan berkas tak terlacak ke dalam stase"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "masukkan berkas ignore"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -21757,7 +22158,7 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Mengharapkan nama referensi penuh, dapat %s"
@@ -21771,28 +22172,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "tidak dapat mencopot satu komponen dari url '%s'"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
+"hulu otoritatif tersendiri."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "jangkar alternatif untuk jalur relatif"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ""
-"Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules"
+msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Memasuki '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -21801,7 +22209,7 @@
"run_command mengembalikan status bukan nol untuk %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -21812,77 +22220,68 @@
"bersarang %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "rekursi ke dalam submodul bersarang"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
"git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
-"hulu otoritatif tersendiri."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "sembunyikan keluaran menginisialisasi submodul"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opsi>] [<jalur>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gagal merekursi ke dalam submodul '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "sembunyikan keluaran status submodul"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -21890,96 +22289,96 @@
"gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <jalur>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodul)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodul)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "tidak dapat hash objek dari '%s'"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "mode tidak diharapkan %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "batasi ukuran ringkasan"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "tidak dapat mengambil revisi untuk HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached dan --files saling eksklusif"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Mensinkronisasi url submodul untuk '%s'\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gagal memperbarui remote untuk submodul '%s'"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "sembunyikan keluaran mensinkronisasi url submodul"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21988,7 +22387,7 @@
"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
"benar-benar ingin menghapus itu termasuk semua riwayatnya)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21997,46 +22396,46 @@
"Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
"menyingkirkan itu"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Direktori '%s' dibersihkan\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "tidak dapat membuat direktori submodul kosong %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "batal daftar semua submodul"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22048,68 +22447,68 @@
" itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
"kloning degan '--reference-if-able' daripada '--reference'."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "direktori tidak kosong: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "di mana submodul baru akan dikloning"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "nama submodul baru"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "url di mana submodul dikloning"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "kedalaman untuk kloning dangkal"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "paksa perkembangan kloning"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22119,82 +22518,180 @@
"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
"<url> --path <jalur>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Jalur submodul '%s' tidak diinisialisasi"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Melewati submodul tak tergabung %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Melewati submodul '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Tidak dapat men-checkout '%s' pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Eksekusi '%s %s' gagal di jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Jalur submodul '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Tidak dapat mengambil di dalam jalur submodul '%s'; mencoba mengambil "
+"langsung %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
+"Pengambilan langsung komit tersebut gagal."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "jalur ke dalam pohon kerja"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "pekerjaan paralel"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "jangan cetak perkembangan pengkloningan"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "nilai jelek untuk parameter pembaruan"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+"sembunyikan keluaran untuk pembaruan oleh pendasaran ulang atau penggabungan"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "paksa pembaruan checkout"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "jangan ambil objek baru dari situs remote"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "timpa mode pembaruan jika repositori adalah kloning segar"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "kedalaman untuk pengambilan dangkal"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 diharapkan oleh proyek super"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 dari HEAD submodul"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<opsi>] <jalur>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22203,181 +22700,227 @@
"Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
"super, tapi proyek super tidak pada cabang apapun"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "rekursi ke dalam submodul"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "batal setel konfigurasi dalam berkas .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nama> [<nilai>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nama>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "sembunyikan keluaran penyetelan url submodule"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "setel cabang pelacak asali ke master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "setel cabang pelacak asali"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch atau --default dibutuhkan"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch dan --default saling eksklusif"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' sudah ada dan bukan repo git valid"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada "
"mengkloning lagi dari\n"
" %s\n"
-"gynakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
-"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi "
-"'--name'.\n"
+"gunakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
+"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
+"name'."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Tidak dapat men-checkout submodul '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "cabang repositori untuk di-checkout saat kloning"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Tidak dapat menambahkan submodul '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Gagal mendaftarkan jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' sudah ada di dalam indeks"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' sudah ada di dalam indeks dan bukan submodul"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "cabang repositori untuk ditambahkan sebagai submodul"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "perbolehkan menambah jalur submodul yang diabaikan"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<opsi>...] --url <url> --path <path> "
-"--name <nama>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "hanya cetak pesan kesalahan"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "pinjam objek dari repositori referensi"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Jalur relatif hanya dapat digunakan dari level atas dari pohon kerja"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' bukan nama submodul yang valid"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s tidak mendukung --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' bukan subperintah submodule--helper valid"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
+msgstr "git symbolic-ref [<opsi>] <nama> [<referensi>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
+msgstr "git symbolic-ref -d [-q] <nama>"
#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
+msgstr "matikan pesan kesalahan untuk referensi non-simbolik (terlepas)"
#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
-msgstr ""
+msgstr "hapus referensi simbolik"
#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
-msgstr ""
+msgstr "pendekkan keluaran referensi"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
-msgstr ""
+msgstr "alasan"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
-msgstr ""
+msgstr "alasan pembaruan"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n"
-"\t\t<nama tag> [<kepala>]"
+" <nama tag> [<kepala>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -22387,12 +22930,13 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<angka>]] [--contains <komit>] [--no-contains <komit>] [--"
"points-at <objek>]\n"
-"\t\t[--format=<format>] [--merged <komit>] [--no-merged <komit>] [<pola>...]"
+" [--format=<format>] [--merged <komit>] [--no-merged <komit>] "
+"[<pola>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22458,130 +23002,130 @@
msgid "bad object type."
msgstr "tipe objek jelek."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "tidak ada pesan tag?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Pesan tag dibiarkan di %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "daftarkan nama tag"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "cetak <n> baris dari setiap pesan tag"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "hapus tag"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "verifikasi tag"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opsi pembuatan tag"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "tag bercatat, butuh sebuah pesan"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "pesan tag"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "paksa sunting pesan tag"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "tag bercatat dan bertandatangan GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "gunakan kunci yang lain untuk menandatangani tag"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "ganti tag jika ada"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "buat log referensi"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opsi daftar tag"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "perlihatkan daftar tag dalam kolom"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "hanya cetak tag yang berisi komit"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "hanya cetak tag yang tidak berisi komit"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "hanya cetak tag yang tergabung"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "hanya cetak tag yang tak tergabung"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "hanya cetak tag dari objek"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column dan -n tidak kompatibel"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "opsi -n hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "opsi --contains hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "hanya satu opsi -F atau -m yang diperbolehkan."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' bukan nama tag yang valid."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' sudah ada"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' diperbarui (yaitu %s)\n"
@@ -22593,273 +23137,282 @@
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr ""
+msgstr "gagal membuat direktori %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
-msgstr ""
+msgstr "gagal menghapus berkas %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
-msgstr ""
+msgstr "gagal menghapus direktori %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
-msgstr ""
+msgstr "Menguji mtime di '%s' "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan berkas baru"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan direktori baru"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
-msgstr ""
+msgstr "info stat direktori berubah setelah memperbarui berkas"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
+"info stat direktori berubah setelah menambahkan berkas di dalam subdirektori"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus berkas"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus direktori"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
-msgstr ""
+msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
+msgstr "git update-index [<opsi>] [--] [<berkas>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
-msgstr ""
+msgstr "lanjutkan penyegaran bahkan ketika indeks perlu diperbarui"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
-msgstr ""
+msgstr "refresh: abaikan submodul"
+
+#: builtin/update-index.c:980
+msgid "do not ignore new files"
+msgstr "jangan abaikan berkas baru"
#: builtin/update-index.c:982
-msgid "do not ignore new files"
-msgstr ""
+msgid "let files replace directories and vice-versa"
+msgstr "biarkan berkas menggantikan direktori dan sebaliknya"
#: builtin/update-index.c:984
-msgid "let files replace directories and vice-versa"
-msgstr ""
+msgid "notice files missing from worktree"
+msgstr "catat berkas hilang dari pohon kerja"
#: builtin/update-index.c:986
-msgid "notice files missing from worktree"
-msgstr ""
-
-#: builtin/update-index.c:988
msgid "refresh even if index contains unmerged entries"
-msgstr ""
+msgstr "segarkan bahkan jika indeks berisi entri tak tergabung"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
-msgstr ""
+msgstr "segarkan informasi stat"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
+msgstr "seperti --refresh, tapi abaikan setelan assume-unchanged"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
-msgstr ""
+msgstr "<mode>,<objek>,<jalur>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
-msgstr ""
+msgstr "tambahkan entri yang disebutkan ke indeks"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
-msgstr ""
+msgstr "tandai berkas sebagai \"not changing\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
-msgstr ""
+msgstr "bersihkan bita assumed-unchanged"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
-msgstr ""
+msgstr "tandai berkas sebagai \"index-only\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
-msgstr ""
+msgstr "bersihkan bita skip-worktree"
+
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "jangan sentuh entri index-only"
#: builtin/update-index.c:1022
-msgid "do not touch index-only entries"
-msgstr ""
+msgid "add to index only; do not add content to object database"
+msgstr "hanya tambahkan ke indeks; jangan tambahkan konten ke basis data objek"
#: builtin/update-index.c:1024
-msgid "add to index only; do not add content to object database"
-msgstr ""
+msgid "remove named paths even if present in worktree"
+msgstr "hapus jalur bernama bahkan jika ada dalam pohon kerja"
#: builtin/update-index.c:1026
-msgid "remove named paths even if present in worktree"
-msgstr ""
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "dengan --stdin: baris masukan diakhiri dengan bita null"
#: builtin/update-index.c:1028
-msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
-
-#: builtin/update-index.c:1030
msgid "read list of paths to be updated from standard input"
-msgstr ""
+msgstr "baca daftar jalur yang akan diperbarui dari masukan standar"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
-msgstr ""
+msgstr "tambahkan entri dari masukan standar ke indeks"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
+msgstr "populasi ulang tahapan #2 dan #3 untuk jalur yang terdaftar"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
-msgstr ""
+msgstr "hanya perbarui entri yang berbeda dari HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
-msgstr ""
+msgstr "abaikan berkas yang hilang dari pohon kerja"
+
+#: builtin/update-index.c:1047
+msgid "report actions to standard output"
+msgstr "laporkan aksi ke keluaran standar"
#: builtin/update-index.c:1049
-msgid "report actions to standard output"
-msgstr ""
-
-#: builtin/update-index.c:1051
msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
+msgstr "(untuk porselen) lupakan konflik tak terselesaikan yang disimpan"
+
+#: builtin/update-index.c:1053
+msgid "write index in this format"
+msgstr "tulis indeks dalam format ini"
#: builtin/update-index.c:1055
-msgid "write index in this format"
-msgstr ""
+msgid "enable or disable split index"
+msgstr "aktifkan atau nonaktifkan indeks terpisah"
#: builtin/update-index.c:1057
-msgid "enable or disable split index"
-msgstr ""
+msgid "enable/disable untracked cache"
+msgstr "aktifkan/nonaktifkan tembolok tak terlacak"
#: builtin/update-index.c:1059
-msgid "enable/disable untracked cache"
-msgstr ""
+msgid "test if the filesystem supports untracked cache"
+msgstr "uji jika sistem berkas mendukung tembolok tak terlacak"
#: builtin/update-index.c:1061
-msgid "test if the filesystem supports untracked cache"
-msgstr ""
+msgid "enable untracked cache without testing the filesystem"
+msgstr "aktifkan tembolok tak terlacak tanpa menguji sistem berkas"
#: builtin/update-index.c:1063
-msgid "enable untracked cache without testing the filesystem"
-msgstr ""
+msgid "write out the index even if is not flagged as changed"
+msgstr "tulis indeks bahkan jika tidak dianggap berubah"
#: builtin/update-index.c:1065
-msgid "write out the index even if is not flagged as changed"
-msgstr ""
+msgid "enable or disable file system monitor"
+msgstr "aktifkan atau nonaktifkan monitor sistem berkas"
#: builtin/update-index.c:1067
-msgid "enable or disable file system monitor"
-msgstr ""
-
-#: builtin/update-index.c:1069
msgid "mark files as fsmonitor valid"
-msgstr ""
+msgstr "tandai berkas sebagai fsmonitor valid"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
-msgstr ""
+msgstr "bersihkan bita fsmonitor valid"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
+"core.splitIndex disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan indeks terpisah"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
+"core.splitIndex disetel ke true; hapus atau ubah, jika Anda benar-benar "
+"ingin menonaktifkan indeks terpisah"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
+"core.untrackedCache disetel ke true; hapus atau ubah, jika Anda benar-benar "
+"ingin menonaktifkan tembolok tak terlacak"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
-msgstr ""
+msgstr "Tembolok tak terlacak dinonaktifkan"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
+"core.untrackedCache disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan tembolok tak terlacak"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr ""
+msgstr "Tembolok tak terlacak diaktifkan untuk '%s'"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
+"core.fsmonitor tak disetel; setel jika Anda benar-benar ingin mengaktifkan "
+"fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor diaktifkan"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
+"core.fsmonitor disetel; hapus jika Anda benar-benar ingin menonaktifkan "
+"fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor dinonaktifkan"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
+msgstr "git update-ref [<opsi>] -d <nama referensi> [<nilai lama>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
+"git update-ref [<opsi>] <nama referensi> <nilai baru> [<nilai lama>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
+msgstr "git update-ref [<opsi>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
-msgstr ""
+msgstr "hapus referensi"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
-msgstr ""
+msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
-msgstr ""
+msgstr "stdin punya argumen yang diakhiri dengan NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
-msgstr ""
+msgstr "baca pembaruan dari masukan standar"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
@@ -22871,343 +23424,338 @@
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr ""
+msgstr "git upload-pack [<opsi>] <direktori>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
-msgstr ""
+msgstr "keluar setelah pertukaran permintaan/jawaban tunggal"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
-
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "layani info/referensi untuk git-http-backend"
#: builtin/upload-pack.c:29
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "jangan coba <direktori>.git/ jika <direktori> bukan direktori Git"
+
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
+msgstr "interupsi transfer setelah <n> detik niraktivitas"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
+msgstr "git verify-commit [-v | --verbose] <komit>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
-msgstr ""
+msgstr "cetak isi komit"
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
-msgstr ""
+msgstr "cetak keluaran status gpg mentah"
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pak>..."
#: builtin/verify-pack.c:70
msgid "verbose"
-msgstr ""
+msgstr "bertele-tele"
#: builtin/verify-pack.c:72
msgid "show statistics only"
-msgstr ""
+msgstr "hanya perlihatkan statistik"
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
-msgstr ""
+msgstr "cetak isi tag"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr ""
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr ""
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr ""
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr ""
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr ""
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr ""
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
+msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
-msgstr ""
+msgstr "<prefiks>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
+msgstr "tulis objek pohon untuk subdirektori <prefiks>"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
-msgstr ""
+msgstr "hanya berguna untuk penirkutuan"
#: git.c:28
msgid ""
@@ -23219,6 +23767,14 @@
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
+"git [--version] [--help] [-C <jalur>] [-c <nama>=<nilai>]\n"
+" [--exec-path[=<jalur>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<jalur>] [--work-tree=<jalur>] [--namespace=<nama>]\n"
+" [--super-prefix=<jalur>] [--config-env=<nama>=<variabel "
+"lingkungan>]\n"
+" <perintah> [<argumen>]"
#: git.c:36
msgid ""
@@ -23227,51 +23783,55 @@
"to read about a specific subcommand or concept.\n"
"See 'git help git' for an overview of the system."
msgstr ""
+"'git help -a' dan 'git help -g' daftar subperintah tersedia dan beberapa\n"
+"panduan konsep. Lihat 'git help <perintah>' atau 'git help <konsep>'\n"
+"untuk baca tentang perintah atau konsep spesifik.\n"
+"Lihat 'git help git' untuk gambaran tentang sistem."
#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
-msgstr ""
+msgstr "tidak ada direktori yang diberikan untuk --git-dir\n"
#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
-msgstr ""
+msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
-msgstr ""
+msgstr "tidak ada direktori yang diberikan untuk --work-tree\n"
#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
-msgstr ""
+msgstr "tidak ada prefiks yang diberikan untuk --super-prefix\n"
#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
-msgstr ""
+msgstr "-c mengharapkan sebuah untai konfigurasi\n"
#: git.c:260
#, c-format
msgid "no config key given for --config-env\n"
-msgstr ""
+msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
#: git.c:300
#, c-format
msgid "no directory given for -C\n"
-msgstr ""
+msgstr "tidak ada direktori yang diberikan untuk -C\n"
#: git.c:326
#, c-format
msgid "unknown option: %s\n"
-msgstr ""
+msgstr "opsi tidak dikenal: %s\n"
#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr ""
+msgstr "ketika memperluas alias '%s': '%s'"
#: git.c:384
#, c-format
@@ -23279,55 +23839,59 @@
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
+"alias '%s' merubah variabel lingkungan.\n"
+"Anda dapat menggunakan '!git' dalam alias untuk melakukannya."
#: git.c:391
#, c-format
msgid "empty alias for %s"
-msgstr ""
+msgstr "alias kosong untuk %s"
#: git.c:394
#, c-format
msgid "recursive alias: %s"
-msgstr ""
+msgstr "alias rekursif: %s"
#: git.c:476
msgid "write failure on standard output"
-msgstr ""
+msgstr "kegagalan menulis pada keluaran standar"
#: git.c:478
msgid "unknown write failure on standard output"
-msgstr ""
+msgstr "kegagal menulis tidak diketahui pada keluaran standar"
#: git.c:480
msgid "close failed on standard output"
-msgstr ""
+msgstr "penutupan gagal pada keluaran standar"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
+msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
-msgstr ""
+msgstr "tidak dapat menangani %s sebagai bawaan"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
+"penggunaan: %s\n"
+"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
+msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr ""
+msgstr "gagal menjalankan perintah '%s': %s\n"
#: http-fetch.c:118
#, c-format
@@ -23371,147 +23935,109 @@
msgid "exit immediately after advertising capabilities"
msgstr ""
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
msgstr ""
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr ""
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr ""
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr ""
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr ""
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr ""
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr ""
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr ""
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr ""
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
msgstr ""
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23524,45 +24050,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr ""
@@ -23570,83 +24101,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr ""
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr ""
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr ""
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr ""
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
@@ -23667,44 +24198,44 @@
msgid "object filtering"
msgstr ""
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr ""
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr ""
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr ""
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr ""
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr ""
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr ""
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr ""
@@ -24388,37 +24919,6 @@
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24457,385 +24957,28 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -24852,44 +24995,28 @@
msgstr ""
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr ""
@@ -25155,35 +25282,35 @@
#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr ""
+msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
#: git-send-email.perl:136 git-send-email.perl:142
msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
+msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
#: git-send-email.perl:214
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
+msgstr "penyunting keluar dengan kotor, membatalkan semua"
#: git-send-email.perl:316
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr ""
+msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
#: git-send-email.perl:321
#, perl-format
msgid "'%s.final' contains the composed email.\n"
-msgstr ""
+msgstr "'%s.final' berisi email yang dibuat.\n"
#: git-send-email.perl:450
msgid "--dump-aliases incompatible with other options\n"
-msgstr ""
+msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
#: git-send-email.perl:525
msgid ""
@@ -25191,46 +25318,52 @@
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
+"fatal: opsi konfigurasi untuk 'sendmail' ditemukan\n"
+"git-send-email dikonfigurasikan dengan opsi sendemail.* - catat 'e'.\n"
+"Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
+"pemeriksaan ini.\n"
#: git-send-email.perl:530 git-send-email.perl:746
msgid "Cannot run git format-patch from outside a repository\n"
-msgstr ""
+msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
#: git-send-email.perl:533
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
+"`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
+"atau opsi konfigurasi)\n"
#: git-send-email.perl:546
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
+msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
#: git-send-email.perl:577
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
-msgstr ""
+msgstr "Setelan --confirm tidak dikenal: '%s'\n"
#: git-send-email.perl:617
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
+msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
#: git-send-email.perl:619
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
+msgstr "peringatan: `:include:` tidak didukung: %s\n"
#: git-send-email.perl:621
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
+msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
#: git-send-email.perl:626
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
+msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
#: git-send-email.perl:711
#, perl-format
@@ -25241,11 +25374,16 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
+"Berkas '%s' ada tetapi bisa jadi itu rentang komit\n"
+"untuk membuat tambalan. Mohon disambiguasi dengan...\n"
+"\n"
+" * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
+" * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
#: git-send-email.perl:732
#, perl-format
msgid "Failed to opendir %s: %s"
-msgstr ""
+msgstr "Gagal membuka direktori %s: %s"
#: git-send-email.perl:767
msgid ""
@@ -25253,16 +25391,19 @@
"No patch files specified!\n"
"\n"
msgstr ""
+"\n"
+"Tidak ada berkas tambalan yang disebutkan!\n"
+"\n"
#: git-send-email.perl:780
#, perl-format
msgid "No subject line in %s?"
-msgstr ""
+msgstr "Tidak ada baris subjek di %s?"
#: git-send-email.perl:791
#, perl-format
msgid "Failed to open for writing %s: %s"
-msgstr ""
+msgstr "Gagal membuka untuk menulis %s: %s"
#: git-send-email.perl:802
msgid ""
@@ -25272,36 +25413,42 @@
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
+"Baris yang diawali dengan \"GIT:\" akan dihapus.\n"
+"Pertimbangkan memasukkan diffstat keseluruhan atau daftar isi\n"
+"untuk tambalan yang Anda tulis.\n"
+"\n"
+"Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
#: git-send-email.perl:826
#, perl-format
msgid "Failed to open %s: %s"
-msgstr ""
+msgstr "Gagal membuka %s: %s"
#: git-send-email.perl:843
#, perl-format
msgid "Failed to open %s.final: %s"
-msgstr ""
+msgstr "Gagal membuka %s.final: %s"
#: git-send-email.perl:886
msgid "Summary email is empty, skipping it\n"
-msgstr ""
+msgstr "Surel rangkuman kosong, lewati\n"
#. TRANSLATORS: please keep [y/N] as is.
#: git-send-email.perl:935
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
+msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
#: git-send-email.perl:990
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
+"Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n"
#: git-send-email.perl:995
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
+msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
#: git-send-email.perl:1003
#, perl-format
@@ -25311,24 +25458,30 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
+"Menolak mengirim karena tambalan\n"
+"\t%s\n"
+"punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
+"benar-benar ingin mengirim.\n"
#: git-send-email.perl:1022
msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
+msgstr "Kepada siapa surel harus dikirim (jika ada)?"
#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
+msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
+"Message-ID yang akan digunakan sebagai In-Reply-To untuk surel pertama (jika "
+"ada)?"
#: git-send-email.perl:1114 git-send-email.perl:1122
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
+msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
@@ -25336,11 +25489,12 @@
#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
+"Apa yang Anda lakukan dengan alamat ini? ([q] keluar|[d] jatuh|[e] sunting): "
#: git-send-email.perl:1446
#, perl-format
msgid "CA path \"%s\" does not exist"
-msgstr ""
+msgstr "Jalur CA \"%s\" tidak ada"
#: git-send-email.perl:1529
msgid ""
@@ -25355,161 +25509,157 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
+" Daftar Cc diatas telah diperluas oleh alamat tambahan\n"
+" yang ditemukan dalam pesan komit tambalan. Secara asali\n"
+" send-email membisiki sebelum mengirim ketika ini terjadi.\n"
+" Perilaku ini dikontrol oleh setelan konfigurasi sendemail.confirm.\n"
+"\n"
+" Untuk informasi lebih lanjut, jalankan 'git send-email --help'.\n"
+" Untuk menjaga perilaku saat ini, tetapi mematikan pesan ini,\n"
+" jalankan 'git config --global sendemail.confirm auto'.\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1544
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr ""
+msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
#: git-send-email.perl:1547
msgid "Send this email reply required"
-msgstr ""
+msgstr "Balasan kirim surel ini diperlukan"
#: git-send-email.perl:1581
msgid "The required SMTP server is not properly defined."
-msgstr ""
+msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
#: git-send-email.perl:1628
#, perl-format
msgid "Server does not support STARTTLS! %s"
-msgstr ""
+msgstr "Peladen tidak mendukung STARTTLS! %s"
#: git-send-email.perl:1633 git-send-email.perl:1637
#, perl-format
msgid "STARTTLS failed! %s"
-msgstr ""
+msgstr "STARTTLS gagal! %s"
#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
+"Tidak dapat menginisialisasi SMTP dengan benar. Periksa konfigurasi dan "
+"gunakan --smtp-debug."
#: git-send-email.perl:1664
#, perl-format
msgid "Failed to send %s\n"
-msgstr ""
+msgstr "Gagal mengirim %s\n"
#: git-send-email.perl:1667
#, perl-format
msgid "Dry-Sent %s\n"
-msgstr ""
+msgstr "Terkirim-kering %s\n"
#: git-send-email.perl:1667
#, perl-format
msgid "Sent %s\n"
-msgstr ""
+msgstr "Terkirim %s\n"
#: git-send-email.perl:1669
msgid "Dry-OK. Log says:\n"
-msgstr ""
+msgstr "OK-kering. Log berkata:\n"
#: git-send-email.perl:1669
msgid "OK. Log says:\n"
-msgstr ""
+msgstr "OK. Log berkata:\n"
#: git-send-email.perl:1688
msgid "Result: "
-msgstr ""
+msgstr "Hasil: "
#: git-send-email.perl:1691
msgid "Result: OK\n"
-msgstr ""
+msgstr "Hasil: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
-msgstr ""
+msgstr "tidak dapat membuka berkas %s"
#: git-send-email.perl:1756 git-send-email.perl:1776
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
#: git-send-email.perl:1762
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
#: git-send-email.perl:1819
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
#: git-send-email.perl:1854
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr ""
+msgstr "(%s) Tidak dapat menjalankan '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
+msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
-msgstr ""
-
-#: git-send-email.perl:2006
-msgid "cannot send message as 7bit"
-msgstr ""
+msgstr "(%s) gagal menutup pipa ke '%s'"
#: git-send-email.perl:2014
-msgid "invalid transfer encoding"
-msgstr ""
+msgid "cannot send message as 7bit"
+msgstr "tidak dapat mengirim pesan sebagai 7bit"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2022
+msgid "invalid transfer encoding"
+msgstr "pengkodean transfer tidak valid"
+
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
+"fatal: %s: ditolak oleh kail sendemail-validate\n"
+"%s\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
-msgstr ""
+msgstr "tidak dapat membuka %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
+"fatal: %s:%d lebih panjang dari 998 karakter\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
+msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr ""
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Sudah terbaru. Ya!"
-
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "dukungan untuk rebase.useBuiltin sudah dihapus!\n"
-#~ "Lihat entri itu di 'git help config' untuk selengkapnya."
+msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
diff --git a/po/it.po b/po/it.po
index 02a8c2b..c315608 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2994,7 +2994,7 @@
#: connected.c:120
msgid "Could not run 'git rev-list'"
-msgstr "Impossibile eseguire 'git-rev-list'"
+msgstr "Impossibile eseguire 'git rev-list'"
#: connected.c:144
msgid "failed write to rev-list"
@@ -18722,7 +18722,7 @@
#: builtin/pull.c:894
msgid "ignoring --verify-signatures for rebase"
-msgstr "ignoro --verify-signature per il rebase"
+msgstr "ignoro --verify-signatures per il rebase"
#: builtin/pull.c:954
msgid "Updating an unborn branch with changes added to the index."
@@ -20073,7 +20073,7 @@
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
"--mirror è pericoloso e deprecato; per favore\n"
-"\t usa invece --mirror-fetch o --mirror-push"
+"\t usa invece --mirror=fetch o --mirror=push"
#: builtin/remote.c:148
#, c-format
diff --git a/po/ko.po b/po/ko.po
index 766d460..5d190e5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1946,7 +1946,7 @@
#: fetch-pack.c:1048
msgid "Server does not support --shallow-since"
-msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다"
+msgstr "서버에서 --shallow-since 옵션을 지원하지 않습니다"
#: fetch-pack.c:1052
msgid "Server does not support --shallow-exclude"
@@ -8384,7 +8384,7 @@
#: builtin/config.c:156
msgid "with --get, use default value when missing entry"
-msgstr "--wget 옵션에서, 해당 항목이 없으면 기본값을 사용합니다"
+msgstr "--get 옵션에서, 해당 항목이 없으면 기본값을 사용합니다"
#: builtin/config.c:332
#, c-format
@@ -12800,7 +12800,7 @@
#: builtin/remote.c:145
#, c-format
msgid "unknown mirror argument: %s"
-msgstr "알 수 없는 --mirror 옵션 인자: %s"
+msgstr "알 수 없는 mirror 옵션 인자: %s"
#: builtin/remote.c:161
msgid "fetch the remote branches"
@@ -13879,7 +13879,7 @@
#: builtin/show-branch.c:634
msgid "synonym to more=-1"
-msgstr "--more=-1 옵션과 동일"
+msgstr "more=-1 옵션과 동일"
#: builtin/show-branch.c:635
msgid "suppress naming strings"
@@ -17858,7 +17858,7 @@
msgstr ""
" 위의 Cc 목록은 패치 커밋 메시지에 들어 있는 추가 주소로\n"
" 확장됩니다. 기본값으로 확장되기 전에 send-email에서\n"
-" 물어봅니다. 이런 동작은 sendmail.confirm 설정에서\n"
+" 물어봅니다. 이런 동작은 sendemail.confirm 설정에서\n"
" 조정할 수 있습니다.\n"
"\n"
" 정보를 더 보려면, 'git send-email --help'를 실행하십시오.\n"
diff --git a/po/pl.po b/po/pl.po
index 6bb665e..0ec127e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -58,58 +58,58 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-02-26 22:09+0800\n"
-"PO-Revision-Date: 2021-02-27 17:10+0100\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-03 11:38+0100\n"
"Last-Translator: Arusekk <arek_koz@o2.pl>\n"
"Language-Team: Polish\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
-" || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 20.12.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 21.08.2\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Hę (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
-#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
-#: builtin/rebase.c:1963
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "nie można odczytać indeksu"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binarne"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nic"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "brak zmian"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualizacja"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "nie można przygotować „%s”"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "nie można zapisać indeksu"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
@@ -117,27 +117,27 @@
msgstr[1] "zaktualizowano %d ścieżki\n"
msgstr[2] "zaktualizowano %d ścieżek\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "uwaga: %s jest teraz nieśledzony.\n"
-#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry nie powiodło się na ścieżce „%s”"
# odwoływanie / wycofywanie
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Odwracanie"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Nie można przetworzyć HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
@@ -145,16 +145,16 @@
msgstr[1] "odwrócono %d ścieżki\n"
msgstr[2] "odwrócono %d ścieżek\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Brak nieśledzonych plików.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Dodaj nieśledzone"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
@@ -162,124 +162,125 @@
msgstr[1] "dodano %d ścieżki\n"
msgstr[2] "dodano %d ścieżek\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "pomijanie niescalonego: %s"
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Zmiany tylko w plikach binarnych.\n"
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Brak zmian.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Aktualizacja łatki"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Przejrzyj zmiany"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "pokaż ścieżkę ze zmianami"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "dodaj stan drzewa roboczego do przygotowanego zestawu zmian"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "przywróć przygotowany zestaw zmian do wersji HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "wybierz skrawki i zaktualizuj wybiórczo"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "wyświetl różnice między HEAD i indeksem"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "dodaj zawartość nieśledzonych plików do przygotowanego zestawu zmian"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Pomoc do zachęty:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "wybierz pojedynczy element"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "wybierz zakres elementów"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "wybierz wiele zakresów"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "wybierz element na podstawie jednoznacznego początku"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "odznacz podane elementy"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "wybierz wszystkie elementy"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(puste) zakończ zaznaczanie"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "wybierz kolejny element"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(puste) nic nie wybieraj"
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Polecenia ***"
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Co teraz"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "przygotowane"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "nieprzygotowane"
-#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "ścieżka"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "nie można odświeżyć indeksu"
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Do zobaczenia.\n"
@@ -581,34 +582,34 @@
"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\n"
-#: add-patch.c:342
+#: add-patch.c:343
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "nie można przetworzyć nagłówka skrawka „%.*s”"
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "nie można przetworzyć nagłówka kolorowego skrawka „%.*s”"
-#: add-patch.c:419
+#: add-patch.c:420
msgid "could not parse diff"
msgstr "nie można przetworzyć różnic"
-#: add-patch.c:438
+#: add-patch.c:439
msgid "could not parse colored diff"
msgstr "nie można przetworzyć kolorowych różnic"
-#: add-patch.c:452
+#: add-patch.c:453
#, c-format
msgid "failed to run '%s'"
msgstr "nie można wykonać „%s”"
-#: add-patch.c:611
+#: add-patch.c:612
msgid "mismatched output from interactive.diffFilter"
msgstr "błędne wyjście z interactive.diffFilter"
-#: add-patch.c:612
+#: add-patch.c:613
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -616,7 +617,7 @@
"Twój filtr musi zachować odpowiedniość jeden do jednego\n"
"między wierszami z wejścia i wyjścia."
-#: add-patch.c:790
+#: add-patch.c:791
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -625,7 +626,7 @@
"oczekiwano wiersza kontekstu nr %d w\n"
"%.*s"
-#: add-patch.c:805
+#: add-patch.c:806
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -638,11 +639,11 @@
"\tnie kończy się na:\n"
"%.*s"
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Tryb ręcznej edycji skrawka — zobacz szybki przewodnik na dole.\n"
-#: add-patch.c:1085
+#: add-patch.c:1086
#, c-format
msgid ""
"---\n"
@@ -656,7 +657,7 @@
"Wiersze zaczynające się od %c zostaną usunięte.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -666,11 +667,11 @@
"zmienić. Jeśli wszystkie wiersze skrawka zostaną usunięte, edycja\n"
"będzie przerwana, a skrawek niezmieniony.\n"
-#: add-patch.c:1132
+#: add-patch.c:1133
msgid "could not parse hunk header"
msgstr "nie można przetworzyć nagłówka skrawka"
-#: add-patch.c:1177
+#: add-patch.c:1178
msgid "'git apply --cached' failed"
msgstr "„git apply --cached” nie powiodło się"
@@ -686,26 +687,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Zmieniony skrawek się nie stosuje. Edytować ponownie (odpowiedź „nie” go "
"porzuci!) [y/n]? "
-#: add-patch.c:1289
+#: add-patch.c:1290
msgid "The selected hunks do not apply to the index!"
msgstr "Wybrane skrawki nie stosują się do indeksu!"
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Zastosować je do drzewa roboczego mimo to? "
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Nic nie zastosowano.\n"
-#: add-patch.c:1354
+#: add-patch.c:1355
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -729,32 +730,32 @@
"e - ręcznie zmień bieżący skrawek\n"
"? - wypisz pomoc\n"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
msgid "No previous hunk"
msgstr "Nie ma poprzedniego skrawka"
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
msgid "No next hunk"
msgstr "Nie ma następnego skrawka"
-#: add-patch.c:1537
+#: add-patch.c:1538
msgid "No other hunks to goto"
msgstr "Nie ma innych skrawków do przejścia"
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "przejść do którego skrawka (<enter> aby zobaczyć więcej)? "
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "przejść do którego skrawka? "
-#: add-patch.c:1560
+#: add-patch.c:1561
#, c-format
msgid "Invalid number: '%s'"
msgstr "Nieprawidłowa liczba: „%s”"
-#: add-patch.c:1565
+#: add-patch.c:1566
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
@@ -762,41 +763,41 @@
msgstr[1] "Niestety dostępne są tylko %d skrawki."
msgstr[2] "Niestety dostępnych jest tylko %d skrawków."
-#: add-patch.c:1574
+#: add-patch.c:1575
msgid "No other hunks to search"
msgstr "Nie ma innych skrawków do wyszukania"
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "wyszukaj wyrażenie regularne? "
-#: add-patch.c:1595
+#: add-patch.c:1596
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Nieprawidłowe wyrażenie regularne %s: %s"
-#: add-patch.c:1612
+#: add-patch.c:1613
msgid "No hunk matches the given pattern"
msgstr "Żaden skrawek nie pasuje do podanego wzorca"
-#: add-patch.c:1619
+#: add-patch.c:1620
msgid "Sorry, cannot split this hunk"
msgstr "Niestety nie można podzielić tego skrawka"
-#: add-patch.c:1623
+#: add-patch.c:1624
#, c-format
msgid "Split into %d hunks."
msgstr "Podzielono na %d skrawków."
-#: add-patch.c:1627
+#: add-patch.c:1628
msgid "Sorry, cannot edit this hunk"
msgstr "Niestety nie można zmienić tego skrawka"
-#: add-patch.c:1679
+#: add-patch.c:1680
msgid "'git apply' failed"
msgstr "„git apply” nie powiodło się"
-#: advice.c:143
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -805,37 +806,37 @@
"\n"
"Wyłącz ten komunikat przez „git config advice.%s false”"
-#: advice.c:159
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%spodpowiedź: %.*s%s\n"
-#: advice.c:250
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Dobieranie nie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:252
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "Składanie nie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:254
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Scalanie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:256
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Zaciąganie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:258
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Odwracanie jest możliwe, ponieważ istnieją niescalone pliki."
-#: advice.c:260
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Nie można wykonać %s, ponieważ istnieją niescalone pliki."
-#: advice.c:268
+#: advice.c:196
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."
@@ -843,23 +844,48 @@
"Napraw je w drzewie roboczym, i użyj odpowiednio „git add/rm <plik>”,\n"
"aby oznaczyć rozwiązanie i złożyć zapis."
-#: advice.c:276
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Wyjście z powodu nierozwiązanego konfliktu."
-#: advice.c:281 builtin/merge.c:1370
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Nie zwieńczono scalania (MERGE_HEAD istnieje)."
-#: advice.c:283
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Złóż swoje zmiany przez scalaniem."
-#: advice.c:284
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Wyjście z powodu niedokończonego scalania."
-#: advice.c:290
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Nie da się przewinąć, przerywanie."
+
+#: advice.c:227
+#, c-format
+msgid ""
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
+msgstr ""
+"Następujące ścieżki dopasowano do ścieżek istniejących poza\n"
+"definicją rzadkiego wybrania, więc nie zostaną zaktualizowane\n"
+"w indeksie:\n"
+
+#: advice.c:234
+msgid ""
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"Jeśli chcesz zaktualizować takie elementy, spróbuj jednego z poniższych:\n"
+"* Użyj opcji --sparse.\n"
+"* Wyłącz lub zmień zasady rzadkości."
+
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -911,83 +937,79 @@
msgid "unclosed quote"
msgstr "niezamknięty cudzysłów"
-#: apply.c:69
+#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "Nierozpoznana opcja z białych znaków: „%s”"
-#: apply.c:85
+#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nierozpoznana opcja ignorowania z białych znaków: „%s”"
-#: apply.c:135
+#: apply.c:136
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way wykluczają się."
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached i --3way wykluczają się."
-
-#: apply.c:140
+#: apply.c:139
msgid "--3way outside a repository"
msgstr "--3way poza repozytorium"
-#: apply.c:151
+#: apply.c:150
msgid "--index outside a repository"
msgstr "--index poza repozytorium"
-#: apply.c:154
+#: apply.c:153
msgid "--cached outside a repository"
msgstr "--cached poza repozytorium"
-#: apply.c:801
+#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Nie można przygotować wyrażenia regularnego znacznika czasu %s"
-#: apply.c:810
+#: apply.c:809
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec zwrócił %d dla wejścia: %s"
-#: apply.c:884
+#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nie znaleziono nazwy pliku w łatce w wierszu %d"
-#: apply.c:922
+#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: zły git-diff — oczekiwano /dev/null, znaleziono %s w wierszu %d"
-#: apply.c:928
+#: apply.c:927
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: zły git-diff — niespójna nowa nazwa pliku w wierszu %d"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: zły git-diff — niespójna stara nazwa pliku w wierszu %d"
-#: apply.c:934
+#: apply.c:933
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: zły git-diff — oczekiwano /dev/null w wierszu %d"
-#: apply.c:963
+#: apply.c:962
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "błędny tryb w wierszu %d: %s"
-#: apply.c:1282
+#: apply.c:1281
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "niespójne wiersze nagłówka %d i %d"
-#: apply.c:1372
+#: apply.c:1371
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1005,45 +1027,45 @@
"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
"wiodących komponentów ścieżki (wiersz %d)"
-#: apply.c:1385
+#: apply.c:1384
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "w nagłówku git diff brakuje informacji o nazwie pliku (wiersz %d)"
-#: apply.c:1481
+#: apply.c:1480
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "przeliczanie: nieoczekiwany wiersz: %.*s"
-#: apply.c:1550
+#: apply.c:1549
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment łatki bez nagłówka w wierszu %d: %.*s"
-#: apply.c:1753
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "nowy plik zależy od starej zawartości"
-#: apply.c:1755
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "usunięty plik nadal ma zawartość"
-#: apply.c:1789
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "uszkodzona łatka w wierszu %d"
-#: apply.c:1826
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nowy plik %s zależy od starej zawartości"
-#: apply.c:1828
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "usunięty plik %s nadal ma zawartość"
-#: apply.c:1831
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** ostrzeżenie: plik %s staje się pusty, ale nie jest usunięty"
@@ -1155,7 +1177,7 @@
msgid "cannot checkout %s"
msgstr "nie można wybrać %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
@@ -1166,182 +1188,186 @@
msgid "reading from '%s' beyond a symbolic link"
msgstr "czytanie z „%s” przechodzącego przez dowiązanie"
-#: apply.c:3442 apply.c:3685
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "ścieżka %s została przeniesiona/usunięta"
-#: apply.c:3528 apply.c:3700
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: brak w indeksie"
-#: apply.c:3537 apply.c:3708 apply.c:3952
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: nie pasuje do indeksu"
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"w repozytorium brakuje blobu, potrzebnego żeby uciec się do trójstronnego "
-"scalania."
+#: apply.c:3593
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "w repozytorium brakuje blobu koniecznego do trójstronnego scalania."
-#: apply.c:3575
+#: apply.c:3596
#, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Uciekanie się do trójstronnego scalania...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Trójstronne scalanie...\n"
-#: apply.c:3591 apply.c:3595
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "nie można odczytać bieżącej zawartości „%s”"
-#: apply.c:3607
+#: apply.c:3628
#, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Nie można uciec się do trójstronnego scalania...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Nie można wykonać trójstronnego scalania...\n"
-#: apply.c:3621
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Zastosowano łatkę do „%s” z konfliktami\n"
-#: apply.c:3626
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Gładko zastosowano łatkę do „%s”.\n"
-#: apply.c:3652
+#: apply.c:3664
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Uciekanie się do bezpośredniego zastosowania...\n"
+
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "łatka usuwająca pozostawia zawartość pliku"
-#: apply.c:3725
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: nieprawidłowy rodzaj"
-#: apply.c:3727
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s jest rodzaju %o, oczekiwano %o"
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "nieprawidłowa ścieżka „%s”"
-#: apply.c:3950
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: już widnieje w indeksie"
-#: apply.c:3954
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: już istnieje w katalogu roboczym"
-#: apply.c:3974
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o)"
-#: apply.c:3979
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o) %s"
-#: apply.c:3999
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "dotknięty plik „%s” jest pod dowiązaniem"
-#: apply.c:4003
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: łatka się nie stosuje"
-#: apply.c:4018
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Sprawdzanie łatki %s..."
-#: apply.c:4110
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w pod-module %s"
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w podmodule %s"
-#: apply.c:4117
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "zmiana trybu w %s, który nie jest w bieżącym HEAD"
-#: apply.c:4120
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "brakuje informacji SHA-1 lub jest bezużyteczna (%s)."
-#: apply.c:4129
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "nie można dodać %s do indeksu tymczasowego"
-#: apply.c:4139
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "nie można zapisać indeksu tymczasowego w %s"
-#: apply.c:4277
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "nie można usunąć %s z indeksu"
-#: apply.c:4311
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
-msgstr "uszkodzona łatka pod-modułu %s"
+msgstr "uszkodzona łatka podmodułu %s"
-#: apply.c:4317
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "nie można wykonać stat na nowo utworzonym pliku „%s”"
-#: apply.c:4325
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "nie można utworzyć wspierającego składu dla nowo utworzonego pliku %s"
-#: apply.c:4331 apply.c:4476
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "nie można dodać %s do pamięci podręcznej"
-#: apply.c:4374 builtin/bisect--helper.c:523
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "nie można pisać do „%s”"
-#: apply.c:4378
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "zamykanie pliku „%s”"
-#: apply.c:4448
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "nie można ustawić w pliku „%s” trybu %o"
-#: apply.c:4546
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Gładko zastosowano łatkę %s."
-#: apply.c:4554
+#: apply.c:4578
msgid "internal error"
msgstr "wewnętrzny błąd"
-#: apply.c:4557
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -1349,45 +1375,45 @@
msgstr[1] "Stosowanie łatki %%s z %d odrzuceniami..."
msgstr[2] "Stosowanie łatki %%s z %d odrzuceniami..."
-#: apply.c:4568
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "ucinanie nazwy pliku .rej do %.*s.rej"
-#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "nie można otworzyć %s"
-#: apply.c:4590
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Skrawek nr %d gładko zastosowany."
-#: apply.c:4594
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Odrzucono skrawek nr %d."
-#: apply.c:4718
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Pominięto łatkę „%s”."
-#: apply.c:4726
+#: apply.c:4755
msgid "unrecognized input"
msgstr "nierozpoznawane wejście"
-#: apply.c:4746
+#: apply.c:4775
msgid "unable to read index file"
msgstr "nie można odczytać pliku indeksu"
-#: apply.c:4903
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "nie można otworzyć łatki „%s”: %s"
-#: apply.c:4930
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -1395,7 +1421,7 @@
msgstr[1] "zduszono %d błędy białych znaków"
msgstr[2] "zduszono %d błędów białych znaków"
-#: apply.c:4936 apply.c:4951
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -1403,7 +1429,7 @@
msgstr[1] "%d wiersze dodają błędy białych znaków."
msgstr[2] "%d wierszy dodaje błędy białych znaków."
-#: apply.c:4944
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1411,132 +1437,135 @@
msgstr[1] "Zastosowano %d wiersze po naprawieniu błędów białych znaków."
msgstr[2] "Zastosowano %d wierszy po naprawieniu błędów białych znaków."
-#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Nie można zapisać nowego pliku indeksu"
-#: apply.c:4988
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "nie stosuj zmian pasujących do podanej ścieżki"
-#: apply.c:4991
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "zastosuj zmiany pasujące do podanej ścieżki"
-#: apply.c:4993 builtin/am.c:2266
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "ile"
-#: apply.c:4994
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "usuń <ile> początkowych ukośników z tradycyjnych ścieżek diff"
-#: apply.c:4997
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignoruj wstawienia wykonywane przez łatkę"
-#: apply.c:4999
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "zamiast stosować łatkę, wypisz statystyki różnic dla wejścia"
-#: apply.c:5003
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "pokazuj liczbę dodanych i usuniętych wierszy w systemie dziesiętnym"
-#: apply.c:5005
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "zamiast stosować łatkę, wypisz podsumowanie dla wejścia"
-#: apply.c:5007
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "zamiast stosować łatkę, zobacz, czy się stosuje"
-#: apply.c:5009
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "upewnij się, że łatka ma zastosowanie do bieżącego indeksu"
-#: apply.c:5011
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "oznacz nowe pliki przez „git add --intent-to-add”"
-#: apply.c:5013
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "zastosuj łatkę bez dotykania drzewa roboczego"
-#: apply.c:5015
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "przyjmuj łatkę, która wychodzi poza obszar roboczy"
-#: apply.c:5018
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "zastosuj też łatkę (do użycia z --stat/--summary/--check)"
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "spróbuj trójstronnego scalania, jeśli łatka się nie stosuje"
+#: apply.c:5049
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"spróbuj trójstronnego scalania, uciekając się do normalnego łatania, jeśli "
+"tamto zawiedzie"
-#: apply.c:5022
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "zbuduj tymczasowy indeks oparty o wbudowane informacje indeksu"
-#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "ścieżki są rozdzielone znakiem NUL"
-#: apply.c:5027
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "zapewnij przynajmniej <n> wierszy dopasowanego kontekstu"
-#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "działanie"
-#: apply.c:5029
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "wykryj nowe i zmienione wiersze, które mają błędy białych znaków"
-#: apply.c:5032 apply.c:5035
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "ignoruj zmiany w białych znakach przy znajdywaniu kontekstu"
-#: apply.c:5038
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "zastosuj łatkę na odwrót"
-#: apply.c:5040
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "nie oczekuj przynajmniej jednego wiersza kontekstu"
-#: apply.c:5042
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "zostaw odrzucone skrawki w odpowiednich plikach *.rej"
-#: apply.c:5044
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "zezwól, by skrawki na siebie nachodziły"
-#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
-#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "więcej komunikatów"
-#: apply.c:5047
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"toleruj nieprawidłowo wykryte brakujące znaki końca wiersza na końcu pliku"
-#: apply.c:5050
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "nie ufaj liczbie wierszy w nagłówkach skrawków"
-#: apply.c:5052 builtin/am.c:2254
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "korzeń"
-#: apply.c:5053
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "dodaj <korzeń> przed wszystkimi nazwami plików"
@@ -1574,7 +1603,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "ścieżka za długa (%d znaków, SHA-1: %s): %s"
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
#, c-format
msgid "deflate error (%d)"
msgstr "błąd kompresji (%d)"
@@ -1603,156 +1632,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repozytorium> [--exec <polecenie>] --list"
-#: archive.c:192
+#: archive.c:188
#, c-format
msgid "cannot read %s"
msgstr "nie można odczytać %s"
-#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
-#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1139
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "nie można odczytać „%s”"
-#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ścieżka „%s” nie pasuje do żadnych plików"
-#: archive.c:454
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "nie ma takiej referencji: %*.s"
-#: archive.c:460
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "nieprawidłowa nazwa obiektu: %s"
-#: archive.c:473
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "nie jest obiektem drzewa: %s"
-#: archive.c:485
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "bieżący katalog roboczy jest nieśledzony"
-#: archive.c:526
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Nie znaleziono pliku: %s"
-#: archive.c:528
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Nie jest zwykłym plikiem: %s"
-#: archive.c:555
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:555
+#: archive.c:551
msgid "archive format"
msgstr "format archiwum"
-#: archive.c:556 builtin/log.c:1764
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefiks"
-#: archive.c:557
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "dodaj prefiks przed każdą ścieżką w archiwum"
-#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
-#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "plik"
-#: archive.c:559
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "dodaj nieśledzony plik do archiwum"
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "zapisz archiwum do tego pliku"
-#: archive.c:564
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "przeczytaj .gitattributes w katalogu roboczym"
-#: archive.c:565
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "zgłaszaj zarchiwizowane pliki na standardowe wyjście diagnostyczne"
-#: archive.c:567
+#: archive.c:563
msgid "set compression level"
msgstr "ustaw stopień kompresji"
-#: archive.c:570
+#: archive.c:566
msgid "list supported archive formats"
msgstr "wypisz wspierane formaty archiwów"
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "repozytorium"
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "pobierz archiwum ze zdalnego <repozytorium>"
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "polecenie"
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "ścieżka do zdalnego polecenia git-upload-archive"
-#: archive.c:582
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Nieoczekiwana opcja --remote"
-#: archive.c:584
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
-msgstr "Opcja --exec może być użyta tylko z --remote"
+msgstr "Opcji --exec można użyć tylko z --remote"
-#: archive.c:586
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Nieoczekiwana opcja --output"
-#: archive.c:588
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opcje --add-file i --remote się wykluczają"
-#: archive.c:610
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Nieznany format archiwum „%s”"
-#: archive.c:619
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument niewspierany w formacie „%s”: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%*.s nie jest prawidłową nazwą atrybutu"
-#: attr.c:359
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s niedozwolone: %s:%d"
-#: attr.c:399
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1760,22 +1789,22 @@
"Negatywne wzorce są pomijane w atrybutach gita\n"
"Użyj „\\!” dla dosłownego początkowego wykrzyknika."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Źle zacytowana zawartość w pliku „%s”: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Nie można już przeszukiwać!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Nieprawidłowa nazwa zapisu %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1784,7 +1813,7 @@
"Podstawa scalania %s jest zła.\n"
"To znaczy, że błąd naprawiono pomiędzy %s i [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1793,7 +1822,7 @@
"Podstawa scalenia %s jest nowa.\n"
"Właściwość zmieniła się między %s i [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1802,7 +1831,7 @@
"Podstawa scalania %s jest %s.\n"
"To znaczy, że pierwszy zapis „%s” jest pomiędzy %s i [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1813,7 +1842,7 @@
"git bisect nie może w tym przypadku działać poprawnie.\n"
"Może pomylono rewizje %s i %s?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1824,36 +1853,36 @@
"Nie możemy być więc pewni, że pierwszy zapis %s jest między %s i %s.\n"
"Kontynuowanie mimo to."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Przeszukiwanie: podstawa scalenia musi być sprawdzona\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "potrzebna jest rewizja %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "nie można utworzyć pliku „%s”"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "nie można odczytać pliku „%s”"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "nie można odczytać referencji przeszukiwania"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s był jednocześnie %s i %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1862,7 +1891,7 @@
"Nie znaleziono sprawdzalnego zapisu.\n"
"Może zaczęto ze złymi argumentami ścieżek?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1873,7 +1902,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1881,39 +1910,40 @@
msgstr[1] "Przeszukiwanie: pozostały %d rewizje do sprawdzenia %s\n"
msgstr[2] "Przeszukiwanie: pozostało %d rewizji do sprawdzenia %s\n"
-#: blame.c:2777
+#: blame.c:2776
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse się wykluczają."
-#: blame.c:2791
+#: blame.c:2790
msgid "cannot use --contents with final commit object name"
msgstr "--contents i nazwa obiektu ostatniego zapisu wykluczają się"
-#: blame.c:2812
+#: blame.c:2811
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse i --first-parent razem wymagają podanego ostatniego zapisu"
-#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146
-#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
-#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
-#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "nie udało się przygotować przejścia rewizji"
-#: blame.c:2839
+#: blame.c:2838
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent razem wymagają zakresu wzdłuż łańcucha pierwszych "
"rodziców"
-#: blame.c:2850
+#: blame.c:2849
#, c-format
msgid "no such path %s in %s"
msgstr "nie ma ścieżki %s w %s"
-#: blame.c:2861
+#: blame.c:2860
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "nie można odczytać blobu %s ścieżki %s"
@@ -2053,51 +2083,51 @@
msgid "Not a valid branch point: '%s'."
msgstr "Nieprawidłowy punkt rozgałęzienia: „%s”."
-#: branch.c:365
+#: branch.c:366
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s” jest już wybrana w „%s”"
-#: branch.c:388
+#: branch.c:389
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "nie zaktualizowano HEAD drzewa roboczego %s"
-#: bundle.c:41
+#: bundle.c:44
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "nierozpoznany algorytm skrótu wiązki: %s"
-#: bundle.c:45
+#: bundle.c:48
#, c-format
msgid "unknown capability '%s'"
msgstr "nieznana zdolność (capability) „%s”"
-#: bundle.c:71
+#: bundle.c:74
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "„%s” nie wygląda jak plik wiązki v2 ani v3"
-#: bundle.c:110
+#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "nierozpoznany nagłówek: %s%s (%d)"
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
-#: builtin/commit.c:814
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "nie można otworzyć „%s”"
-#: bundle.c:189
+#: bundle.c:198
msgid "Repository lacks these prerequisite commits:"
msgstr "W repozytorium brakuje tych wymaganych zapisów:"
-#: bundle.c:192
+#: bundle.c:201
msgid "need a repository to verify a bundle"
msgstr "należy podać repozytorium, aby sprawdzić wiązkę"
-#: bundle.c:243
+#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
@@ -2105,11 +2135,11 @@
msgstr[1] "Wiązka zawiera te %d referencje:"
msgstr[2] "Wiązka zawiera tych %d referencji:"
-#: bundle.c:250
+#: bundle.c:264
msgid "The bundle records a complete history."
msgstr "Wiązka zapisuje pełną historię."
-#: bundle.c:252
+#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
@@ -2117,176 +2147,173 @@
msgstr[1] "Wiązka potrzebuje tych %d referencji:"
msgstr[2] "Wiązka potrzebuje tych %d referencji:"
-#: bundle.c:319
+#: bundle.c:333
msgid "unable to dup bundle descriptor"
msgstr "nie można wykonać dup deskryptora wiązki"
-#: bundle.c:326
+#: bundle.c:340
msgid "Could not spawn pack-objects"
msgstr "Nie można uruchomić pack-objects"
-#: bundle.c:337
+#: bundle.c:351
msgid "pack-objects died"
msgstr "pack-objects padł"
-#: bundle.c:386
+#: bundle.c:400
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencja „%s” jest wyłączona przez opcje listy rewizji"
-#: bundle.c:490
+#: bundle.c:504
#, c-format
msgid "unsupported bundle version %d"
msgstr "nieobsługiwana wersja wiązki %d"
-#: bundle.c:492
+#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr "nie można zapisać wersji wiązki %d z algorytmem %s"
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "nierozpoznany argument: %s"
-#: bundle.c:539
+#: bundle.c:553
msgid "Refusing to create empty bundle."
msgstr "Odmawiam utworzenia pustej wiązki."
-#: bundle.c:549
+#: bundle.c:563
#, c-format
msgid "cannot create '%s'"
msgstr "nie można utworzyć „%s”"
-#: bundle.c:574
+#: bundle.c:588
msgid "index-pack died"
msgstr "index-pack padł"
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "kończący identyfikator kawałka występuje przedwcześnie"
+
+#: chunk-format.c:126
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "nieprawidłowe przesunięcie(a) kawałka %<PRIx64> i %<PRIx64>"
+
+#: chunk-format.c:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "znaleziono podwójny identyfikator kawałka %<PRIx32>"
+
+#: chunk-format.c:147
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "końcowy kawałek ma niezerowy identyfikator %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "nieprawidłowa wartość koloru: %.*s"
-#: commit-graph.c:198 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "nieprawidłowa wersja skrótu"
-#: commit-graph.c:219
-msgid "repository contains replace objects; skipping commit-graph"
-msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
-
-#: commit-graph.c:228
-msgid "repository contains (deprecated) grafts; skipping commit-graph"
-msgstr "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
-
-#: commit-graph.c:233
-msgid "repository is shallow; skipping commit-graph"
-msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
-
-#: commit-graph.c:264
+#: commit-graph.c:262
msgid "commit-graph file is too small"
msgstr "plik grafu zapisów jest za mały"
-#: commit-graph.c:329
+#: commit-graph.c:355
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "podpis grafu zapisów %X nie zgadza się z podpisem %X"
-#: commit-graph.c:336
+#: commit-graph.c:362
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "wersja grafu zapisów %X nie zgadza się z wersją %X"
-#: commit-graph.c:343
+#: commit-graph.c:369
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "wersja skrótu grafu zapisów %X nie zgadza się z wersją %X"
-#: commit-graph.c:360
+#: commit-graph.c:386
#, c-format
msgid "commit-graph file is too small to hold %u chunks"
msgstr "plik grafu zapisów jest za mały, żeby przechować %u kawałków"
-#: commit-graph.c:379
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
-
-#: commit-graph.c:465
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
-
-#: commit-graph.c:531
+#: commit-graph.c:482
msgid "commit-graph has no base graphs chunk"
msgstr "graf zapisów nie ma podstawowego kawałka grafów"
-#: commit-graph.c:541
+#: commit-graph.c:492
msgid "commit-graph chain does not match"
msgstr "łańcuch grafu zapisów się nie zgadza"
-#: commit-graph.c:589
+#: commit-graph.c:540
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "nieprawidłowy łańcuch grafu zapisów: wiersz „%s” nie jest skrótem"
-#: commit-graph.c:613
+#: commit-graph.c:564
msgid "unable to find all commit-graph files"
msgstr "nie znaleziono wszystkich plików grafu zapisów"
-#: commit-graph.c:794 commit-graph.c:831
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"nieprawidłowa pozycja zapisu. Graf zapisów jest prawdopodobnie uszkodzony"
-#: commit-graph.c:815
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "nie znaleziono zapisu %s"
-#: commit-graph.c:848
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "graf zapisów wymaga danych przepełnionych pokoleń, ale ich nie ma"
-#: commit-graph.c:1121 builtin/am.c:1292
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "nie można przeanalizować zapisu %s"
-#: commit-graph.c:1378 builtin/pack-objects.c:2872
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "nie można uzyskać rodzaju obiektu %s"
-#: commit-graph.c:1409
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Ładowanie znanych zapisów w graf zapisów"
-#: commit-graph.c:1426
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Rozwijanie osiągalnych zapisów w grafie zapisów"
-#: commit-graph.c:1446
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Czyszczenie znamion zapisów w grafie zapisów"
-#: commit-graph.c:1465
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Obliczanie topologicznych poziomów grafu zapisów"
-#: commit-graph.c:1518
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Obliczanie numerów pokoleń grafu zapisów"
-#: commit-graph.c:1599
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Obliczanie filtrów Blooma zmienionych ścieżek zapisu"
-#: commit-graph.c:1676
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Zbieranie wspominanych zapisów"
-#: commit-graph.c:1701
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
@@ -2294,44 +2321,44 @@
msgstr[1] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
msgstr[2] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
-#: commit-graph.c:1714
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "błąd przy dodawaniu paczki %s"
-#: commit-graph.c:1718
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "błąd otwierania indeksu dla %s"
-#: commit-graph.c:1755
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Znajdywanie zapisów do grafu zapisów wśród spakowanych obiektów"
-#: commit-graph.c:1773
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Znajdywanie dodatkowych krawędzi w grafie zapisów"
-#: commit-graph.c:1821
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr ""
"nie można zapisać prawidłowej liczby podstawowych identyfikatorów grafu"
-#: commit-graph.c:1863 midx.c:819
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "nie można utworzyć wiodących katalogów %s"
-#: commit-graph.c:1876
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "nie można utworzyć tymczasowej warstwy grafu"
-#: commit-graph.c:1881
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "nie można dostroić współdzielonych uprawnień „%s”"
-#: commit-graph.c:1966
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
@@ -2339,86 +2366,86 @@
msgstr[1] "Wypisywanie grafu zapisów w %d przebiegach"
msgstr[2] "Wypisywanie grafu zapisów w %d przebiegach"
-#: commit-graph.c:2011
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "nie można otworzyć pliku łańcucha grafu zapisów"
-#: commit-graph.c:2027
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "nie można zmienić nazwy podstawowego pliku grafu zapisów"
-#: commit-graph.c:2047
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "nie można zmienić nazwy tymczasowego pliku grafu zapisów"
-#: commit-graph.c:2180
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Skanowanie scalonych zapisów"
-#: commit-graph.c:2224
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Scalanie grafu zapisów"
-#: commit-graph.c:2331
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "próba wypisania grafu zapisów, ale „core.commitGraph” jest wyłączone"
-#: commit-graph.c:2438
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "za dużo zapisów, by wypisać graf"
-#: commit-graph.c:2536
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"plik grafu zapisów ma nieprawidłową sumę kontrolną i jest prawdopodobnie "
"uszkodzony"
-#: commit-graph.c:2546
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "graf zapisów ma nieprawidłową kolejność OID: %s i wtedy %s"
-#: commit-graph.c:2556 commit-graph.c:2571
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "graf zapisów ma nieprawidłową wartość fanout: fanout[%d] = %u != %u"
-#: commit-graph.c:2563
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "nie można przetworzyć zapisu %s z grafu zapisów"
-#: commit-graph.c:2581
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Sprawdzanie zapisów w grafie zapisów"
-#: commit-graph.c:2596
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"nie można przetworzyć zapisu %s z bazy danych obiektów do grafu zapisów"
-#: commit-graph.c:2603
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "OID korzenia drzewa w zapisie %s w grafie zapisów to %s != %s"
-#: commit-graph.c:2613
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista rodziców grafu zapisów zapisu %s jest za długa"
-#: commit-graph.c:2622
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "rodzic grafu zapisów zapisu %s to %s != %s"
-#: commit-graph.c:2636
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista rodziców grafu zapisów zapisu %s kończy się przedwcześnie"
-#: commit-graph.c:2641
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2426,7 +2453,7 @@
"graf zapisów ma numer pokolenia zerowy w zapisie %s, ale niezerowy gdzie "
"indziej"
-#: commit-graph.c:2645
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2434,29 +2461,29 @@
"graf zapisów ma numer pokolenia niezerowy w zapisie %s, ale zerowy gdzie "
"indziej"
-#: commit-graph.c:2662
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "pokolenie grafu zapisów zapisu %s to %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2668
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"data złożenia w zapisie %s w grafie zapisów to %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "nie można przetworzyć „%s”"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s nie jest zapisem!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2476,27 +2503,27 @@
"Wyłącz ten komunikat uruchamiając\n"
"„git config advice.graftFileDeprecated false”"
-#: commit.c:1223
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Zapis %s ma niezaufany podpis GPG rzekomo od %s."
-#: commit.c:1227
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Zapis %s ma zły podpis GPG rzekomo od %s."
-#: commit.c:1230
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Zapis %s nie ma podpisu GPG."
-#: commit.c:1233
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Zapis %s ma dobry podpis GPG od %s\n"
-#: commit.c:1487
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2511,7 +2538,7 @@
msgid "memory exhausted"
msgstr "pamięć wyczerpana"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2526,35 +2553,35 @@
"\t%s\n"
"Może to być spowodowane cyklicznymi załączeniami."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "nie można rozwinąć ścieżki załączeń (include) „%s”"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "względne załączenia konfiguracji muszą pochodzić z plików"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "względne warunkowe załączenia konfiguracji muszą pochodzić z plików"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "nieprawidłowy format ustawień: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "brak nazwy zmiennej środowiska dla ustawienia „%.*s”"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "brak zmiennej środowiska „%s” dla ustawienia „%.*s”"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "klucz nie zawiera rozdziału: %s"
@@ -2564,298 +2591,298 @@
msgid "key does not contain variable name: %s"
msgstr "klucz nie zawiera nazwy zmiennej: %s"
-#: config.c:472 sequencer.c:2588
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "nieprawidłowy klucz: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "błędny klucz (nowy wiersz): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "pusty klucz ustawień"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "fałszywy parametr konfiguracji: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "fałszywy format %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "fałszywy licznik w %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "za dużo wpisów w %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "brak klucza ustawień %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "brakująca wartość ustawienia %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "zły wiersz konfiguracji %d w blobie %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "zły wiersz konfiguracji %d w pliku %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "zły wiersz konfiguracji %d na standardowym wejściu"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
-msgstr "zły wiersz konfiguracji %d w blobie pod-modułu %s"
+msgstr "zły wiersz konfiguracji %d w blobie podmodułu %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "zły wiersz konfiguracji %d w wierszu poleceń %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "zły wiersz konfiguracji %d w %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "poza zakresem"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "nieprawidłowa jednostka"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s”: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w pliku %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"zła liczbowa wartość konfiguracji „%s” dla „%s” na standardowym wejściu: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-"zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie pod-modułu %s: %s"
+"zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie podmodułu %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"zła liczbowa wartość konfiguracji „%s” dla „%s” w wierszu poleceń %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w %s: %s"
-#: config.c:1194
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "zła logiczna wartość konfiguracji „%s” w „%s”"
-#: config.c:1289
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "nie można rozwinąć katalogu użytkownika w: „%s”"
-#: config.c:1298
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s” do „%s” nie jest prawidłowym znacznikiem czasu"
-#: config.c:1391
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "długość skrótu poza zakresem: %d"
-#: config.c:1405 config.c:1416
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "zły stopień kompresji zlib %d"
-#: config.c:1508
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar powinno być tylko jednym znakiem"
-#: config.c:1541
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nieprawidłowy tryb utworzenia obiektu: %s"
-#: config.c:1613
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "nieprawidłowa wartość %s"
-#: config.c:1639
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "nieprawidłowa wartość %s: %s"
-#: config.c:1640
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "musi być jednym z nothing, matching, simple, upstream lub current"
-#: config.c:1701 builtin/pack-objects.c:3666
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "zły stopień kompresji paczki %d"
-#: config.c:1823
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "nie można wczytać konfiguracyjnego obiektu blobu „%s”"
-#: config.c:1826
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencja „%s” nie wskazuje blobu"
-#: config.c:1843
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "nie można rozwiązać blobu konfiguracji „%s”"
-#: config.c:1873
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "nie można przetworzyć %s"
-#: config.c:1927
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "nie można przeanalizować konfiguracji wiersza poleceń"
-#: config.c:2290
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "wystąpił nieznany błąd podczas odczytywania plików konfiguracyjnych"
-#: config.c:2464
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Nieprawidłowy %s: „%s”"
-#: config.c:2509
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "wartość splitIndex.maxPercentChange „%d” powinna być pomiędzy 0 a 100"
-#: config.c:2555
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "nie można przetworzyć „%s” z konfiguracji wiersza poleceń"
-#: config.c:2557
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "zła zmienna konfiguracji „%s” w pliku „%s” w wierszu %d"
-#: config.c:2641
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "nieprawidłowa nazwa rozdziału „%s”"
-#: config.c:2673
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s ma wiele wartości"
-#: config.c:2702
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "nie można zapisać nowego pliku konfiguracyjnego %s"
-#: config.c:2954 config.c:3280
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "nie można zablokować pliku konfiguracyjnego %s"
-#: config.c:2965
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "otwieranie %s"
-#: config.c:3002 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "nieprawidłowy wzorzec: %s"
-#: config.c:3027
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "nieprawidłowy plik konfiguracyjny %s"
-#: config.c:3040 config.c:3293
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat na %s nie powiódł się"
-#: config.c:3051
+#: config.c:3043
#, c-format
-msgid "unable to mmap '%s'"
-msgstr "nie można wykonać mmap „%s”"
+msgid "unable to mmap '%s'%s"
+msgstr "nie można wykonać mmap „%s”%s"
-#: config.c:3060 config.c:3298
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod na %s nie powiodło się"
-#: config.c:3145 config.c:3395
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "nie można zapisać pliku konfiguracji %s"
-#: config.c:3179
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "nie można ustawić „%s” na „%s”"
-#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "nie można usunąć ustawienia „%s”"
-#: config.c:3271
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "nieprawidłowa nazwa rozdziału: %s"
-#: config.c:3438
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "brakująca wartość „%s”"
@@ -2890,72 +2917,72 @@
msgid "expected flush after capabilities"
msgstr "oczekiwano wypróżnienia po możliwościach (capabilities)"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "pomijanie możliwości (capabilities) po pierwszym wierszu „%s”"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "błąd protokołu: nieoczekiwane możliwości capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "błąd protokołu: oczekiwano płytkiego SHA-1, otrzymano „%s”"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "repozytorium po drugiej stronie nie może być płytkie"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "nieprawidłowy pakiet"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "błąd protokołu: nieoczekiwane „%s”"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "serwer podał nieznany format obiektu „%s”"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "nieprawidłowa odpowiedź ls-refs: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "oczekiwano wypróżnienia po wypisaniu referencji"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "oczekiwano pakietu końca odpowiedzi po wypisaniu referencji"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokół „%s” jest niewspierany"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "nie można ustawić w gnieździe SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Odnajdywanie %s ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "nie można odnaleźć %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2964,7 +2991,7 @@
"gotowe.\n"
"Łączenie z %s (port %s) ... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2974,93 +3001,94 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "gotowe."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "nie odnaleziono %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "nieznany port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "zablokowano dziwną nazwę hosta „%s”"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "zablokowano dziwny port „%s”"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "nie można uruchomić pośrednika %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"nie podano ścieżki; zobacz składnię prawidłowych adresów w „git help pull”"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr ""
-"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach repozytoriów"
+"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach "
+"repozytoriów"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "wariant SSH „simple” nie wspiera -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "wariant SSH „simple” nie wspiera -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "wariant SSH „simple” nie wspiera ustawiania portu"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "zablokowano dziwną ścieżkę „%s”"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "nie można wykonać fork"
-#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Sprawdzanie spójności"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Nie można wykonać „git rev-list”"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "nie można zapisać do rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "nie można zamknąć wejścia rev-list"
-#: convert.c:194
+#: convert.c:183
#, c-format
msgid "illegal crlf_action %d"
msgstr "błędne działanie crlf_action %d"
-#: convert.c:207
+#: convert.c:196
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLFy zostałyby zastąpione LFami w %s"
-#: convert.c:209
+#: convert.c:198
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -3069,12 +3097,12 @@
"CRLFy zostaną zastąpione LFami %s.\n"
"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
-#: convert.c:217
+#: convert.c:206
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LFy zostałyby zastąpione CRLFami w %s"
-#: convert.c:219
+#: convert.c:208
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -3083,12 +3111,12 @@
"LFy zostaną zastąpione CRLFami %s.\n"
"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
-#: convert.c:284
+#: convert.c:273
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "Znacznik kolejności bajtów zabroniony, jeśli „%s” zakodowano jako %s"
-#: convert.c:291
+#: convert.c:280
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
@@ -3097,12 +3125,12 @@
"Plik „%s” zawiera znacznik kolejności bajtów (BOM). Użyj UTF-%.*s jako "
"kodowania drzewa roboczego."
-#: convert.c:304
+#: convert.c:293
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "Znacznik kolejności bajtów wymagany, jeśli „%s” zakodowano jako %s"
-#: convert.c:306
+#: convert.c:295
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -3111,50 +3139,50 @@
"W pliku „%s” brakuje znacznika kolejności bajtów (BOM). Użyj UTF-%sBE lub "
"UTF-%sLE (zależnie od kolejności bajtów) jako kodowania drzewa roboczego."
-#: convert.c:419 convert.c:490
+#: convert.c:408 convert.c:479
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "nie można przekodować „%s” z %s na %s"
-#: convert.c:462
+#: convert.c:451
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "kodowanie „%s” z %s na %s i z powrotem nie jest tym samym"
-#: convert.c:665
+#: convert.c:654
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "nie można wykonać fork, by uruchomić zewnętrzny filtr „%s”"
-#: convert.c:685
+#: convert.c:674
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "nie można nakarmić wejściem zewnętrznego filtra „%s”"
-#: convert.c:692
+#: convert.c:681
#, c-format
msgid "external filter '%s' failed %d"
msgstr "zewnętrzny filtr „%s” nie powiódł się %d"
-#: convert.c:727 convert.c:730
+#: convert.c:716 convert.c:719
#, c-format
msgid "read from external filter '%s' failed"
msgstr "odczyt z zewnętrznego filtra „%s” nie powiódł się"
-#: convert.c:733 convert.c:788
+#: convert.c:722 convert.c:777
#, c-format
msgid "external filter '%s' failed"
msgstr "zewnętrzny filtr „%s” nie powiódł się"
-#: convert.c:837
+#: convert.c:826
msgid "unexpected filter type"
msgstr "nieoczekiwany rodzaj filtra"
-#: convert.c:848
+#: convert.c:837
msgid "path name too long for external filter"
msgstr "ścieżka zewnętrznego filtra za długa"
-#: convert.c:940
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3163,16 +3191,16 @@
"zewnętrzny filtr „%s” nie jest już dostępny, chociaż nie wszystkie ścieżki "
"zostały przefiltrowane"
-#: convert.c:1240
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false nie są prawidłowymi kodowaniami drzewa roboczego"
-#: convert.c:1428 convert.c:1462
+#: convert.c:1416 convert.c:1449
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: filtr czyszczenia „%s” zawiódł"
-#: convert.c:1508
+#: convert.c:1492
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: filtr smarowania %s zawiódł"
@@ -3190,17 +3218,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "odmawiam pracy z poświadczeniem bez pola protokołu"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "adres URL zawiera znak nowego wiersza w komponencie %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "adres URL nie ma schematu: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "nie można przetworzyć poświadczenia adresu URL: %s"
@@ -3312,31 +3340,31 @@
msgid "unknown value for --diff-merges: %s"
msgstr "nierozpoznana wartość --diff-merges: %s"
-#: diff-lib.c:534
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base nie działa z zakresami"
-#: diff-lib.c:536
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base działa tylko z zapisami"
-#: diff-lib.c:553
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "nie można uzyskać HEAD"
-#: diff-lib.c:560
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "nie znaleziono podstawy scalenia"
-#: diff-lib.c:562
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "znaleziono wiele podstaw scalenia"
-#: diff-no-index.c:238
+#: diff-no-index.c:237
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opcje>] <ścieżka> <ścieżka>"
-#: diff-no-index.c:263
+#: diff-no-index.c:262
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
@@ -3344,17 +3372,17 @@
"To nie jest repozytorium gita. Użyj --no-index, aby porównać dwie ścieżki "
"poza drzewem roboczym"
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Nie można przetworzyć procentu odcięcia dirstat „%s”\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Nieznany parametr dirstat „%s”\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3362,7 +3390,7 @@
"ustawienie kolorowania przeniesień musi być jednym z „no”, „default”, "
"„blocks”, „zebra”, „dimmed-zebra” czy „plain”"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3372,7 +3400,7 @@
"change”, „ignore-space-at-eol”, „ignore-all-space”, „allow-indentation-"
"change”"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3380,12 +3408,12 @@
"color-moved-ws: allow-indentation-change nie może być łączone z innymi "
"trybami białych znaków"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Nierozpoznana wartość zmiennej konfiguracji „diff.submodule”: „%s”"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3394,35 +3422,47 @@
"Znaleziono błędy w zmiennej konfiguracji „diff.dirstat”:\n"
"%s"
-#: diff.c:4276
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "zewnętrzny diff padł, zatrzymano na %s"
-#: diff.c:4628
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s się wykluczają"
-#: diff.c:4631
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S i --find-object się wykluczają"
-#: diff.c:4710
+#: diff.c:4648
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr "-G i --pickaxe-regex się wykluczają, użyj --pickaxe-regex z -S"
+
+#: diff.c:4651
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all i --find-object się wykluczają, użyj --pickaxe-all z -G i -S"
+
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow wymaga dokładnie jednej ścieżki"
-#: diff.c:4758
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "nieprawidłowa wartość --stat: %s"
-#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s oczekuje wartości liczbowej"
-#: diff.c:4795
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3431,197 +3471,197 @@
"Nie można przetworzyć parametru opcji --dirstat/-X:\n"
"%s"
-#: diff.c:4880
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "nieznana klasa zmian „%c” w --diff-filter=%s"
-#: diff.c:4904
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "nieznana wartość po ws-error-highlight=%.*s"
-#: diff.c:4918
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "nie można rozwiązać „%s”"
-#: diff.c:4968 diff.c:4974
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s oczekuje postaci <n>/<m>"
-#: diff.c:4986
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s oczekuje znaku, otrzymano „%s”"
-#: diff.c:5007
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "zły argument --color-moved: %s"
-#: diff.c:5026
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "nieprawidłowy tryb „%s” w --color-moved-ws"
-#: diff.c:5066
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"opcja diff-algorithm przyjmuje „myers”, „minimal”, „patience” i „histogram”"
-#: diff.c:5102 diff.c:5122
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "nieprawidłowy argument do %s"
-#: diff.c:5226
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "w -I podano nieprawidłowe wyrażenie regularne: „%s”"
-#: diff.c:5275
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "nie można przetworzyć parametru opcji --submodule: „%s”"
-#: diff.c:5331
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "zły argument --word-diff: %s"
-#: diff.c:5367
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Opcje formatu wyjściowego różnic"
-#: diff.c:5369 diff.c:5375
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "wygeneruj łatkę"
-#: diff.c:5372 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "nie wypisuj różnic"
-#: diff.c:5377 diff.c:5491 diff.c:5498
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5378 diff.c:5381
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "wygeneruj różnice z <n> wierszami kontekstu"
-#: diff.c:5383
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "wygeneruj różnice w surowym formacie"
-#: diff.c:5386
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "synonim do „-p --raw”"
-#: diff.c:5390
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "synonim do „-p --stat”"
-#: diff.c:5394
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat czytelne dla maszyny"
-#: diff.c:5397
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "wypisz tylko ostatni wiersz --stat"
-#: diff.c:5399 diff.c:5407
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5400
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "wypisz rozkład względnej ilości zmian w każdym podkatalogu"
-#: diff.c:5404
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "zamiennik na --dirstat=cumulative"
-#: diff.c:5408
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonim do --dirstat=files,param1,param2..."
-#: diff.c:5412
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"ostrzegaj, jeśli zmiany wprowadzają znaczniki konfliktów lub błędy białych "
"znaków"
-#: diff.c:5415
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "zwarte podsumowanie takie jak utworzenia czy zmiany nazw i trybów"
-#: diff.c:5418
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "pokazuj tylko nazwy zmienionych plików"
-#: diff.c:5421
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "pokazuj tylko nazwy i stan zmienionych plików"
-#: diff.c:5423
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<szerokość>[,<szerokość-nazwy>[,<liczba>]]"
-#: diff.c:5424
+#: diff.c:5444
msgid "generate diffstat"
msgstr "wygeneruj statystyki różnic"
-#: diff.c:5426 diff.c:5429 diff.c:5432
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<szerokość>"
-#: diff.c:5427
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "wygeneruj statystyki różnic o podanej szerokości"
-#: diff.c:5430
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "wygeneruj statystyki różnic o podanej szerokości nazw"
-#: diff.c:5433
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "wygeneruj statystyki różnic o podanej szerokości grafu"
-#: diff.c:5435
+#: diff.c:5455
msgid "<count>"
msgstr "<liczba>"
-#: diff.c:5436
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "wygeneruj statystyki różnic o ograniczonych wierszach"
-#: diff.c:5439
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "wygeneruj zwięzłe podsumowanie w statystykach różnic"
-#: diff.c:5442
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "wypisz binarne różnice, które mogą być zastosowane"
-#: diff.c:5445
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"pokaż pełne nazwy obiektów wstępnego i końcowego obrazu w wierszach „index”"
-#: diff.c:5447
+#: diff.c:5467
msgid "show colored diff"
msgstr "pokaż kolorowe różnice"
-#: diff.c:5448
+#: diff.c:5468
msgid "<kind>"
msgstr "<rodzaj>"
-#: diff.c:5449
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3629,94 +3669,94 @@
"podświetl błędy białych znaków w rodzaju wierszy różnic: „context”, „old” "
"lub „new”"
-#: diff.c:5452
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
"nie męcz ścieżek i użyj znaków NUL do rozdzielenia pól w --raw lub --numstat"
-#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefiks>"
-#: diff.c:5456
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "pokaż podany prefiks źródła zamiast „a/”"
-#: diff.c:5459
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "pokaż podany prefiks celu zamiast „b/”"
-#: diff.c:5462
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "dodatkowy prefiks do dodania przed każdym wierszem wyjścia"
-#: diff.c:5465
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "nie pokazuj żadnego prefiksu źródła ani celu"
-#: diff.c:5468
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "pokaż kontekst między skrawkami różnic do podanej liczby wierszy"
-#: diff.c:5472 diff.c:5477 diff.c:5482
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<znak>"
-#: diff.c:5473
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "podaj znak wskazujący nowy wiersz zamiast „+”"
-#: diff.c:5478
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "podaj znak wskazujący stary wiersz zamiast „-”"
-#: diff.c:5483
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "podaj znak wskazujący kontekst zamiast odstępu „ ”"
-#: diff.c:5486
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Opcje zmiany nazw różnic"
-#: diff.c:5487
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5488
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "rozbij zmiany zupełnego przepisania na pary usunięć i utworzeń"
-#: diff.c:5492
+#: diff.c:5512
msgid "detect renames"
msgstr "wykrywaj zmiany nazw"
-#: diff.c:5496
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "omiń wstępny obraz przy usunięciach"
-#: diff.c:5499
+#: diff.c:5519
msgid "detect copies"
msgstr "wykrywaj kopie"
-#: diff.c:5503
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "użyj niezmodyfikowanych plików jako źródła do znalezienia kopii"
-#: diff.c:5505
+#: diff.c:5525
msgid "disable rename detection"
msgstr "wyłącz wykrywanie zmian nazw"
-#: diff.c:5508
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "użyj pustych blobów jako źródła zmiany nazwy"
-#: diff.c:5510
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "kontynuuj wypisywanie historii pliku poza zmianami nazw"
-#: diff.c:5513
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3724,165 +3764,165 @@
"powstrzymaj wykrywanie zmian nazw i kopii, jeśli liczba zmian nazw / kopii "
"przekracza podaną granicę"
-#: diff.c:5515
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Opcje algorytmu różnic"
-#: diff.c:5517
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "wyprodukuj najmniejsze możliwe różnice"
-#: diff.c:5520
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignoruj zmiany w białych znakach przy porównywaniu plików"
-#: diff.c:5523
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignoruj zmiany w liczbie białych znaków"
-#: diff.c:5526
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignoruj zmiany w białych znakach na końcu wiersza"
-#: diff.c:5529
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "ignoruj powrót karetki (CR) na końcu wiersza"
-#: diff.c:5532
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "ignoruj zmiany, których wszystkie wiersze są puste"
-#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<wyr-reg>"
-#: diff.c:5535
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "ignoruj zmiany, których wszystkie wiersze pasują do <wyr-reg>"
-#: diff.c:5538
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heurystyka do przesunięcia granic skrawków różnic, aby ułatwić czytanie"
-#: diff.c:5541
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „cierpliwych różnic”"
-#: diff.c:5545
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „histogramu różnic”"
-#: diff.c:5547
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algorytm>"
-#: diff.c:5548
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "wybierz algorytm różnic"
-#: diff.c:5550
+#: diff.c:5570
msgid "<text>"
msgstr "<tekst>"
-#: diff.c:5551
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "wygeneruj różnice używając algorytmu „zakotwiczonych różnic”"
-#: diff.c:5553 diff.c:5562 diff.c:5565
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<tryb>"
-#: diff.c:5554
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "pokaż różnice słów, używając <trybu> do rozdzielenia zmienionych słów"
-#: diff.c:5557
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "użyj <wyr-reg>, aby zdecydować, czym jest słowo"
-#: diff.c:5560
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "równoważne --word-diff=color --word-diff-regex=<wyr-reg>"
-#: diff.c:5563
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "przeniesione wiersze kodu są kolorowane inaczej"
-#: diff.c:5566
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "jak są ignorowane białe znaki w --color-moved"
-#: diff.c:5569
+#: diff.c:5589
msgid "Other diff options"
msgstr "Inne opcje różnic"
-#: diff.c:5571
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"kiedy uruchomione z podkatalogu, pomiń zmiany poza nim i pokaż względne "
"ścieżki"
-#: diff.c:5575
+#: diff.c:5595
msgid "treat all files as text"
msgstr "traktuj wszystkie pliki jako tekstowe"
-#: diff.c:5577
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "zamień dwa wejścia, odwróć różnice"
-#: diff.c:5579
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "wyjdź z 1 jeśli nie ma różnic, 0 w przeciwnym wypadku"
-#: diff.c:5581
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "wyłącz całe wyjście programu"
-#: diff.c:5583
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "pozwól wykonać zewnętrzny pomocnik różnic"
-#: diff.c:5585
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"wykonaj zewnętrzne filtry konwersji tekstu przy porównywaniu plików binarnych"
-#: diff.c:5587
+#: diff.c:5607
msgid "<when>"
msgstr "<kiedy>"
-#: diff.c:5588
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
-msgstr "ignoruj zmiany w pod-modułach przy generowaniu różnic"
+msgstr "ignoruj zmiany w podmodułach przy generowaniu różnic"
-#: diff.c:5591
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5592
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
-msgstr "podaj, jak będą pokazywane różnice w pod-modułach"
+msgstr "podaj, jak będą pokazywane różnice w podmodułach"
-#: diff.c:5596
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "ukryj elementy „git add -N” z indeksu"
-#: diff.c:5599
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "traktuj elementy „git add -N” jako prawdziwe w indeksie"
-#: diff.c:5601
+#: diff.c:5621
msgid "<string>"
msgstr "<łańcuch>"
-#: diff.c:5602
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego łańcucha"
-#: diff.c:5605
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3890,67 +3930,67 @@
"szukaj różnic, które zmieniają liczbę wystąpień podanego wyrażenia "
"regularnego"
-#: diff.c:5608
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "pokaż wszystkie zmiany w zestawie z -S lub -G"
-#: diff.c:5611
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "traktuj <łańcuch> w -S jako rozszerzone wyrażenie regularne POSIX"
-#: diff.c:5614
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "ustaw kolejność, w jakiej pliki pojawią się na wyjściu"
-#: diff.c:5615 diff.c:5618
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<ścieżka>"
-#: diff.c:5616
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "pokaż najpierw zmianę w podanej ścieżce"
-#: diff.c:5619
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "pomiń wyjście do podanej ścieżki"
-#: diff.c:5621
+#: diff.c:5641
msgid "<object-id>"
msgstr "<id-obiektu>"
-#: diff.c:5622
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego obiektu"
-#: diff.c:5624
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5625
+#: diff.c:5645
msgid "select files by diff type"
msgstr "wybierz pliki według rodzaju różnic"
-#: diff.c:5627
+#: diff.c:5647
msgid "<file>"
msgstr "<plik>"
-#: diff.c:5628
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Wyjście do podanego pliku"
-#: diff.c:6285
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6306
+msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
-"pominięto wykrywanie niedokładnych zmian nazw z powodu zbyt wielu plików."
+"pominięto wyczerpujące wykrywanie zmian nazw z powodu zbyt wielu plików."
-#: diff.c:6288
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"znaleziono kopie tylko ze zmienionych ścieżek z powodu zbyt wielu plików."
-#: diff.c:6291
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3962,7 +4002,7 @@
msgid "failed to read orderfile '%s'"
msgstr "nie można odczytać pliku kolejności „%s”"
-#: diffcore-rename.c:555
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Wykrywanie niedokładnych zmian nazw"
@@ -3971,65 +4011,73 @@
msgid "No such path '%s' in the diff"
msgstr "W różnicy nie ma ścieżki „%s”"
-#: dir.c:578
+#: dir.c:593
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "ścieżka „%s” nie pasuje do żadnych plików znanych gitowi"
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "nierozpoznany wzorzec: %s"
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "nierozpoznany antywzorzec: „%s”"
-#: dir.c:809
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"twój plik rzadkiego wybrania może mieć problemy: wzorzec „%s” jest powtórzony"
-#: dir.c:819
+#: dir.c:830
msgid "disabling cone pattern matching"
msgstr "wyłączanie stożkowego dopasowania wzorca"
-#: dir.c:1198
+#: dir.c:1214
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "nie można użyć %s jako pliku wyłączeń"
-#: dir.c:2305
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "nie można otworzyć katalogu „%s”"
-#: dir.c:2605
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "nie można uzyskać nazwy i informacji jądra"
-#: dir.c:2729
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "pamięć o nieśledzonych jest wyłączona w tym systemie lub położeniu"
-#: dir.c:3537
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nie można zgadnąć nazwy katalogu.\n"
+"Podaj katalog w wierszu poleceń"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "uszkodzony plik indeksu w repozytorium %s"
-#: dir.c:3582 dir.c:3587
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "nie można utworzyć katalogów dla %s"
-#: dir.c:3616
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "nie można zmigrować katalogu gita z „%s” do „%s”"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
@@ -4038,288 +4086,371 @@
msgid "Filtering content"
msgstr "Filtrowanie zawartości"
-#: entry.c:478
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "nie można wykonać stat na pliku „%s”"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "zła ścieżka przestrzeni nazw gita „%s”"
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "nie można ustawić GIT_DIR na „%s”"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "za dużo argumentów, aby wykonać %s"
-#: fetch-pack.c:177
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: oczekiwano listy shallow"
-#: fetch-pack.c:180
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: oczekiwano pakietu wypróżnienia po płytkiej liście"
-#: fetch-pack.c:191
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
-#: fetch-pack.c:211
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano „%s”"
-#: fetch-pack.c:222
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "nie można pisać do zdalnego repozytorium"
-#: fetch-pack.c:283
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc wymaga multi_ack_detailed"
-#: fetch-pack.c:378 fetch-pack.c:1400
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "nieprawidłowy wiersz shallow: %s"
-#: fetch-pack.c:384 fetch-pack.c:1406
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "nieprawidłowy wiersz unshallow: %s"
-#: fetch-pack.c:386 fetch-pack.c:1408
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "nie znaleziono obiektu: %s"
-#: fetch-pack.c:389 fetch-pack.c:1411
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "błąd w obiekcie: %s"
-#: fetch-pack.c:391 fetch-pack.c:1413
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "nie znaleziono shallow: %s"
-#: fetch-pack.c:394 fetch-pack.c:1417
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "oczekiwano shallow/unshallow, otrzymano %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "dostałem %s %d %s"
-#: fetch-pack.c:451
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "nieprawidłowy zapis %s"
-#: fetch-pack.c:482
+#: fetch-pack.c:498
msgid "giving up"
msgstr "poddaję się"
-#: fetch-pack.c:495 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "gotowe"
-#: fetch-pack.c:507
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "dostałem %s (%d) %s"
-#: fetch-pack.c:543
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Oznaczam %s jako gotowe"
-#: fetch-pack.c:758
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "już mam %s (%s)"
-#: fetch-pack.c:821
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: nie można uruchomić rozdzielania pasma bocznego"
-#: fetch-pack.c:829
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "błąd protokołu: zły nagłówek paczki"
-#: fetch-pack.c:913
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: nie można uruchomić %s"
-#: fetch-pack.c:931
+#: fetch-pack.c:968
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: nieprawidłowe wyjście index-pack"
+
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s nie powiodło się"
-#: fetch-pack.c:933
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "błąd rozdzielania pasma bocznego"
-#: fetch-pack.c:976
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Wersja serwera to %.*s"
-#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999
-#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015
-#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031
-#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Serwer wspiera %s"
-#: fetch-pack.c:986
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Serwer nie wspiera płytkich klientów"
-#: fetch-pack.c:1046
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Serwer nie wspiera --shallow-since"
-#: fetch-pack.c:1051
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Serwer nie wspiera --shallow-exclude"
-#: fetch-pack.c:1055
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Serwer nie wspiera --deepen"
-#: fetch-pack.c:1057
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Serwer nie wspiera formatu obiektów z tego repozytorium"
-#: fetch-pack.c:1070
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "brak wspólnych zapisów"
-#: fetch-pack.c:1082 fetch-pack.c:1622
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+msgid "source repository is shallow, reject to clone."
+msgstr "źródłowe repozytorium jest płytkie, odmowa klonowania."
+
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: pobieranie nie powiodło się."
-#: fetch-pack.c:1208
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "niezgodne algorytmy: klient %s; serwer %s"
-#: fetch-pack.c:1212
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "serwer nie wspiera algorytmu „%s”"
-#: fetch-pack.c:1232
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Serwer nie wspiera płytkich żądań"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Serwer wspiera filtrowanie"
-#: fetch-pack.c:1278
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "nie można pisać żądania do zdalnej maszyny"
-#: fetch-pack.c:1296
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "błąd odczytu nagłówka rozdziału „%s”"
-#: fetch-pack.c:1302
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "oczekiwano „%s”, odebrano „%s”"
-#: fetch-pack.c:1363
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "nieoczekiwany wiersz potwierdzenia: „%s”"
-#: fetch-pack.c:1368
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "błąd przetwarzania potwierdzeń: %d"
-#: fetch-pack.c:1378
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "oczekiwano pliku paczki wysłanego po „ready”"
-#: fetch-pack.c:1380
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "nie oczekiwano innych rozdziałów wysłanych po braku „ready”"
-#: fetch-pack.c:1422
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "błąd przetwarzania płytkich informacji: %d"
-#: fetch-pack.c:1469
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "oczekiwano wanted-ref, otrzymano %s"
-#: fetch-pack.c:1474
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "nieoczekiwana wanted-ref: „%s”"
-#: fetch-pack.c:1479
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "błąd przetwarzania chcianych referencji: %d"
-#: fetch-pack.c:1509
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: oczekiwano pakietu końca odpowiedzi"
-#: fetch-pack.c:1891
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "brak pasującego zdalnego czoła"
-#: fetch-pack.c:1914 builtin/clone.c:693
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "zdalna maszyna nie przysłała wszystkich potrzebnych obiektów"
-#: fetch-pack.c:1941
+#: fetch-pack.c:2075
+msgid "unexpected 'ready' from remote"
+msgstr "nieoczekiwane „ready” od zdalnej maszyny"
+
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "nie ma takiej zdalnej referencji %s"
-#: fetch-pack.c:1944
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Serwer nie pozwala na żądanie o nieogłoszony obiekt %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "nie można utworzyć pliku tymczasowego"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "nie można zapisać oddzielonego podpisu do „%s”"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile musi być ustawiony i istnieć, aby sprawdzać "
+"podpisy ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"potrzeba ssh-keygen -Y find-principals/verify, aby sprawdzać podpisy ssh "
+"(dostępne w wersji openssh 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "ustawiono plik odwołania podpisów ssh, ale go nie znaleziono: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "zły/niekompatybilny podpis „%s”"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "nie można zdobyć odcisku klucza ssh „%s”"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "należy ustawić user.signingkey lub gpg.ssh.defaultKeyCommand"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand powiodło się, ale nie zwróciło żadnych kluczy: %s "
+"%s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand zawiodło: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg nie może podpisać danych"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "do podpisywania ssh potrzeba user.signingkey"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "nie można zapisać klucza podpisującego ssh do „%s”"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "nie można zapisać buforu klucza podpisującego ssh do „%s”"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"do podpisywania ssh wymagany jest podpis ssh-keygen -Y (dostępne od wersji "
+"openssh 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "nie można odczytać bufora danych podpisu ssh z „%s”"
+
#: graph.c:98
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignoruj nieprawidłowy kolor „%.*s” w log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "pominięto nieprawidłowy kolor „%.*s” w log.graphColors"
-#: grep.c:543
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4327,110 +4458,110 @@
"podany wzorzec zawiera znak NUL (przez -f <plik>). To jest wspierane tylko z "
"-P pod PCRE v2"
-#: grep.c:1906
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s”: nie można przeczytać %s"
-#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
-#: builtin/rm.c:135
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "nie można wykonać stat na „%s”'"
-#: grep.c:1934
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "„%s”: przeczytano mniej niż powinno być"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "przyszykuj obszar do pracy (zobacz też: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "pracuj nad bieżącą zmianą (zobacz też: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "badaj historię i stan (zobacz też: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "poszerzaj, oznaczaj i dostosowuj wspólną historię"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "współpracuj (zobacz też: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Główne porcelanowe polecenia"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Polecenia pomocnicze / manipulatory"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Polecenia pomocnicze / odpytywanie"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Interakcje z innymi"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Polecenia niskopoziomowe / manipulatory"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Polecenia niskopoziomowe / odpytywanie"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Polecenia niskopoziomowe / synchronizacja repozytoriów"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Polecenia niskopoziomowe / wewnętrzne pomocniki"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "dostępne polecenia gita w „%s”"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "polecenia gita dostępne gdzie indziej w ścieżce $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Oto częste polecenia Gita używane w różnych sytuacjach:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "nieobsługiwany rodzaj spisu poleceń „%s”"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Podręczniki pojęć Gita to:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Zobacz „git help <polecenie>”, aby przeczytać o konkretnym pod-poleceniu"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Zewnętrzne polecenia"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Skróty poleceń"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4570,36 @@
"„%s” wydaje się być poleceniem gita, ale nie udało się\n"
"go wykonać. Może git-%s się zepsuł?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s” nie jest poleceniem gita. Zobacz „git --help”."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "O jejciu. Twój system w ogóle nie zgłasza żadnych poleceń gita."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "Ostrzeżenie: Wywołano polecenie Gita „%s”, które nie istnieje."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Zakładam dalej, że chodziło o „%s”."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Wykonać zamiast tego „%s”? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Kontynuowanie za %0.1f sekundy, zakładam, że chodziło o „%s”."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4480,16 +4616,16 @@
"\n"
"Najpodobniejsze polecenia to"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<opcje>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4506,6 +4642,15 @@
"\n"
"Czy chodziło o któreś z tych?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Skrypt repozytorium „%s” został zignorowany, bo nie jest wykonywalny.\n"
+"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false”."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Nieznana tożsamość autora\n"
@@ -4568,47 +4713,52 @@
msgid "name consists only of disallowed characters: %s"
msgstr "nazwisko składa się wyłącznie z niedozwolonych znaków: %s"
-#: ident.c:454 builtin/commit.c:634
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "nieprawidłowy format daty: %s"
-#: list-objects-filter-options.c:81
+#: list-objects-filter-options.c:83
msgid "expected 'tree:<depth>'"
msgstr "oczekiwano „tree:<głębokość>”"
-#: list-objects-filter-options.c:96
+#: list-objects-filter-options.c:98
msgid "sparse:path filters support has been dropped"
msgstr "wsparcie filtrów sparse:path zostało porzucone"
-#: list-objects-filter-options.c:109
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "„%s” do „object:type=<typ>” nie jest prawidłowym typem obiektu"
+
+#: list-objects-filter-options.c:124
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "nieprawidłowy filtr: %s"
-#: list-objects-filter-options.c:125
+#: list-objects-filter-options.c:140
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "trzeba zacytować znak w podfiltrze: „%c”"
-#: list-objects-filter-options.c:167
+#: list-objects-filter-options.c:182
msgid "expected something after combine:"
msgstr "oczekiwano czegoś po combine:"
-#: list-objects-filter-options.c:249
+#: list-objects-filter-options.c:264
msgid "multiple filter-specs cannot be combined"
msgstr "nie można łączyć podania wielu filtrów"
-#: list-objects-filter-options.c:361
+#: list-objects-filter-options.c:376
msgid "unable to upgrade repository format to support partial clone"
msgstr "nie można podnieść formatu repozytorium, aby wspierać częściowy klon"
-#: list-objects-filter.c:492
+#: list-objects-filter.c:532
#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr "brak dostępu do rzadkiego bloba w „%s”"
-#: list-objects-filter.c:495
+#: list-objects-filter.c:535
#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr "nie można przetworzyć danych rzadkiego filtra w %s"
@@ -4623,7 +4773,7 @@
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "element „%s” drzewa %s ma tryb blobu, ale nie jest blobem"
-#: list-objects.c:375
+#: list-objects.c:398
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "nie można wczytać drzewa korzenia dla zapisu %s"
@@ -4657,45 +4807,59 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "nieprawidłowa wartość „%s” lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "nieoczekiwany wiersz: „%s”"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "oczekiwano wypróżnienia po argumentach ls-refs"
-#: merge-ort.c:855 merge-recursive.c:1191
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "wykryto zacytowany CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "złe działanie „%s” w „%s”"
+
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Nie można scalić pod-modułu %s (nie wybrano)"
+msgstr "Nie można scalić podmodułu %s (nie wybrano)"
-#: merge-ort.c:864 merge-recursive.c:1198
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Nie można scalić pod-modułu %s (brak zapisów)"
+msgstr "Nie można scalić podmodułu %s (brak zapisów)"
-#: merge-ort.c:873 merge-recursive.c:1205
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Nie można scalić pod-modułu %s (zapisy nie śledzą podstawy scalania)"
+msgstr "Nie można scalić podmodułu %s (zapisy nie śledzą podstawy scalania)"
-#: merge-ort.c:883 merge-ort.c:890
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Uwaga: Przewinięcie pod-modułu %s do %s"
+msgstr "Uwaga: Przewinięcie podmodułu %s do %s"
-#: merge-ort.c:911
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
-msgstr "Nie można scalić pod-modułu %s"
+msgstr "Nie można scalić podmodułu %s"
-#: merge-ort.c:918
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieje możliwe rozwiązanie:\n"
+"Nie można scalić podmodułu %s, ale istnieje możliwe rozwiązanie:\n"
"%s\n"
-#: merge-ort.c:922 merge-recursive.c:1259
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4712,30 +4876,30 @@
"\n"
"które przyjmie tylko tę sugestię.\n"
-#: merge-ort.c:935
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieją możliwe scalenia:\n"
+"Nie można scalić podmodułu %s, ale istnieją możliwe scalenia:\n"
"%s"
-#: merge-ort.c:1094 merge-recursive.c:1341
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Nie można wykonać wewnętrznego scalenia"
-#: merge-ort.c:1099 merge-recursive.c:1346
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Nie można dodać %s do bazy danych"
-#: merge-ort.c:1106 merge-recursive.c:1378
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-scalanie %s"
-#: merge-ort.c:1245 merge-recursive.c:2100
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4744,7 +4908,7 @@
"KONFLIKT (domyślna zmiana nazwy katalogu): Istniejący plik/katalog %s "
"zawadza domyślnej zmianie nazwy wstawiając tam następujące ścieżki: %s."
-#: merge-ort.c:1255 merge-recursive.c:2110
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4754,7 +4918,7 @@
"jednej ścieżki do %s; domyślna zmiana nazwy próbowała wstawić tam "
"następujące ścieżki: %s"
-#: merge-ort.c:1438
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4762,10 +4926,10 @@
"majority of the files."
msgstr ""
"KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, jak zmienić nazwę "
-"%s; jego nazwa została zmieniona na wiele innych katalogów, a "
-"żaden z celów nie dostał większości plików."
+"%s; jego nazwa została zmieniona na wiele innych katalogów, a żaden z celów "
+"nie dostał większości plików."
-#: merge-ort.c:1604 merge-recursive.c:2447
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4774,7 +4938,7 @@
"Ostrzeżenie: unikam zastosowania zmiany nazwy %s -> %s na %s, bo %s sam "
"zmienił nazwę."
-#: merge-ort.c:1748 merge-recursive.c:3215
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +4947,7 @@
"Zaktualizowano ścieżkę: %s dodano w %s w katalogu, którego nazwa została "
"zmieniona w %s; przenoszenie go do %s."
-#: merge-ort.c:1755 merge-recursive.c:3222
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +4956,7 @@
"Zaktualizowano ścieżkę: zmieniono nazwę %s na %s w %s w katalogu, którego "
"nazwa została zmieniona w %s; przenoszenie go do %s."
-#: merge-ort.c:1768 merge-recursive.c:3218
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +4965,7 @@
"KONFLIKT (położenie pliku): %s dodano w %s w katalogu, którego nazwa została "
"zmieniona w %s, co sugeruje, że być może powinien trafić do %s."
-#: merge-ort.c:1776 merge-recursive.c:3225
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4811,14 +4975,14 @@
"którego nazwa została zmieniona w %s, co sugeruje, że być może powinien "
"trafić do %s."
-#: merge-ort.c:1919
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
-"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwę %s na %s w %s, a na %s"
-" w %s."
+"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwę %s na %s w %s, a na %s "
+"w %s."
-#: merge-ort.c:2014
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,18 +4990,27 @@
"markers."
msgstr ""
"KONFLIKT (zmiana nazwy związana z kolizją): zmiana nazwy %s -> %s miała "
-"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować"
-" zagnieżdżonymi "
-"znacznikami konfliktu."
+"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować "
+"zagnieżdżonymi znacznikami konfliktu."
-#: merge-ort.c:2033 merge-ort.c:2057
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
-"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale"
-" skasowano w %s."
+"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale "
+"skasowano w %s."
-#: merge-ort.c:2683
+#: merge-ort.c:3212 merge-recursive.c:3022
+#, c-format
+msgid "cannot read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: merge-ort.c:3215 merge-recursive.c:3025
+#, c-format
+msgid "object %s is not a blob"
+msgstr "obiekt %s nie jest blobem"
+
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4846,42 +5019,42 @@
"KONFLIKT (plik/katalog): katalog zawadza %s z %s; zamiast tego przenoszenie "
"do %s."
-#: merge-ort.c:2756
+#: merge-ort.c:3721
#, c-format
msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
-"%s "
-"z nich, więc każdy może być gdzieś odnotowany."
+"obu, by każdy mógł być gdzieś odnotowany."
-#: merge-ort.c:2760
-msgid "both"
-msgstr "obu"
+#: merge-ort.c:3728
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
+"jednego, by każdy mógł być gdzieś odnotowany."
-#: merge-ort.c:2760
-msgid "one"
-msgstr "jednej"
-
-#: merge-ort.c:2855 merge-recursive.c:3052
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "zawartość"
-#: merge-ort.c:2857 merge-recursive.c:3056
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "dodano/dodano"
-#: merge-ort.c:2859 merge-recursive.c:3101
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
-msgstr "pod-moduł"
+msgstr "podmoduł"
-#: merge-ort.c:2861 merge-recursive.c:3102
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Konflikt scalania w %s"
-#: merge-ort.c:2886
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4890,15 +5063,24 @@
"KONFLIKT (zmiana/usunięcie): %s usunięto w %s a zmieniono w %s. Wersja %s "
"pliku %s pozostaje w drzewie."
+#: merge-ort.c:4152
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Uwaga: %s nieaktualne i zawadza wybraniu skonfliktowanej wersji; nazwa "
+"starej kopii zmieniona na %s"
+
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:3354
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "nie można zebrać informacji o scaleniu w drzewach %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4908,107 +5090,106 @@
"scalenie:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, c-format
-msgid "Already up to date!"
-msgstr "Już aktualne!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+msgid "Already up to date."
+msgstr "Już aktualne."
-#: merge-recursive.c:356
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(zły zapis)\n"
-#: merge-recursive.c:379
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo nie powiodło się na ścieżce „%s”; przerywanie scalania."
-#: merge-recursive.c:388
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo nie udało się odświeżyć na ścieżce „%s”; przerywanie scalania."
-#: merge-recursive.c:874
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "nie można utworzyć ścieżki „%s”%s"
-#: merge-recursive.c:885
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Usuwanie %s, aby zrobić miejsce na podkatalog\n"
-#: merge-recursive.c:899 merge-recursive.c:918
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": Może konflikt plik/katalog?"
-#: merge-recursive.c:908
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "Odmawiam utraty nieśledzonego pliku w „%s”"
-#: merge-recursive.c:949 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "nie można odczytać obiektu %s „%s”"
-#: merge-recursive.c:954
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "oczekiwano blobu w %s „%s”"
-#: merge-recursive.c:979
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "nie można otworzyć „%s”: %s"
-#: merge-recursive.c:990
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "nie można dowiązać „%s”: „%s”"
-#: merge-recursive.c:995
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "nie wiem, co zrobić z %06o %s „%s”"
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Przewinięcie pod-modułu %s do następującego zapisu:"
+msgstr "Przewinięcie podmodułu %s do następującego zapisu:"
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
-msgstr "Przewinięcie pod-modułu %s"
+msgstr "Przewinięcie podmodułu %s"
-#: merge-recursive.c:1251
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Nie można scalić pod-modułu %s (nie znaleziono scalenia po zapisie)"
+msgstr "Nie można scalić podmodułu %s (nie znaleziono scalenia po zapisie)"
-#: merge-recursive.c:1255
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Nie można scalić pod-modułu %s (nie przewija się)"
+msgstr "Nie można scalić podmodułu %s (nie przewija się)"
-#: merge-recursive.c:1256
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Znaleziono możliwe rozwiązanie scalenia dla pod-modułu:\n"
+msgstr "Znaleziono możliwe rozwiązanie scalenia dla podmodułu:\n"
-#: merge-recursive.c:1268
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Nie można scalić pod-modułu %s (znaleziono wiele scaleń)"
+msgstr "Nie można scalić podmodułu %s (znaleziono wiele scaleń)"
-#: merge-recursive.c:1402
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Błąd: Odmawiam utraty nieśledzonego pliku w %s; zamiast tego zapisywanie do "
"%s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5017,7 +5198,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
"pozostaje w drzewie."
-#: merge-recursive.c:1479
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5026,7 +5207,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
"%s pozostaje w drzewie."
-#: merge-recursive.c:1486
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5035,7 +5216,7 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
"pozostaje w drzewie na %s."
-#: merge-recursive.c:1491
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5044,42 +5225,42 @@
"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
"%s pozostaje w drzewie na %s."
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
msgid "rename"
msgstr "zmiana nazwy"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "zmieniono nazwę"
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Odmawiam utraty brudnego pliku w %s"
-#: merge-recursive.c:1587
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Odmawiam utraty nieśledzonego pliku w %s, mimo że nie zawadza."
-#: merge-recursive.c:1645
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (zmiana nazwy/dodanie): Zmiana nazwy %s->%s w %s. Dodano %s w %s"
-#: merge-recursive.c:1676
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s jest katalogiem w %s dodawanie zamiast tego jako %s"
-#: merge-recursive.c:1681
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Odmawiam utraty nieśledzonego pliku w %s; dodawanie zamiast tego jako %s"
-#: merge-recursive.c:1708
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5088,18 +5269,18 @@
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy „%s”->„%s” w gałęzi „%s” "
"zmiana nazwy „%s”->„%s” w „%s”%s"
-#: merge-recursive.c:1713
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (nierozwiązane)"
-#: merge-recursive.c:1805
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy %s->%s w %s. Zmiana nazwy "
"%s->%s w %s"
-#: merge-recursive.c:2068
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5110,7 +5291,7 @@
"%s, bo nazwa katalogu %s została zmieniona na wiele innych katalogów, a "
"żaden z celów nie dostał większości plików."
-#: merge-recursive.c:2202
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5119,72 +5300,62 @@
"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy katalogu %s->%s w %s. "
"Zmiana nazwy katalogu %s->%s w %s"
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr "nie można odczytać obiektu %s"
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr "obiekt %s nie jest blobem"
-
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
msgid "modify"
msgstr "zmiana"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
msgid "modified"
msgstr "zmieniono"
-#: merge-recursive.c:3079
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Pominięto %s (scalono tak samo jak istniejące)"
-#: merge-recursive.c:3132
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Dodawanie zamiast tego jako %s"
-#: merge-recursive.c:3339
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "plik/katalog"
-#: merge-recursive.c:3367
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "katalog/plik"
-#: merge-recursive.c:3374
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "KONFLIKT (%s): Jest już katalog o nazwie %s w %s. Dodawanie %s jako %s"
-#: merge-recursive.c:3383
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Dodawanie %s"
-#: merge-recursive.c:3392
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (dodanie/dodanie): Konflikt scalania w %s"
-#: merge-recursive.c:3445
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "nie można scalić drzew %s i %s"
-#: merge-recursive.c:3539
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Scalanie:"
-#: merge-recursive.c:3552
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -5192,17 +5363,17 @@
msgstr[1] "znaleziono %u wspólnych przodków:"
msgstr[2] "znaleziono %u wspólnych przodków:"
-#: merge-recursive.c:3602
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "scalenie nie zwróciło żadnych zapisów"
-#: merge-recursive.c:3758
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Nie można przetworzyć obiektu „%s”"
-#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
-#: builtin/stash.c:471
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Nie można zapisać indeksu."
@@ -5210,189 +5381,240 @@
msgid "failed to read the cache"
msgstr "nie można odczytać pamięci podręcznej"
-#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
-#: builtin/stash.c:265
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "nie można zapisać nowego pliku indeksu"
-#: midx.c:80
+#: midx.c:78
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "fanout OID indeksu wielu paczek ma nieprawidłowy rozmiar"
+
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "plik indeksu wielu paczek %s jest za mały"
-#: midx.c:96
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "podpis indeksu wielu paczek 0x%08x nie zgadza się z podpisem 0x%08x"
-#: midx.c:101
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "nie rozpoznano wersji %d indeksu wielu paczek"
-#: midx.c:106
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "wersja skrótu indeksu wielu paczek %u nie zgadza się z wersją %u"
-#: midx.c:123
-msgid "invalid chunk offset (too large)"
-msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
-
-#: midx.c:147
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "kończący identyfikator indeksu wielu paczek występuje przedwcześnie"
-
-#: midx.c:160
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
"w indeksie wielu paczek brakuje wymaganego kawałka nazwy paczki (pack-name)"
-#: midx.c:162
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka fanout OID"
-#: midx.c:164
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka odnajdywania OID"
-#: midx.c:166
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "w indeksie wielu paczek brakuje wymaganego kawałka przesunięć obiektów"
-#: midx.c:180
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "nazwy paczek indeksu wielu paczek poza kolejnością: „%s” przed „%s”"
-#: midx.c:223
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "złe pack-int-id: %u (razem %u paczek)"
-#: midx.c:273
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"indeks wielu paczek przechowuje 64-bitowe przesunięcie, ale off_t jest za "
"małe"
-#: midx.c:480
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "nie można dodać pliku paczki „%s”"
-#: midx.c:486
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "nie można otworzyć indeksu paczki „%s”"
-#: midx.c:546
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "nie można odnaleźć obiektu %d w pliku paczki"
-#: midx.c:846
+#: midx.c:892
+msgid "cannot store reverse index file"
+msgstr "nie można zapisać pliku odwrotnego indeksu"
+
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "nie można przetworzyć wiersza: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "uszkodzony wiersz: %s"
+
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "pomijanie istniejącego multi-pack-index; niezgodność sum kontrolnych"
+
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "nie można załadować paczki"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Dodawanie plików paczek do indeksu wielu paczek"
-#: midx.c:879
+#: midx.c:1244
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "nieznana paczka preferowana: %s"
+
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "nie można wybierać preferowanej paczki %s bez obiektów"
+
+#: midx.c:1321
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "nie widać pliku paczki %s do porzucenia"
-#: midx.c:931
+#: midx.c:1367
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "paczka preferowana „%s” wygasła"
+
+#: midx.c:1380
msgid "no pack files to index."
msgstr "brak plików paczek do zaindeksowania."
-#: midx.c:982
-msgid "Writing chunks to multi-pack-index"
-msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "nie można zapisać bitmapy wielu paczek"
-#: midx.c:1060
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "nie można zapisać indeksu wielu paczek"
+
+#: midx.c:1486 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "nie można usunąć %s"
+
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "nie można wyczyścić indeksu wielu paczek w %s"
-#: midx.c:1116
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "plik indeksu wielu paczek istnieje, ale nie udało się go przetworzyć"
-#: midx.c:1124
+#: midx.c:1585
+msgid "incorrect checksum"
+msgstr "nieprawidłowa suma kontrolna"
+
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Szukanie wskazywanych plików paczek"
-#: midx.c:1139
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"fanout oid poza kolejnością: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1144
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx nie zawiera oid"
-#: midx.c:1153
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Weryfikowanie zamówienia OID w indeksie wielu paczek"
-#: midx.c:1162
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "odnajdywanie oid poza kolejnością: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1182
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Sortowanie obiektów według plików paczek"
-#: midx.c:1189
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Weryfikowanie przesunięć obiektów"
-#: midx.c:1205
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "nie można wczytać elementu paczki w oid[%d] = %s"
-#: midx.c:1211
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "nie można wczytać indeksu paczki z pliku paczki %s"
-#: midx.c:1220
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"nieprawidłowe przesunięcie obiektu w oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1245
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Zliczanie osiągalnych obiektów"
-#: midx.c:1255
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Znajdywanie i usuwanie niewskazywanych plików paczek"
-#: midx.c:1446
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "nie można uruchomić pack-objects"
-#: midx.c:1466
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "nie można zakończyć pack-objects"
-#: name-hash.c:538
+#: name-hash.c:542
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "nie można utworzyć wątku lazy_dir: %s"
-#: name-hash.c:560
+#: name-hash.c:564
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "nie można utworzyć wątku lazy_name: %s"
-#: name-hash.c:566
+#: name-hash.c:570
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "nie można dołączyć do wątku lazy_name: %s"
@@ -5436,274 +5658,275 @@
msgid "Bad %s value: '%s'"
msgstr "Zła wartość %s: „%s”"
-#: object-file.c:480
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "katalog obiektów %s nie istnieje; sprawdź .git/objects/info/alternates"
-#: object-file.c:531
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "nie można znormalizować ścieżki alternatywnego obiektu: %s"
-#: object-file.c:603
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: ignorowanie alternatywnych magazynów obiektów, zagnieżdżenie za głębokie"
-#: object-file.c:610
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nie można znormalizować katalogu obiektu: %s"
-#: object-file.c:653
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "nie można wykonać fdopen na pliku blokady alternatywnych obiektów"
-#: object-file.c:671
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "nie można odczytać pliku alternatywnych obiektów"
-#: object-file.c:678
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "nie można przenieść na miejsce nowego pliku alternatywnych obiektów"
-#: object-file.c:713
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "ścieżka „%s” nie istnieje"
-#: object-file.c:734
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repozytorium odniesienia „%s” jako łączone wybranie nie jest jeszcze "
"wspierane."
-#: object-file.c:740
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repozytorium odniesienia „%s” nie jest lokalnym repozytorium."
-#: object-file.c:746
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repozytorium odniesienia „%s” jest płytkie"
-#: object-file.c:754
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repozytorium odniesienia „%s” jest szczepione"
-#: object-file.c:814
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "nie znaleziono katalogu obiektów pasującego do „%s”"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "błędny wiersz przy przetwarzaniu alternatywnych referencji: %s"
-#: object-file.c:964
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "próba mmap %<PRIuMAX> ponad ograniczeniem %<PRIuMAX>"
-#: object-file.c:985
-msgid "mmap failed"
-msgstr "mmap nie powiodło się"
+#: object-file.c:1008
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap nie powiodło się%s"
-#: object-file.c:1149
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "plik obiektu %s jest pusty"
-#: object-file.c:1284 object-file.c:2477
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "uszkodzony wolny obiekt „%s”"
-#: object-file.c:1286 object-file.c:2481
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "śmieci na końcu wolnego obiektu „%s”"
-#: object-file.c:1328
-msgid "invalid object type"
-msgstr "zły rodzaj obiektu"
-
-#: object-file.c:1412
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1415
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "nie można rozpakować nagłówka %s"
-
-#: object-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1424
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "nie można przetworzyć nagłówka %s"
-#: object-file.c:1651
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "zły rodzaj obiektu"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "nie można rozpakować nagłówka %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "nagłówek %s za długi, przekracza %d bajtów"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "nie można odczytać obiektu %s"
-#: object-file.c:1655
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "nie znaleziono zastępstwa %s dla %s"
-#: object-file.c:1659
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "wolny obiekt %s (przechowywany w %s) jest uszkodzony"
-#: object-file.c:1663
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "spakowany obiekt %s (przechowywany w %s) jest uszkodzony"
-#: object-file.c:1768
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "nie można zapisać pliku %s"
-#: object-file.c:1775
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "nie można ustawić uprawnień na „%s”"
-#: object-file.c:1782
+#: object-file.c:1795
msgid "file write error"
msgstr "błąd zapisu pliku"
-#: object-file.c:1802
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "błąd podczas zamykania pliku wolnego obiektu"
-#: object-file.c:1867
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"niewystarczające uprawnienia, aby dodać obiekt do bazy danych repozytorium %s"
-#: object-file.c:1869
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "nie można utworzyć tymczasowego pliku"
-#: object-file.c:1893
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "nie można zapisać pliku wolnego obiektu"
-#: object-file.c:1899
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "nie można skompresować nowego obiektu %s (%d)"
-#: object-file.c:1903
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd w obiekcie %s nie powiodło się (%d)"
-#: object-file.c:1907
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "zamieszanie przez dane źródłowe niestabilnego obiektu dla %s"
-#: object-file.c:1917 builtin/pack-objects.c:1097
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "nie można wykonać utime() na %s"
-#: object-file.c:1994
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "nie można odczytać obiektu do %s"
-#: object-file.c:2045
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "uszkodzony zapis"
-#: object-file.c:2053
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "uszkodzony tag"
-#: object-file.c:2153
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "błąd odczytu podczas indeksowania %s"
-#: object-file.c:2156
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "przeczytano mniej niż oczekiwano przy indeksowaniu %s"
-#: object-file.c:2229 object-file.c:2239
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: nie można wstawić do bazy danych"
-#: object-file.c:2245
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: niewspierany typ pliku"
-#: object-file.c:2269
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s nie jest prawidłowym obiektem"
-#: object-file.c:2271
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s nie jest prawidłowym obiektem „%s”"
-#: object-file.c:2298 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "nie można otworzyć %s"
-#: object-file.c:2488 object-file.c:2541
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "niezgodne skróty %s (oczekiwano %s)"
-#: object-file.c:2512
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "nie można wykonać mmap %s"
-#: object-file.c:2517
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "nie można rozpakować nagłówka %s"
-#: object-file.c:2523
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "nie można przetworzyć nagłówka %s"
-#: object-file.c:2534
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "nie można rozpakować zawartości %s"
-#: object-name.c:486
+#: object-name.c:480
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "krótki identyfikator %s jest niejednoznaczny"
-#: object-name.c:497
+#: object-name.c:491
msgid "The candidates are:"
msgstr "Kandydaci to:"
-#: object-name.c:796
+#: object-name.c:790
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"
@@ -5727,22 +5950,22 @@
"Sprawdź te referencje i może je usuń. Wyłącz ten komunikat za pomocą\n"
"„git config advice.objectNameWarning false”"
-#: object-name.c:916
+#: object-name.c:910
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "dziennik „%.*s” sięga tylko %s"
-#: object-name.c:924
+#: object-name.c:918
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "dziennik „%.*s” ma tylko %d wpisów"
-#: object-name.c:1702
+#: object-name.c:1696
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "ścieżka „%s” istnieje na dysku, ale nie w „%.*s”"
-#: object-name.c:1708
+#: object-name.c:1702
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -5751,12 +5974,12 @@
"ścieżka „%s” istnieje, ale nie „%s”\n"
"wskazówka: Czy chodziło o „%.*s:%s” czyli „%.*s:./%s”?"
-#: object-name.c:1717
+#: object-name.c:1711
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "ścieżka „%s” nie istnieje w „%.*s”"
-#: object-name.c:1745
+#: object-name.c:1739
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -5765,7 +5988,7 @@
"ścieżka „%s” jest w indeksie, ale nie na etapie %d\n"
"wskazówka: Czy chodziło o „:%d:%s”?"
-#: object-name.c:1761
+#: object-name.c:1755
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -5774,21 +5997,21 @@
"ścieżka „%s” jest w indeksie, ale nie „%s”\n"
"wskazówka: Czy chodziło o „:%d:%s” czyli „:%d:./%s”?"
-#: object-name.c:1769
+#: object-name.c:1763
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "ścieżka „%s” istnieje na dysku, ale nie w indeksie"
-#: object-name.c:1771
+#: object-name.c:1765
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "ścieżka „%s” nie istnieje (ani na dysku, ani w indeksie)"
-#: object-name.c:1784
+#: object-name.c:1778
msgid "relative path syntax can't be used outside working tree"
-msgstr "składnia ścieżki względnej nie może być użyta poza drzewem roboczym"
+msgstr "składni ścieżki względnej nie można użyć poza drzewem roboczym"
-#: object-name.c:1922
+#: object-name.c:1916
#, c-format
msgid "invalid object name '%.*s'."
msgstr "nieprawidłowa nazwa obiektu: „%.*s”."
@@ -5803,91 +6026,109 @@
msgid "object %s is a %s, not a %s"
msgstr "obiekt %s to %s, nie %s"
-#: object.c:233
+#: object.c:250
#, c-format
msgid "object %s has unknown type id %d"
msgstr "obiekt %s ma nieznany identyfikator rodzaju %d"
-#: object.c:246
+#: object.c:263
#, c-format
msgid "unable to parse object: %s"
msgstr "nie można przetworzyć obiektu: %s"
-#: object.c:266 object.c:278
+#: object.c:283 object.c:295
#, c-format
msgid "hash mismatch %s"
msgstr "niezgodne skróty %s"
-#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "w bitmapie wielu paczek brakuje wymaganego odwrotnego indeksu"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: nie można otworzyć paczki"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "nie można uzyskać rozmiaru %s"
-#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "nie znaleziono %s w paczce %s na pozycji %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "nie można uzyskać użycia dysku %s"
-#: pack-revindex.c:220
+#: pack-revindex.c:221
#, c-format
msgid "reverse-index file %s is too small"
msgstr "plik odwrotnego indeksu %s jest za mały"
-#: pack-revindex.c:225
+#: pack-revindex.c:226
#, c-format
msgid "reverse-index file %s is corrupt"
msgstr "plik odwrotnego indeksu %s jest uszkodzony"
-#: pack-revindex.c:233
+#: pack-revindex.c:234
#, c-format
msgid "reverse-index file %s has unknown signature"
msgstr "plik odwrotnego indeksu %s ma nieznaną sygnaturę"
-#: pack-revindex.c:237
+#: pack-revindex.c:238
#, c-format
msgid "reverse-index file %s has unsupported version %<PRIu32>"
msgstr "plik odwrotnego indeksu %s ma niewspieraną wersję %<PRIu32>"
-#: pack-revindex.c:242
+#: pack-revindex.c:243
#, c-format
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr ""
"plik odwrotnego indeksu %s ma niewspierany identyfikator skrótu %<PRIu32>"
-#: pack-write.c:236
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "nie można i zapisać, i sprawdzić odwrotnego indeksu"
-#: pack-write.c:257
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "nie można wykonać stat: %s"
-#: pack-write.c:269
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "nie można dodać praw do odczytu %s"
-#: pack-write.c:502
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "nie można pisać do obiecującego pliku „%s”"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "pozycja przed końcem pliku paczki (zepsuty .idx?)"
-#: packfile.c:1934
+#: packfile.c:656
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "nie można wykonać mapowania pliku paczki %s%s"
+
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "pozycja przed początkiem indeksu paczki dla %s (uszkodzony indeks?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "pozycja za końcem indeksu paczki dla %s (ucięty indeks?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opcja „%s” oczekuje wartości liczbowej"
@@ -5907,72 +6148,72 @@
msgid "malformed object name '%s'"
msgstr "nieprawidłowa nazwa obiektu „%s”"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s wymaga wartości"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s i %s się wykluczają"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : wyklucza się z czymś innym"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s nie przyjmuje wartości"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s niedostępny"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
"%s oczekuje nieujemnej wartości całkowitej z nieobowiązkowym sufiksem k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "niejednoznaczna opcja: %s (może być --%s%s or --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "czy chodziło o „--%s” (z dwoma myślnikami)?"
-#: parse-options.c:666 parse-options.c:971
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "synonim do --%s"
-#: parse-options.c:862
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "nieznana opcja „%s”"
-#: parse-options.c:864
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "nieznany przełącznik „%c”"
-#: parse-options.c:866
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "nieznana opcja spoza zakresu ASCII w łańcuchu: „%s”"
-#: parse-options.c:890
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:909
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "użycie: %s"
@@ -5980,47 +6221,71 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:915
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " lub: %s"
-#: parse-options.c:918
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:957
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-ILE"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Nie można pozwolić grupie zapisywać do %s"
-#: pathspec.c:130
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Znak ucieczki „\\” niedozwolony jako ostatni znak w wartości atrybutu"
-#: pathspec.c:148
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Wolno użyć tylko jednego „attr:”."
-#: pathspec.c:151
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "atrybut nie może być pusty"
-#: pathspec.c:194
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "błędna nazwa atrybutu %s"
-#: pathspec.c:259
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "globalne ustawienia ścieżek „glob” i „noglob” się wykluczają"
-#: pathspec.c:266
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6028,51 +6293,51 @@
"globalne ustawienia ścieżek „literal” i wszystkie inne globalne wykluczają "
"się"
-#: pathspec.c:306
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "nieprawidłowy parametr magicznej ścieżki „prefix:”"
-#: pathspec.c:327
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Nieprawidłowy magiczny numer ścieżki „%.*s” w „%s”"
-#: pathspec.c:332
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Brakujący „)” pod koniec magicznej ścieżki w „%s”"
-#: pathspec.c:370
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Niezaimplementowany magiczny numer ścieżki „%c” w „%s”"
-#: pathspec.c:429
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: „literal” i „glob” się wykluczają"
-#: pathspec.c:445
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: „%s” jest poza repozytorium w „%s”"
-#: pathspec.c:521
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (skrót: '%c')"
-#: pathspec.c:531
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magiczna ścieżka niewspierana przez to polecenie: %s"
-#: pathspec.c:598
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "ścieżka „%s” przechodzi przez dowiązanie"
-#: pathspec.c:643
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "wiersz jest źle zacytowany: %s"
@@ -6086,14 +6351,14 @@
msgstr "nie można zapisać pakietu oddzielającego"
#: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "nie można zapisać bezstanowego pakietu separatora"
+msgid "unable to write response end packet"
+msgstr "nie można zapisać pakietu końca odpowiedzi"
#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "nie można zapisać pakietu wypróżnienia"
-#: pkt-line.c:153 pkt-line.c:239
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "błąd protokołu: niemożliwie długi wiersz"
@@ -6101,88 +6366,93 @@
msgid "packet write with format failed"
msgstr "nie można zapisać pakietu z formatem"
-#: pkt-line.c:203
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"zapis pakietu nie powiódł się — dane przekraczają maksymalny rozmiar pakietu"
-#: pkt-line.c:210 pkt-line.c:217
-msgid "packet write failed"
-msgstr "nie można zapisać pakietu"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "nie można zapisać pakietu: %s"
-#: pkt-line.c:302
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "błąd odczytu"
-#: pkt-line.c:310
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "zdalna maszyna nieoczekiwanie się rozłączyła"
-#: pkt-line.c:338
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "błąd protokołu: zły znak długości wiersza: %.4s"
-#: pkt-line.c:352 pkt-line.c:357
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "błąd protokołu: zła długość wiersza %d"
-#: pkt-line.c:373 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "błąd serwera: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Odświeżanie indeksu"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "nie można utworzyć wątkowanego lstat: %s"
-#: pretty.c:984
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "nie można przetworzyć formatu --pretty"
-#: promisor-remote.c:30
+#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr "promisor-remote: nie można oddzielić pod-procesu pobierania"
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
msgstr "promisor-remote: nie można zapisać do pod-procesu pobierania"
-#: promisor-remote.c:41
+#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr ""
"promisor-remote: nie można zamknąć standardowego wejścia do pod-procesu "
"pobierania"
-#: promisor-remote.c:53
+#: promisor-remote.c:54
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "obiecująca zdalna nazwa nie może zaczynać się od „/”: %s"
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: oczekiwano wypróżnienia po argumentach"
+
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr "Usuwanie zduplikowanych obiektów"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "nie można uruchomić „log”"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "nie można odczytać wyjścia „log”"
-#: range-diff.c:101 sequencer.c:5318
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "nie można przetworzyć zapisu „%s”"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6191,68 +6461,68 @@
"nie można przetworzyć pierwszego wiersza wyjścia „log”: nie zaczynał się od "
"„zapis”: „%s”"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "nie można przetworzyć nagłówka gita „%.*s”"
-#: range-diff.c:306
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "nie można wygenerować różnic"
-#: range-diff.c:558
+#: range-diff.c:559
msgid "--left-only and --right-only are mutually exclusive"
msgstr "--left-only i --right-only się wykluczają"
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
#, c-format
msgid "could not parse log for '%s'"
msgstr "nie można przetworzyć dziennika do „%s”"
-#: read-cache.c:682
+#: read-cache.c:710
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "nie dodam skrótu pliku „%s” („%s” już widnieje w indeksie)"
-#: read-cache.c:698
+#: read-cache.c:726
msgid "cannot create an empty blob in the object database"
msgstr "nie można utworzyć pustego blobu w bazie danych obiektów"
-#: read-cache.c:720
+#: read-cache.c:748
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s: można dodać tylko zwykłe pliki, dowiązania i katalogi gita"
-#: read-cache.c:725
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "„%s” nie ma wybranego zapisu"
-#: read-cache.c:777
+#: read-cache.c:805
#, c-format
msgid "unable to index file '%s'"
msgstr "nie można zaindeksować pliku „%s”"
-#: read-cache.c:796
+#: read-cache.c:824
#, c-format
msgid "unable to add '%s' to index"
msgstr "nie można dodać „%s” do indeksu"
-#: read-cache.c:807
+#: read-cache.c:835
#, c-format
msgid "unable to stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: read-cache.c:1318
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s” widnieje jako i plik, i katalog"
-#: read-cache.c:1524
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Odśwież indeks"
-#: read-cache.c:1639
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6261,7 +6531,7 @@
"ustawiono index.version, ale wartość jest nieprawidłowa.\n"
"Używanie wersji %i"
-#: read-cache.c:1649
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6270,139 +6540,143 @@
"ustawiono GIT_INDEX_VERSION, ale wartość jest nieprawidłowa.\n"
"Używanie wersji %i"
-#: read-cache.c:1705
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "zły podpis 0x%08x"
-#: read-cache.c:1708
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "zła wersja indeksu %d"
-#: read-cache.c:1717
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "zły skrót SHA-1 pliku indeksu"
-#: read-cache.c:1747
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks używa rozszerzenia %.4s, którego nie rozumiemy"
-#: read-cache.c:1749
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "pomijanie rozszerzenia %.4s"
-#: read-cache.c:1786
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "nieznany format elementu indeksu 0x%08x"
-#: read-cache.c:1802
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "nieprawidłowe pole nazwy w indeksie, blisko ścieżki „%s”"
-#: read-cache.c:1859
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "nieuporządkowane elementy przygotowane w indeksie"
-#: read-cache.c:1862
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "wiele elementów w przygotowaniu dla scalonego pliku „%s”"
-#: read-cache.c:1865
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "nieuporządkowane elementy przygotowane w „%s”"
-#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
-#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
-#: builtin/submodule--helper.c:332
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "uszkodzony plik indeksu"
-#: read-cache.c:2115
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "nie można utworzyć wątku load_cache_entries: %s"
-#: read-cache.c:2128
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "nie można dołączyć do wątku load_cache_entries: %s"
-#: read-cache.c:2161
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: nie można otworzyć pliku indeksu"
-#: read-cache.c:2165
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: nie można wykonać stat na otwartym indeksie"
-#: read-cache.c:2169
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: plik indeksu mniejszy niż oczekiwano"
-#: read-cache.c:2173
+#: read-cache.c:2267
#, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: nie można wykonać mapowania pliku indeksu"
+msgid "%s: unable to map index file%s"
+msgstr "%s: nie można wykonać mapowania pliku indeksu%s"
-#: read-cache.c:2215
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "nie można utworzyć wątku load_index_extensions: %s"
-#: read-cache.c:2242
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "nie można złączyć wątku load_index_extensions: %s"
-#: read-cache.c:2274
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "nie można odświeżyć wspólnego indeksu „%s”"
-#: read-cache.c:2321
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "zepsuty indeks, oczekiwano %s w %s, otrzymano %s"
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "nie można zamknąć „%s”"
-#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239
+#: read-cache.c:3108
+msgid "failed to convert to a sparse-index"
+msgstr "nie można przekształcić w rzadki indeks"
+
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: read-cache.c:3133
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "nie można otworzyć katalogu gita: %s"
-#: read-cache.c:3145
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "nie można wykonać unlink: „%s”"
-#: read-cache.c:3170
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "nie można naprawić bitów uprawnień w „%s”"
-#: read-cache.c:3319
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: nie można zrzucić do etapu nr 0"
@@ -6431,7 +6705,10 @@
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+" commit's log message, unless -C is used, in which case\n"
+" keep only this commit's message; -c is same as -C but\n"
+" opens the editor\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
@@ -6440,7 +6717,7 @@
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
+". specified); use -c <commit> to reword the commit message\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -6450,7 +6727,11 @@
"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+"f, fixup [-C | -c] <zapis> = jak „squash”, ale odrzuć komunikat tego "
+"zapisu,\n"
+" chyba że użyto -C, wtedy zachowaj tylko komunikat tego "
+"zapisu;\n"
+" -c jest jak -C ale otwiera edytor\n"
"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
"b, break = zatrzymaj się tu (kontynuuj przestawianie przez „git rebase --"
"continue”)\n"
@@ -6458,12 +6739,14 @@
"l, label <etykietka> = nazwij bieżące HEAD\n"
"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+". utwórz zapis scalenia używając pierwotnego komunikatu <zapisu> "
+"scalenia\n"
+". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia);\n"
+". użyj -c <zapis>, aby przeredagować komunikat zapisu\n"
+"\n"
"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
-#: rebase-interactive.c:63
+#: rebase-interactive.c:66
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
@@ -6471,7 +6754,7 @@
msgstr[1] "Przestawianie %s na %s (%d polecenia)"
msgstr[2] "Przestawianie %s na %s (%d poleceń)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6479,7 +6762,7 @@
"\n"
"Nie usuwaj żadnego wiersza. Użyj jawnie „drop”, żeby usunąć wpis.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6487,7 +6770,7 @@
"\n"
"Jeśli usuniesz tutaj wiersz, TEN ZAPIS BĘDZIE STRACONY.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6501,7 +6784,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6511,19 +6794,19 @@
"Jeśli jednak usuniesz wszystko, przestawianie zostanie przerwane.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
-#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "nie można pisać do „%s”"
-#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
-#: builtin/rebase.c:254
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "nie można pisać do „%s”."
-#: rebase-interactive.c:193
+#: rebase-interactive.c:196
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
@@ -6532,7 +6815,7 @@
"Ostrzeżenie: niektóre zapisy mogły zostać omyłkowo porzucone.\n"
"Porzucone zapisy (od najnowszych do najstarszych):\n"
-#: rebase-interactive.c:200
+#: rebase-interactive.c:203
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -6548,14 +6831,12 @@
"Możliwe zachowania to: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
-#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
-#: builtin/rebase.c:266
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "nie można odczytać „%s”."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „preserve” zostało uogólnione do „merges”"
-#: ref-filter.c:42 wt-status.c:1975
+#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
msgstr "nie ma"
@@ -6574,127 +6855,142 @@
msgid "ahead %d, behind %d"
msgstr "do przodu %d, w tyle %d"
-#: ref-filter.c:169
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "oczekiwany format: %%(color:<kolor>)"
-#: ref-filter.c:171
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "nierozpoznany kolor: %%(kolor:%s)"
+msgstr "nierozpoznany kolor: %%(color:%s)"
-#: ref-filter.c:193
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Oczekiwano wartości całkowitej refname:lstrip=%s"
-#: ref-filter.c:197
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Oczekiwano wartości całkowitej refname:rstrip=%s"
-#: ref-filter.c:199
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nierozpoznany argument %%(%s): %s"
-#: ref-filter.c:254
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) nie przyjmuje argumentów"
-#: ref-filter.c:276
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nierozpoznany argument %%(objectsize): %s"
-#: ref-filter.c:284
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) nie przyjmuje argumentów"
-#: ref-filter.c:296
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) nie przyjmuje argumentów"
-#: ref-filter.c:309
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "nierozpoznany argument %%(subject): %s"
-#: ref-filter.c:330
+#: ref-filter.c:396
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "oczekiwano %%(trailers:key=<wartość>)"
+
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "nieznany argument %%(trailers): %s"
-#: ref-filter.c:363
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "oczekiwano wartości dodatniej contents:lines=%s"
-#: ref-filter.c:365
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nierozpoznany argument %%(contents): %s"
-#: ref-filter.c:380
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "nierozpoznany argument %%(raw): %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "oczekiwano wartości dodatniej „%s” w %%(%s)"
-#: ref-filter.c:384
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "nierozpoznany argument „%s” w %%(%s)"
-#: ref-filter.c:398
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "nierozpoznawana opcja e-mail: %s"
-#: ref-filter.c:428
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "oczekiwany format: %%(align:<szerokość>,<pozycja>)"
-#: ref-filter.c:440
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "nierozpoznawana pozycja:%s"
-#: ref-filter.c:447
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "nierozpoznawana szerokość:%s"
-#: ref-filter.c:456
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nierozpoznany argument %%(align): %s"
-#: ref-filter.c:464
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "oczekiwano dodatniej szerokości z atomem %%(align)"
-#: ref-filter.c:482
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nierozpoznany argument %%(if): %s"
-#: ref-filter.c:584
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) nie przyjmuje argumentów"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "nieprawidłowa nazwa pola %.*s"
-#: ref-filter.c:611
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "nieznana nazwa pola: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6702,126 +6998,136 @@
"to nie jest repozytorium gita, ale pole „%.*s” wymaga dostępu do danych "
"obiektów"
-#: ref-filter.c:739
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atom %%(if) użyty bez atomu %%(then)"
-#: ref-filter.c:802
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atom %%(then) użyty bez atomu %%(if)"
-#: ref-filter.c:804
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atom %%(then) użyty więcej niż raz"
-#: ref-filter.c:806
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atom %%(then) użyty po %%(else)"
-#: ref-filter.c:834
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atom %%(else) użyty bez atomu %%(if)"
-#: ref-filter.c:836
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atom %%(else) użyty bez atomu %%(then)"
-#: ref-filter.c:838
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atom %%(else) użyty więcej niż raz"
-#: ref-filter.c:853
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atom %%(end) użyty bez odpowiadającego atomu"
-#: ref-filter.c:910
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "nieprawidłowy format %s"
-#: ref-filter.c:1551
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "to polecenie odrzuca atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell i --tcl się wykluczają"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(brak gałęzi, przestawianie %s)"
-#: ref-filter.c:1554
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(brak gałęzi, przestawianie odłączonego HEAD %s)"
-#: ref-filter.c:1557
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(brak gałęzi, przeszukiwanie rozpoczęte od %s)"
-#: ref-filter.c:1561
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD odłączone na %s)"
-#: ref-filter.c:1564
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD odłączone od %s)"
-#: ref-filter.c:1567
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(brak gałęzi)"
-#: ref-filter.c:1599 ref-filter.c:1808
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "brakujący obiekt %s do %s"
-#: ref-filter.c:1609
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer nie powiodło się na %s do %s"
-#: ref-filter.c:1992
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "uszkodzony obiekt w „%s”"
-#: ref-filter.c:2081
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorowanie referencji z zepsutą nazwą %s"
-#: ref-filter.c:2086 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorowanie zepsutej referencji %s"
-#: ref-filter.c:2426
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: brakuje atomu %%(end)"
-#: ref-filter.c:2525
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "nieprawidłowa nazwa obiektu %s"
-#: ref-filter.c:2530
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opcja „%s” musi wskazywać na zapis"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s nie wskazuje na prawidłowy obiekt!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6847,81 +7153,81 @@
"\n"
"\tgit branch -m <nazwa>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "nie można odebrać „%s”"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "nieprawidłowa nazwa gałęzi: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorowanie wiszącej referencji symbolicznej %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "dziennik referencji %s ma lukę po %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "dziennik referencji %s nieoczekiwanie się skończył na %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "dziennik dla %s jest pusty"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "odmawiam zaktualizowania referencji ze złą nazwą „%s”"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref nie powiodło się dla referencji „%s”: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "wiele aktualizacji referencji „%s” niedozwolone"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "aktualizacje referencji zabronione w środowisku kwarantanny"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "aktualizacje referencji przerwane przez skrypt repozytorium"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s” istnieje; nie można utworzyć „%s”"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "nie można przetworzyć jednocześnie „%s” i „%s”"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "nie można usunąć referencji %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "nie można usunąć referencji %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "nie można usunąć referencji: %s"
@@ -7229,7 +7535,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "wystąpiły błędy przy zapisywaniu „%s” (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "nie można wypróżnić „%s”'"
@@ -7274,8 +7580,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Zapamiętano wstępny obraz „%s”"
-#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "nie można utworzyć katalogu „%s”"
@@ -7313,122 +7619,126 @@
msgid "could not determine HEAD revision"
msgstr "nie można ustalić rewizji HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3468
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "nie znaleziono drzewa %s"
-#: revision.c:2338
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input i --no-walk się wykluczają"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<plik-paczki> nie jest już wspierany"
-#: revision.c:2668
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk i --unsorted-input się wykluczają"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "twoja obecna gałąź wydaje się być uszkodzona"
-#: revision.c:2671
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "twoja obecna gałąź „%s” nie ma jeszcze żadnych zapisów"
-#: revision.c:2877
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L nie wspiera jeszcze formatów różnic oprócz -p i -s"
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "otwarcie /dev/null nie powiodło się"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "nie można utworzyć asynchronicznego wątku: %s"
-#: run-command.c:1338
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Skrypt repozytorium „%s” został zignorowany, bo nie jest wykonywalny.\n"
-"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false”."
-
-#: send-pack.c:146
+#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"nieoczekiwany pakiet wypróżnienia podczas odczytu stanu zdalnego rozpakowania"
-#: send-pack.c:148
+#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "nie można przetworzyć zdalnego stanu rozpakowania: %s"
-#: send-pack.c:150
+#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
msgstr "zdalne rozpakowanie nie powiodło się: %s"
-#: send-pack.c:374
+#: send-pack.c:378
msgid "failed to sign the push certificate"
msgstr "nie można podpisać certyfikatu wypychania"
-#: send-pack.c:467
+#: send-pack.c:435
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: nie można oddzielić pod-procesu pobierania"
+
+#: send-pack.c:457
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negocjacja przekazania nie powiodła się; przekazywanie mimo to"
+
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "odbierający koniec nie wspiera algorytmu skrótu tego repozytorium"
-#: send-pack.c:476
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
-msgstr "odbierający koniec nie wspiera podpisanych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --signed"
-#: send-pack.c:478
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"nie wysyłanie certyfikatu wypchnięcia, bo odbierający koniec nie wspiera "
-"podpisanego wypychania"
+"wypychnięć --signed"
-#: send-pack.c:490
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
-msgstr "odbierający koniec nie wspiera atomowych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --atomic"
-#: send-pack.c:495
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "odbierający koniec nie wspiera opcji wypychania"
-#: sequencer.c:195
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "nieprawidłowy tryb czyszczenia komunikatu zapisu „%s”"
-#: sequencer.c:323
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "nie można usunąć „%s”"
-#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "nie można usunąć „%s”"
-#: sequencer.c:353
+#: sequencer.c:355
msgid "revert"
msgstr "odwracanie"
-#: sequencer.c:355
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "dobieranie"
-#: sequencer.c:357
+#: sequencer.c:359
msgid "rebase"
msgstr "przestawianie"
-#: sequencer.c:359
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "nieznane działanie: %d"
-#: sequencer.c:418
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7436,53 +7746,75 @@
"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
"z „git add <ścieżki>” lub „git rm <ścieżki>”"
-#: sequencer.c:421
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
-"z „git add <ścieżki>” lub „git rm <ścieżki>”\n"
-"i złóż wynik za pomocą „git commit”"
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>” i wykonaj\n"
+"„git cherry-pick --continue”.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git cherry-pick --skip”.\n"
+"Aby przerwać i powrócić do stanu sprzed „git cherry-pick”,\n"
+"wykonaj „git cherry-pick --abort”."
-#: sequencer.c:434 sequencer.c:3070
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>” i wykonaj\n"
+"„git revert --continue”.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git revert --skip”.\n"
+"Aby przerwać i powrócić do stanu sprzed „git revert”,\n"
+"wykonaj „git revert --abort”."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "nie można zablokować „%s”"
-#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
-#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "nie można pisać do „%s”"
-#: sequencer.c:441
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "nie można pisać końca wiersza do „%s”"
-#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
-#: sequencer.c:3353
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "nie można sfinalizować „%s”"
-#: sequencer.c:485
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "twoje lokalne zmiany zostaną nadpisane przez %s."
-#: sequencer.c:489
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "złóż swoje zmiany lub dodaj do schowka, aby kontynuować."
-#: sequencer.c:521
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: przewijanie"
-#: sequencer.c:560 builtin/tag.c:598
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Nieprawidłowy tryb czyszczenia %s"
@@ -7490,65 +7822,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:670
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Nie można zapisać nowego pliku indeksu"
-#: sequencer.c:684
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "nie można zaktualizować drzewa pamięci podręcznej"
-#: sequencer.c:698
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "nie można rozwiązać zapisu HEAD"
-#: sequencer.c:778
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "nie ma żadnego klucza w „%.*s”"
-#: sequencer.c:789
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "nie można odcytować wartości „%s”"
-#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "nie można otworzyć „%s” do odczytu"
-#: sequencer.c:836
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "już podano „GIT_AUTHOR_NAME”"
-#: sequencer.c:841
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "już podano „GIT_AUTHOR_EMAIL”"
-#: sequencer.c:846
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "już podano „GIT_AUTHOR_DATE”"
-#: sequencer.c:850
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "nieznana zmienna „%s”"
-#: sequencer.c:855
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "brak „GIT_AUTHOR_NAME”"
-#: sequencer.c:857
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "brak „GIT_AUTHOR_EMAIL”"
-#: sequencer.c:859
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "brak „GIT_AUTHOR_DATE”"
-#: sequencer.c:924
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7577,11 +7909,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1211
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "skrypt „prepare-commit-msg” się nie powiódł"
-#: sequencer.c:1217
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7609,7 +7941,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1230
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7634,340 +7966,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1272
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "nie odnaleziono nowo utworzonego zapisu"
-#: sequencer.c:1274
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "nie można przetworzyć nowo utworzonego zapisu"
-#: sequencer.c:1320
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "nie można rozwiązać HEAD po utworzeniu zapisu"
-#: sequencer.c:1322
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "oddzielone HEAD"
-#: sequencer.c:1326
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (zapis-korzeń)"
-#: sequencer.c:1347
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "nie można przetworzyć HEAD"
-#: sequencer.c:1349
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s nie jest zapisem!"
-#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "nie można przetworzyć zapisu HEAD"
-#: sequencer.c:1409 sequencer.c:2108
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "nie można przetworzyć autora zapisu %s"
-#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree nie może zapisać drzewa"
-#: sequencer.c:1453 sequencer.c:1573
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "nie można odczytać komunikatu zapisu z „%s”"
-#: sequencer.c:1484 sequencer.c:1516
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "nieprawidłowa tożsamość autora „%s”"
-#: sequencer.c:1490
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "uszkodzony autor: brakuje informacji o dacie"
-#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
-#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "nie można zapisać obiektu zapisu"
-#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "nie można zaktualizować „%s”"
-#: sequencer.c:1605
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "nie można przetworzyć zapisu %s"
-#: sequencer.c:1610
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "nie można przetworzyć zapisu rodzica %s"
-#: sequencer.c:1693 sequencer.c:1804
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "nieznane pod-polecenie: %d"
-#: sequencer.c:1751 sequencer.c:1776
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "To jest połączenie %d zapisów."
-
-#: sequencer.c:1761
-msgid "need a HEAD to fixup"
-msgstr "potrzeba HEAD do naprawienia"
-
-#: sequencer.c:1763 sequencer.c:3380
-msgid "could not read HEAD"
-msgstr "nie można odczytać HEAD"
-
-#: sequencer.c:1765
-msgid "could not read HEAD's commit message"
-msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
-
-#: sequencer.c:1771
-#, c-format
-msgid "cannot write '%s'"
-msgstr "nie można pisać do „%s”"
-
-#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "To jest komunikat pierwszego zapisu:"
-#: sequencer.c:1786
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "nie można odczytać komunikatu zapisu %s"
-
-#: sequencer.c:1793
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "To jest komunikat zapisu nr %d:"
-#: sequencer.c:1799
+#: sequencer.c:1755
+msgid "The 1st commit message will be skipped:"
+msgstr "Komunikat pierwszego zapisu zostanie pominięty:"
+
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Komunikat zapisu nr %d zostanie pominięty:"
-#: sequencer.c:1887
+#: sequencer.c:1757
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "To jest połączenie %d zapisów."
+
+#: sequencer.c:1904 sequencer.c:1961
+#, c-format
+msgid "cannot write '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: sequencer.c:1951
+msgid "need a HEAD to fixup"
+msgstr "potrzeba HEAD do naprawienia"
+
+#: sequencer.c:1953 sequencer.c:3601
+msgid "could not read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:1955
+msgid "could not read HEAD's commit message"
+msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
+
+#: sequencer.c:1979
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "nie można odczytać komunikatu zapisu %s"
+
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "plik indeksu jest niescalony."
-#: sequencer.c:1894
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "nie można poprawić zapisu korzenia"
-#: sequencer.c:1913
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "zapis %s jest scaleniem, a nie podano opcji -m."
-#: sequencer.c:1921 sequencer.c:1929
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "zapis %s nie ma rodzica %d"
-#: sequencer.c:1935
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "nie można uzyskać komunikatu zapisu dla %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1954
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: nie można przetworzyć rodzica zapisu %s"
-#: sequencer.c:2019
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "nie można zmienić nazwy „%s” na „%s”"
-#: sequencer.c:2079
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "nie można odwrócić %s... %s"
-#: sequencer.c:2080
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "nie można zastosować %s... %s"
-#: sequencer.c:2100
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "gubienie %s %s — zawartość łatki już wcielona w głównym nurcie\n"
-#: sequencer.c:2158
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: nie można odczytać indeksu"
-#: sequencer.c:2165
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: nie można odświeżyć indeksu"
-#: sequencer.c:2242
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s nie przyjmuje argumentów: „%s”"
-#: sequencer.c:2251
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "brakujące argumenty dla %s"
-#: sequencer.c:2282
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "nie można przetworzyć „%s”"
-#: sequencer.c:2343
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "nieprawidłowy wiersz %d: %.*s"
-#: sequencer.c:2354
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "nie można użyć „%s” bez poprzedniego zapisu"
-#: sequencer.c:2440
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "nie można odczytać „%s”."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "przerywanie trwającego dobierania"
-#: sequencer.c:2449
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "przerywanie trwającego odwracania"
-#: sequencer.c:2493
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "napraw to używając „git rebase --edit-todo”."
-#: sequencer.c:2495
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "plik z instrukcjami się nie nadaje: „%s”"
-#: sequencer.c:2500
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "nie przetworzono żadnego zapisu."
-#: sequencer.c:2511
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "nie można dobierać w czasie odwracania."
-#: sequencer.c:2513
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "nie można odwrócić w czasie dobierania."
-#: sequencer.c:2591
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "nieprawidłowa wartość %s: %s"
-#: sequencer.c:2698
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "spłaszcz-na się nie nadaje"
-#: sequencer.c:2718
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "nieprawidłowy plik opcji: „%s”"
-#: sequencer.c:2811 sequencer.c:4644
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "podano pusty zbiór zapisów"
-#: sequencer.c:2828
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "już trwa dobieranie"
-#: sequencer.c:2830
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "spróbuj „git revert (--continue | %s--abort | --quit)”"
-#: sequencer.c:2833
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "już trwa dobieranie"
-#: sequencer.c:2835
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "spróbuj „git cherry-pick (--continue | %s--abort | --quit)”"
-#: sequencer.c:2849
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "nie można utworzyć katalogu sekwencjonowania „%s”"
-#: sequencer.c:2864
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "nie można zablokować HEAD"
-#: sequencer.c:2924 sequencer.c:4379
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "nie trwa dobieranie ani odwracanie"
-#: sequencer.c:2926 sequencer.c:2937
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "nie można rozwiązać HEAD"
-#: sequencer.c:2928 sequencer.c:2972
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "nie można przerwać z gałęzi, która dopiero ma powstać"
-#: sequencer.c:2958 builtin/grep.c:757
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "nie można otworzyć „%s”"
-#: sequencer.c:2960
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "nie można odczytać „%s”: %s"
-#: sequencer.c:2961
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "nieoczekiwany koniec pliku"
-#: sequencer.c:2967
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "zapisany plik HEAD sprzed dobierania „%s” jest uszkodzony"
-#: sequencer.c:2978
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Wydaje się, że czoło HEAD się przesunęło.\n"
"Nie cofam, sprawdź swoje HEAD!"
-#: sequencer.c:3019
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "nie trwa żadne odwracanie"
-#: sequencer.c:3028
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "nie trwa żadne dobieranie"
-#: sequencer.c:3038
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "nie udało się pominąć zapisu"
-#: sequencer.c:3045
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "nie ma nic do pominięcia"
-#: sequencer.c:3048
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -7976,16 +8318,16 @@
"zapis już złożony?\n"
"spróbuj „git %s --continue”"
-#: sequencer.c:3210 sequencer.c:4271
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "nie można odczytać HEAD"
-#: sequencer.c:3227
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: sequencer.c:3235
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8004,27 +8346,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3245
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Nie można zastosować %s... %.*s"
-#: sequencer.c:3252
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Nie można scalić %.*s"
-#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: sequencer.c:3282
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Wykonywanie: %s\n"
-#: sequencer.c:3297
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8039,11 +8381,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3303
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym\n"
-#: sequencer.c:3309
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8060,90 +8402,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3370
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nieprawidłowa nazwa etykietki „%.*s”"
-#: sequencer.c:3424
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "zapisywanie fałszywego zapisu korzenia"
-#: sequencer.c:3429
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "zapisywanie spłaszcz-na"
-#: sequencer.c:3513
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "nie można rozwiązać „%s”"
-#: sequencer.c:3546
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "nie można scalić bez bieżącej rewizji"
-#: sequencer.c:3568
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "nie można przetworzyć „%.*s”"
-#: sequencer.c:3577
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nic do scalenia: „%.*s”"
-#: sequencer.c:3589
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "nie można wykonać ośmiorniczego scalenia na szczycie [nowego korzenia]"
-#: sequencer.c:3605
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "nie można uzyskać komunikatu zapisu „%s”"
-#: sequencer.c:3788
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "nie można nawet spróbować scalić „%.*s”"
-#: sequencer.c:3804
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "scalanie: Nie można zapisać nowego pliku indeksu"
-#: sequencer.c:3878
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Nie można automatycznie dodać do schowka"
-#: sequencer.c:3881
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Nieoczekiwana odpowiedź schowka: „%s”"
-#: sequencer.c:3887
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Nie można utworzyć katalogu dla „%s”"
-#: sequencer.c:3890
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatycznie zapisano w schowku: %s\n"
-#: sequencer.c:3894
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "nie można zresetować --hard"
-#: sequencer.c:3919
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Zastosowano zmiany z automatycznego schowka.\n"
-#: sequencer.c:3931
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "nie można zapisać %s"
-#: sequencer.c:3934
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8154,30 +8496,30 @@
"Twoje zmiany są bezpieczne w schowku.\n"
"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
-#: sequencer.c:3939
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Stosowanie zmian z automatycznego schowka spowodowało konflikty."
-#: sequencer.c:3940
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr ""
"W schowku istnieje automatyczny wpis; tworzenie nowego wpisu w schowku."
-#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "nie można odłączyć HEAD"
-#: sequencer.c:4048
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Zatrzymano przy HEAD\n"
-#: sequencer.c:4050
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Zatrzymano przy %s\n"
-#: sequencer.c:4058
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8198,58 +8540,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4104
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Przestawianie (%d/%d)%s"
-#: sequencer.c:4149
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Zatrzymano na %s... %.*s\n"
-#: sequencer.c:4220
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "nieznane polecenie %d"
-#: sequencer.c:4279
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "nie można odczytać pierwotnego czoła"
-#: sequencer.c:4284
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "nie można odczytać „onto”"
-#: sequencer.c:4298
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "nie można zapisać HEAD do %s"
-#: sequencer.c:4358
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Pomyślnie przestawiono i zaktualizowano %s.\n"
-#: sequencer.c:4391
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "nie można przestawić: Masz nieprzygotowane zmiany."
-#: sequencer.c:4400
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "nie można poprawić nieistniejącego obiektu"
-#: sequencer.c:4402
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "nieprawidłowy plik: „%s”"
-#: sequencer.c:4404
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "nieprawidłowa zawartość: „%s”"
-#: sequencer.c:4407
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8259,50 +8601,59 @@
"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
"i wtedy ponownie wykonaj „git rebase --continue”."
-#: sequencer.c:4443 sequencer.c:4482
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "nie można zapisać pliku: „%s”"
-#: sequencer.c:4498
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "nie można usunąć CHERRY_PICK_HEAD"
-#: sequencer.c:4505
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "nie udało się złożyć zmian ze schowka."
-#: sequencer.c:4621
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: nie można dobrać %s"
-#: sequencer.c:4625
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: zła rewizja"
-#: sequencer.c:4660
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "nie można odwrócić jako pierwszy zapis"
-#: sequencer.c:5137
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "pominięto uprzednio zastosowany zapis %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "użyj --reapply-cherry-picks, by uwzględnić pominięte zapisy"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: nieobsłużone opcje"
-#: sequencer.c:5140
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: błąd przygotowania rewizji"
-#: sequencer.c:5382 sequencer.c:5399
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "nic do zrobienia"
-#: sequencer.c:5418
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "nie można pominąć niepotrzebnych poleceń pick"
-#: sequencer.c:5512
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "kolejność skryptu została już zmieniona."
@@ -8353,92 +8704,98 @@
msgstr ""
"nie można ustawić drzewa roboczego przy użyciu nieprawidłowej konfiguracji"
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "to działanie musi być wykonane w drzewie roboczym"
-#: setup.c:661
+#: setup.c:658
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Oczekiwano wersji repozytorium gita <= %d, znaleziono %d"
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "znaleziono nieznane rozszerzenia repozytorium:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "znaleziono nieznane rozszerzenie repozytorium:"
+msgstr[1] "znaleziono nieznane rozszerzenia repozytorium:"
+msgstr[2] "znaleziono nieznane rozszerzenia repozytorium:"
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "wersja repozytorium to 0, ale znaleziono rozszerzenie typowe dla v1"
+msgstr[1] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+msgstr[2] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
-#: setup.c:700
+#: setup.c:701
#, c-format
msgid "error opening '%s'"
msgstr "nie można otworzyć „%s”"
-#: setup.c:702
+#: setup.c:703
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "za duży jak na plik .git: „%s”"
-#: setup.c:704
+#: setup.c:705
#, c-format
msgid "error reading %s"
msgstr "błąd odczytu %s"
-#: setup.c:706
+#: setup.c:707
#, c-format
msgid "invalid gitfile format: %s"
msgstr "nieprawidłowy format pliku gitfile: %s"
-#: setup.c:708
+#: setup.c:709
#, c-format
msgid "no path in gitfile: %s"
-msgstr "brak ścieżki w pliku gitfile %s"
+msgstr "brak ścieżki w pliku gitfile: %s"
-#: setup.c:710
+#: setup.c:711
#, c-format
msgid "not a git repository: %s"
msgstr "to nie jest repozytorium gita: %s"
-#: setup.c:812
+#: setup.c:813
#, c-format
msgid "'$%s' too big"
msgstr "„$%s” za duże"
-#: setup.c:826
+#: setup.c:827
#, c-format
msgid "not a git repository: '%s'"
msgstr "to nie jest repozytorium gita: „%s”"
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
#, c-format
msgid "cannot chdir to '%s'"
msgstr "nie można wejść do „%s”"
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
msgid "cannot come back to cwd"
msgstr "nie można wrócić do cwd"
-#: setup.c:987
+#: setup.c:988
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "nie można wykonać stat na „%*s%s%s”"
-#: setup.c:1225
+#: setup.c:1231
msgid "Unable to read current working directory"
msgstr "Nie można odczytać obecnego katalogu roboczego"
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
#, c-format
msgid "cannot change to '%s'"
msgstr "nie można zmienić na „%s”"
-#: setup.c:1245
+#: setup.c:1251
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "to nie jest repozytorium gita (ani żaden z katalogów nadrzędnych): %s"
-#: setup.c:1251
+#: setup.c:1257
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8449,7 +8806,7 @@
"Zatrzymano na granicy systemu plików (nie ustawiono "
"GIT_DISCOVERY_ACROSS_FILESYSTEM)."
-#: setup.c:1362
+#: setup.c:1381
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8458,56 +8815,57 @@
"problem z wartością trybu pliku core.sharedRepository (0%.3o).\n"
"Właściciel plików musi zawsze mieć prawa do odczytu i zapisu."
-#: setup.c:1409
-msgid "open /dev/null or dup failed"
-msgstr "otwarcie /dev/null lub dup() nie powiodło się"
-
-#: setup.c:1424
+#: setup.c:1443
msgid "fork failed"
msgstr "fork nie powiódł się"
-#: setup.c:1429
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid nie powiodło się"
+#: sparse-index.c:273
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "element indeksu jest katalogiem, ale nie rzadkim (%08x)"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
+#: strbuf.c:877
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8516,7 +8874,7 @@
msgstr[2] "%u bajtów"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
+#: strbuf.c:879
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
@@ -8524,13 +8882,13 @@
msgstr[1] "%u bajty/s"
msgstr[2] "%u bajtów/s"
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "nie można otworzyć „%s” do zapisywania"
-#: strbuf.c:1175
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "nie można edytować „%s”"
@@ -8538,7 +8896,7 @@
#: submodule-config.c:237
#, c-format
msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorowanie podejrzanej nazwy pod-modułu: %s"
+msgstr "ignorowanie podejrzanej nazwy podmodułu: %s"
#: submodule-config.c:304
msgid "negative values not allowed for submodule.fetchjobs"
@@ -8555,7 +8913,7 @@
msgid "invalid value for %s"
msgstr "nieprawidłowa wartość %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Nie można zaktualizować wpisu .gitmodules %s"
@@ -8578,155 +8936,155 @@
msgid "staging updated .gitmodules failed"
msgstr "przygotowanie zaktualizowanego .gitmodules nie powiodło się"
-#: submodule.c:327
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "w niezapełnionym pod-module „%s”"
-
#: submodule.c:358
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Ścieżka „%s” jest w pod-module „%.*s”"
+msgid "in unpopulated submodule '%s'"
+msgstr "w niezapełnionym podmodule „%s”"
-#: submodule.c:435
+#: submodule.c:389
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Ścieżka „%s” jest w podmodule „%.*s”"
+
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "zły argument --ignore-submodules: %s"
-#: submodule.c:817
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-"Pod-moduł w zapisie %s w ścieżce „%s” zderzył się z pod-modułem o tej samej "
+"Pod-moduł w zapisie %s w ścieżce „%s” zderzył się z podmodułem o tej samej "
"nazwie. Pomijanie."
-#: submodule.c:920
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "element pod-modułu „%s” (%s) nie jest zapisem, jest rodzaju %s"
+msgstr "element podmodułu „%s” (%s) nie jest zapisem, jest rodzaju %s"
-#: submodule.c:1005
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
"Nie można wykonać polecenia „git rev-list <zapisy> --not --remotes -n 1” w "
-"pod-module %s"
+"podmodule %s"
-#: submodule.c:1128
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
-msgstr "proces dla pod-modułu „%s” nie powiódł się"
+msgstr "proces dla podmodułu „%s” nie powiódł się"
-#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Nie można rozwiązać HEAD jako prawidłowej referencji."
-#: submodule.c:1168
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
-msgstr "Wypychanie pod-modułu „%s”\n"
+msgstr "Wypychanie podmodułu „%s”\n"
-#: submodule.c:1171
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
-msgstr "Nie można wypchnąć pod-modułu „%s”\n"
+msgstr "Nie można wypchnąć podmodułu „%s”\n"
-#: submodule.c:1463
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
-msgstr "Pobieranie pod-modułu %s%s\n"
+msgstr "Pobieranie podmodułu %s%s\n"
-#: submodule.c:1497
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
-msgstr "Nie można się dostać do pod-modułu „%s”\n"
+msgstr "Nie można się dostać do podmodułu „%s”\n"
-#: submodule.c:1652
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
-"Błędy podczas pobierania pod-modułów:\n"
+"Błędy podczas pobierania podmodułów:\n"
"%s"
-#: submodule.c:1677
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "nie rozpoznano „%s” jako repozytorium gita"
-#: submodule.c:1694
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "Nie można wykonać „git status --porcelain=2” w pod-module %s"
+msgstr "Nie można wykonać „git status --porcelain=2” w podmodule %s"
-#: submodule.c:1735
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "„git status --porcelain=2” nie powiódł się w pod-module %s"
-
-#: submodule.c:1810
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "nie można uruchomić „git status” w pod-module „%s”"
-
-#: submodule.c:1823
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "nie można wykonać „git status” w pod-module „%s”"
+msgstr "„git status --porcelain=2” nie powiódł się w podmodule %s"
#: submodule.c:1838
#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Nie można usunąć ustawienia core.worktree w pod-module „%s”"
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "nie można uruchomić „git status” w podmodule „%s”"
-#: submodule.c:1865 submodule.c:2175
+#: submodule.c:1851
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "nie można wykonać „git status” w podmodule „%s”"
+
+#: submodule.c:1868
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Nie można usunąć ustawienia core.worktree w podmodule „%s”"
+
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "nie można zejść do pod-modułu „%s”"
+msgstr "nie można zejść do podmodułu „%s”"
-#: submodule.c:1886
+#: submodule.c:1917
msgid "could not reset submodule index"
-msgstr "nie można zresetować indeksu pod-modułu"
+msgstr "nie można zresetować indeksu podmodułu"
-#: submodule.c:1928
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
-msgstr "pod-moduł „%s” ma brudny indeks"
+msgstr "podmoduł „%s” ma brudny indeks"
-#: submodule.c:1980
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
-msgstr "Nie można zaktualizować pod-modułu „%s”."
+msgstr "Nie można zaktualizować podmodułu „%s”."
-#: submodule.c:2048
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "katalog gita pod-modułu „%s” jest w katalogu gita „%.*s”"
+msgstr "katalog gita podmodułu „%s” jest w katalogu gita „%.*s”"
-#: submodule.c:2069
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-"relocate_gitdir dla pod-modułu „%s” z ponad jednym drzewem roboczym "
+"relocate_gitdir dla podmodułu „%s” z ponad jednym drzewem roboczym "
"niewspierane"
-#: submodule.c:2081 submodule.c:2140
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "nie odnaleziono nazwy pod-modułu „%s”"
+msgstr "nie odnaleziono nazwy podmodułu „%s”"
-#: submodule.c:2085
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "odmawiam przeniesienia „%s” do istniejącego katalogu gita"
-#: submodule.c:2092
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8737,65 +9095,71 @@
"„%s” do\n"
"„%s”\n"
-#: submodule.c:2220
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "nie można uruchomić ls-files w .."
-#: submodule.c:2260
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree zwróciło nieoczekiwany kod wyjścia %d"
-#: trailer.c:236
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "nie można wykonać lstat na „%s”'"
+
+#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
msgstr "wykonanie polecenia końcówki „%s” nie powiodło się"
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "nierozpoznana wartość „%s” klucza „%s”"
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "więcej niż jeden %s"
-#: trailer.c:728
+#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "pusty klucz w końcówce „%.*s”"
-#: trailer.c:748
+#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
msgstr "nie można odczytać pliku „%s”"
-#: trailer.c:751 builtin/mktag.c:91
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "nie można czytać ze standardowego wejścia"
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "nie można wykonać stat na %s"
-#: trailer.c:1011
+#: trailer.c:1026
#, c-format
msgid "file %s is not a regular file"
msgstr "plik %s nie jest zwykłym plikiem"
-#: trailer.c:1013
+#: trailer.c:1028
#, c-format
msgid "file %s is not writable by user"
msgstr "plik %s nie może być zapisany przez użytkownika"
-#: trailer.c:1025
+#: trailer.c:1040
msgid "could not open temporary file"
msgstr "nie można otworzyć pliku tymczasowego"
-#: trailer.c:1065
+#: trailer.c:1080
#, c-format
msgid "could not rename temporary file to %s"
msgstr "nie można zmienić nazwy pliku tymczasowego na %s"
@@ -8845,7 +9209,7 @@
msgid "error while running fast-import"
msgstr "błąd wykonywania fast-import"
-#: transport-helper.c:549 transport-helper.c:1237
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "nie można odczytać referencji %s"
@@ -8863,7 +9227,7 @@
msgid "invalid remote service path"
msgstr "nieprawidłowa ścieżka zdalnej usługi"
-#: transport-helper.c:661 transport.c:1447
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "operacja niewspierana przez protokół"
@@ -8872,68 +9236,72 @@
msgid "can't connect to subservice %s"
msgstr "nie można połączyć z pod-usługą %s"
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:404
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only wymaga protokołu v2"
+
+#: transport-helper.c:755
msgid "'option' without a matching 'ok/error' directive"
msgstr "„option” bez pasującej dyrektywy „ok/error”"
-#: transport-helper.c:788
+#: transport-helper.c:798
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "oczekiwano ok/error pomocnik powiedział „%s”"
-#: transport-helper.c:845
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "pomocnik zwrócił nieoczekiwany stan %s"
-#: transport-helper.c:928
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "pomocnik %s nie wspiera wykonania na sucho (dry-run)"
-#: transport-helper.c:931
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "pomocnik %s nie wspiera --signed"
-#: transport-helper.c:934
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "pomocnik %s nie wspiera --signed=if-asked"
-#: transport-helper.c:939
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "pomocnik %s nie wspiera --atomic"
-#: transport-helper.c:943
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "pomocnik %s nie wspiera --%s"
-#: transport-helper.c:950
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "pomocnik %s nie wspiera „push-option”"
-#: transport-helper.c:1050
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "zdalny pomocnik nie wspiera wypychania; potrzeba referencji"
-#: transport-helper.c:1055
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "pomocnik %s nie wspiera „force”"
-#: transport-helper.c:1102
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "nie można wykonać fast-export"
-#: transport-helper.c:1107
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "błąd wykonywania fast-export"
-#: transport-helper.c:1132
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8942,52 +9310,52 @@
"Brak wspólnych referencji lub żadnych nie podano; brak działania.\n"
"Pewnie należy podać jakąś gałąź.\n"
-#: transport-helper.c:1214
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "niewspierany format obiektu „%s”"
-#: transport-helper.c:1223
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "nieprawidłowa odpowiedź na liście referencji: %s"
-#: transport-helper.c:1375
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) nie powiodło się"
-#: transport-helper.c:1402
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) nie powiodło się"
-#: transport-helper.c:1451
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "wątek %s nie powiódł się"
-#: transport-helper.c:1455
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "wątek %s nie może się złączyć: %s"
-#: transport-helper.c:1474 transport-helper.c:1478
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "nie można uruchomić wątku do kopiowania danych: %s"
-#: transport-helper.c:1515
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "procesowi %s nie udało się zaczekać"
-#: transport-helper.c:1519
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "proces %s nie powiódł się"
-#: transport-helper.c:1537 transport-helper.c:1546
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "nie można uruchomić wątku do kopiowania danych"
@@ -9001,51 +9369,55 @@
msgid "could not read bundle '%s'"
msgstr "nie można odczytać wiązki „%s”"
-#: transport.c:220
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: nieprawidłowa opcja głębokości „%s”"
-#: transport.c:269
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "więcej szczegółów pod protocol.version w „git help config”"
-#: transport.c:270
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "opcje serwera wymagają wersji protokołu 2 lub późniejszej"
-#: transport.c:727
+#: transport.c:407
+msgid "server does not support wait-for-done"
+msgstr "serwer nie wspiera wait-for-done"
+
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "nie można przetworzyć ustawienia transport.color.*"
-#: transport.c:802
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "wsparcie dla protokołu v2 jeszcze niezaimplementowane"
-#: transport.c:936
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "nierozpoznana wartość klucza „%s”: %s"
-#: transport.c:1002
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport „%s” niedozwolony"
-#: transport.c:1055
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync nie jest już wspierany"
-#: transport.c:1157
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-"Następujące ścieżki pod-modułów zawierają zmiany, których nie można\n"
+"Następujące ścieżki podmodułów zawierają zmiany, których nie można\n"
"znaleźć w żadnym zdalnym repozytorium:\n"
-#: transport.c:1161
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9072,13 +9444,13 @@
"żeby wypchnąć je do zdalnego repozytorium.\n"
"\n"
-#: transport.c:1169
+#: transport.c:1197
msgid "Aborting."
msgstr "Przerywanie."
-#: transport.c:1316
+#: transport.c:1344
msgid "failed to push all needed submodules"
-msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych pod-modułów"
+msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych podmodułów"
#: tree-walk.c:33
msgid "too-short tree object"
@@ -9096,7 +9468,7 @@
msgid "too-short tree file"
msgstr "za krótki plik drzewa"
-#: unpack-trees.c:113
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9105,7 +9477,7 @@
"Wybranie gałęzi nadpisałoby lokalne zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim zmienisz gałąź."
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -9114,7 +9486,7 @@
"Wybranie nadpisałoby lokalne zmiany w następujących plikach:\n"
"%%s"
-#: unpack-trees.c:118
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9123,7 +9495,7 @@
"Scalenie nadpisałoby zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim je scalisz."
-#: unpack-trees.c:120
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -9133,7 +9505,7 @@
"scalenie:\n"
"%%s"
-#: unpack-trees.c:123
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9142,7 +9514,7 @@
"%s nadpisałoby zmiany w następujących plikach:\n"
"%%sZłóż swoje zmiany lub dodaj do schowka zanim wykonasz %s."
-#: unpack-trees.c:125
+#: unpack-trees.c:127
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -9151,7 +9523,7 @@
"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez %s:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:132
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -9160,7 +9532,7 @@
"Aktualizowanie następujących katalogów postradałoby nieśledzone pliki:\n"
"%s"
-#: unpack-trees.c:134
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9169,7 +9541,7 @@
"Wybranie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -9179,7 +9551,7 @@
"wybranie:\n"
"%%s"
-#: unpack-trees.c:139
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9188,7 +9560,7 @@
"Scalenie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed scalaniem."
-#: unpack-trees.c:141
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -9198,7 +9570,7 @@
"scalenie:\n"
"%%s"
-#: unpack-trees.c:144
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9207,7 +9579,7 @@
"%s usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed %s."
-#: unpack-trees.c:146
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -9216,7 +9588,7 @@
"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez %s:\n"
"%%s"
-#: unpack-trees.c:152
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9226,7 +9598,7 @@
"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
-#: unpack-trees.c:154
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -9236,7 +9608,7 @@
"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:157
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9245,7 +9617,7 @@
"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed scalaniem."
-#: unpack-trees.c:159
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9254,7 +9626,7 @@
"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9263,7 +9635,7 @@
"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%sPrzenieś je lub usuń przed %s."
-#: unpack-trees.c:164
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -9272,21 +9644,21 @@
"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
"%%s"
-#: unpack-trees.c:172
+#: unpack-trees.c:174
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Element „%s” pokrywa się z „%s”. Nie można związać."
-#: unpack-trees.c:175
+#: unpack-trees.c:177
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-"Nie można zaktualizować pod-modułu:\n"
+"Nie można zaktualizować podmodułu:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:180
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9296,7 +9668,7 @@
"Następujące ścieżki nie są aktualne i zostały mimo rzadkich wzorców:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:182
#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9305,7 +9677,7 @@
"Następujące ścieżki są niescalone i zostały mimo rzadkich wzorców:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:184
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9316,12 +9688,12 @@
"wzorców:\n"
"%s"
-#: unpack-trees.c:262
+#: unpack-trees.c:264
#, c-format
msgid "Aborting\n"
msgstr "Przerywanie\n"
-#: unpack-trees.c:289
+#: unpack-trees.c:291
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9330,11 +9702,11 @@
"Po naprawieniu powyższych ścieżek możesz chcieć wykonać „git sparse-checkout "
"reapply”.\n"
-#: unpack-trees.c:350
+#: unpack-trees.c:352
msgid "Updating files"
msgstr "Aktualizowanie plików"
-#: unpack-trees.c:382
+#: unpack-trees.c:384
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -9344,11 +9716,16 @@
"liter w systemie plików, który wielkości nie rozróżnia) i tylko jedna\n"
"z grupy jest w drzewie roboczym:\n"
-#: unpack-trees.c:1498
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Aktualizowanie flag indeksu"
-#: upload-pack.c:1543
+#: unpack-trees.c:2772
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "drzewo robocze i nieśledzony zapis mają podwójne elementy: %s"
+
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "oczekiwano wypróżnienia po argumentach pobrania"
@@ -9385,114 +9762,124 @@
msgid "Fetching objects"
msgstr "Pobieranie obiektów"
-#: worktree.c:238 builtin/am.c:2103
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "nie można odczytać „%s”"
-#: worktree.c:304
+#: worktree.c:303
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s” w głównym drzewie roboczym nie jest katalogiem repozytorium"
-#: worktree.c:315
+#: worktree.c:314
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"plik „%s” nie zawiera ścieżki bezwzględnej do położenia drzewa roboczego"
-#: worktree.c:327
+#: worktree.c:326
#, c-format
msgid "'%s' does not exist"
msgstr "„%s” nie istnieje"
-#: worktree.c:333
+#: worktree.c:332
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s” nie jest plikiem .git, kod błędu %d"
-#: worktree.c:342
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s” nie wskazuje z powrotem na „%s”"
-#: worktree.c:608
+#: worktree.c:603
msgid "not a directory"
msgstr "nie jest katalogiem"
-#: worktree.c:617
+#: worktree.c:612
msgid ".git is not a file"
msgstr ".git nie jest plikiem"
-#: worktree.c:619
+#: worktree.c:614
msgid ".git file broken"
msgstr "plik .git zepsuty"
-#: worktree.c:621
+#: worktree.c:616
msgid ".git file incorrect"
msgstr "plik .git nieprawidłowy"
-#: worktree.c:727
+#: worktree.c:722
msgid "not a valid path"
msgstr "nieprawidłowa ścieżka"
-#: worktree.c:733
+#: worktree.c:728
msgid "unable to locate repository; .git is not a file"
msgstr "nie odnaleziono repozytorium; .git nie jest plikiem"
-#: worktree.c:737
+#: worktree.c:732
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "nie odnaleziono repozytorium; plik .git nie odnosi się do repozytorium"
-#: worktree.c:741
+#: worktree.c:736
msgid "unable to locate repository; .git file broken"
msgstr "nie odnaleziono repozytorium; plik .git zepsuty"
-#: worktree.c:747
+#: worktree.c:742
msgid "gitdir unreadable"
msgstr "katalog gita nie do odczytania"
-#: worktree.c:751
+#: worktree.c:746
msgid "gitdir incorrect"
msgstr "katalog gita nieprawidłowy"
-#: worktree.c:776
+#: worktree.c:771
msgid "not a valid directory"
msgstr "nie jest prawidłowym katalogiem"
-#: worktree.c:782
+#: worktree.c:777
msgid "gitdir file does not exist"
msgstr "plik gitdir nie istnieje"
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "nie można odczytać pliku gitdir (%s)"
-#: worktree.c:806
+#: worktree.c:801
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "przykrótki odczyt (oczekiwano %<PRIuMAX> bajtów, odczytano %<PRIuMAX>)"
-#: worktree.c:814
+#: worktree.c:809
msgid "invalid gitdir file"
msgstr "nieprawidłowy plik gitdir"
-#: worktree.c:822
+#: worktree.c:817
msgid "gitdir file points to non-existent location"
msgstr "plik gitdir wskazuje nieistniejące położenie"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "nie można ustawić setenv „%s”"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "nie można utworzyć „%s”"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "nie można otworzyć „%s” do odczytu i zapisu"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "brak dostępu do „%s”"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "Nie można uzyskać obecnego katalogu roboczego"
@@ -9525,11 +9912,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (użyj „git rm <plik>...” aby zaznaczyć rozwiązanie)"
-#: wt-status.c:211 wt-status.c:1072
+#: wt-status.c:211 wt-status.c:1125
msgid "Changes to be committed:"
msgstr "Zmiany do złożenia:"
-#: wt-status.c:234 wt-status.c:1081
+#: wt-status.c:234 wt-status.c:1134
msgid "Changes not staged for commit:"
msgstr "Zmiany nie przygotowane do złożenia:"
@@ -9549,7 +9936,7 @@
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " (złóż lub odrzuć nieśledzoną lub zmienioną zawartość pod-modułów)"
+msgstr " (złóż lub odrzuć nieśledzoną lub zmienioną zawartość podmodułów)"
#: wt-status.c:254
#, c-format
@@ -9628,7 +10015,7 @@
msgid "untracked content, "
msgstr "nieśledzona zawartość, "
-#: wt-status.c:905
+#: wt-status.c:958
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
@@ -9636,15 +10023,15 @@
msgstr[1] "W schowku są obecnie %d elementy"
msgstr[2] "W schowku jest obecnie %d elementów"
-#: wt-status.c:936
+#: wt-status.c:989
msgid "Submodules changed but not updated:"
msgstr "Pod-moduły zmienione, ale nie zaktualizowane:"
-#: wt-status.c:938
+#: wt-status.c:991
msgid "Submodule changes to be committed:"
-msgstr "Zmiany w pod-modułach do złożenia:"
+msgstr "Zmiany w podmodułach do złożenia:"
-#: wt-status.c:1020
+#: wt-status.c:1073
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9652,7 +10039,7 @@
"Nie zmieniaj ani nie usuwaj wiersza powyżej.\n"
"Wszystko po nim będzie pominięte."
-#: wt-status.c:1112
+#: wt-status.c:1165
#, c-format
msgid ""
"\n"
@@ -9663,55 +10050,55 @@
"Obliczenie wartości gałęzi przed/w tyle zajęło %.2f sekund.\n"
"Możesz użyć „--no-ahead-behind”, aby tego uniknąć.\n"
-#: wt-status.c:1142
+#: wt-status.c:1195
msgid "You have unmerged paths."
msgstr "Masz niescalone ścieżki."
-#: wt-status.c:1145
+#: wt-status.c:1198
msgid " (fix conflicts and run \"git commit\")"
msgstr " (napraw konflikty i wykonaj „git commit”)"
-#: wt-status.c:1147
+#: wt-status.c:1200
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (użyj „git merge --abort”, aby przerwać scalanie)"
-#: wt-status.c:1151
+#: wt-status.c:1204
msgid "All conflicts fixed but you are still merging."
msgstr "Wszystkie konflikty naprawione, ale wciąż trwa scalanie."
-#: wt-status.c:1154
+#: wt-status.c:1207
msgid " (use \"git commit\" to conclude merge)"
msgstr " (użyj „git commit”, żeby zwieńczyć scalanie)"
-#: wt-status.c:1163
+#: wt-status.c:1216
msgid "You are in the middle of an am session."
msgstr "Jesteś w trakcie sesji am."
-#: wt-status.c:1166
+#: wt-status.c:1219
msgid "The current patch is empty."
msgstr "Obecna ścieżka jest pusta."
-#: wt-status.c:1170
+#: wt-status.c:1223
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (napraw konflikty i wykonaj „git am --continue”)"
-#: wt-status.c:1172
+#: wt-status.c:1225
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (użyj „git am --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1174
+#: wt-status.c:1227
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (użyj „git am --abort”, aby przywrócić pierwotną gałąź)"
-#: wt-status.c:1307
+#: wt-status.c:1360
msgid "git-rebase-todo is missing."
msgstr "brakuje git-rebase-todo."
-#: wt-status.c:1309
+#: wt-status.c:1362
msgid "No commands done."
msgstr "Nie wykonano żadnych poleceń."
-#: wt-status.c:1312
+#: wt-status.c:1365
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -9719,16 +10106,16 @@
msgstr[1] "Ostatnie polecenia wykonane (wykonano %d polecenia):"
msgstr[2] "Ostatnie polecenia wykonane (wykonano %d poleceń):"
-#: wt-status.c:1323
+#: wt-status.c:1376
#, c-format
msgid " (see more in file %s)"
msgstr " (zobacz więcej w pliku %s)"
-#: wt-status.c:1328
+#: wt-status.c:1381
msgid "No commands remaining."
msgstr "Brak pozostałych poleceń."
-#: wt-status.c:1331
+#: wt-status.c:1384
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -9736,186 +10123,190 @@
msgstr[1] "Następne polecenia do wykonania (pozostały %d polecenia):"
msgstr[2] "Następne polecenia do wykonania (pozostało %d poleceń):"
-#: wt-status.c:1339
+#: wt-status.c:1392
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (użyj „git rebase --edit-todo”, aby wyświetlić i edytować)"
-#: wt-status.c:1351
+#: wt-status.c:1404
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Przestawiasz właśnie gałąź „%s” na „%s”."
-#: wt-status.c:1356
+#: wt-status.c:1409
msgid "You are currently rebasing."
msgstr "Jesteś w trakcie przestawiania."
-#: wt-status.c:1369
+#: wt-status.c:1422
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (napraw konflikty i wykonaj „git rebase --continue”)"
-#: wt-status.c:1371
+#: wt-status.c:1424
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (użyj „git rebase --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1373
+#: wt-status.c:1426
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (użyj „git rebase --abort”, aby wybrać pierwotną gałąź)"
-#: wt-status.c:1380
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (wszystkie konflikty naprawione: wykonaj „git rebase --continue”)"
-#: wt-status.c:1384
+#: wt-status.c:1437
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "Dzielisz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
-#: wt-status.c:1389
+#: wt-status.c:1442
msgid "You are currently splitting a commit during a rebase."
msgstr "Dzielisz właśnie zapis podczas przestawiania."
-#: wt-status.c:1392
+#: wt-status.c:1445
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Kiedy katalog roboczy będzie czysty, wykonaj „git rebase --continue”)"
-#: wt-status.c:1396
+#: wt-status.c:1449
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "Edytujesz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
-#: wt-status.c:1401
+#: wt-status.c:1454
msgid "You are currently editing a commit during a rebase."
msgstr "Edytujesz właśnie zapis podczas przestawiania."
-#: wt-status.c:1404
+#: wt-status.c:1457
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (użyj „git commit --amend”, aby poprawić bieżący zapis)"
-#: wt-status.c:1406
+#: wt-status.c:1459
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (użyj „git rebase --continue”, kiedy zadowolisz się swoimi zmianami)"
-#: wt-status.c:1417
+#: wt-status.c:1470
msgid "Cherry-pick currently in progress."
msgstr "Trwa właśnie dobieranie."
-#: wt-status.c:1420
+#: wt-status.c:1473
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Dobierasz właśnie zapis %s."
-#: wt-status.c:1427
+#: wt-status.c:1480
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (napraw konflikty i wykonaj „git cherry-pick --continue”)"
-#: wt-status.c:1430
+#: wt-status.c:1483
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (wykonaj „git cherry-pick --continue”, aby kontynuować)"
-#: wt-status.c:1433
+#: wt-status.c:1486
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (wszystkie konflikty naprawione: wykonaj „git cherry-pick --continue”)"
-#: wt-status.c:1435
+#: wt-status.c:1488
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (użyj „git cherry-pick --skip”, aby pominąć tę łatkę)"
-#: wt-status.c:1437
+#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (użyj „git cherry-pick --abort”, aby przerwać dobieranie)"
-#: wt-status.c:1447
+#: wt-status.c:1500
msgid "Revert currently in progress."
msgstr "Trwa właśnie odwracanie."
-#: wt-status.c:1450
+#: wt-status.c:1503
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Odwracasz właśnie zapis %s."
-#: wt-status.c:1456
+#: wt-status.c:1509
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (napraw konflikty i wykonaj „git revert --continue”)"
-#: wt-status.c:1459
+#: wt-status.c:1512
msgid " (run \"git revert --continue\" to continue)"
msgstr " (wykonaj „git revert --continue”, aby kontynuować)"
-#: wt-status.c:1462
+#: wt-status.c:1515
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (wszystkie konflikty naprawione: wykonaj „git revert --continue”)"
-#: wt-status.c:1464
+#: wt-status.c:1517
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (użyj „git revert --skip” aby pominąć tę łatkę)"
-#: wt-status.c:1466
+#: wt-status.c:1519
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (użyj „git revert --abort”, aby przerwać odwracanie)"
-#: wt-status.c:1476
+#: wt-status.c:1529
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Jesteś w trakcie przeszukiwania, począwszy od gałęzi „%s”."
-#: wt-status.c:1480
+#: wt-status.c:1533
msgid "You are currently bisecting."
msgstr "Jesteś w trakcie przeszukiwania."
-#: wt-status.c:1483
+#: wt-status.c:1536
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (użyj „git bisect reset”, aby powrócić na pierwotną gałąź)"
-#: wt-status.c:1494
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Jesteś w rzadkim wybraniu."
+
+#: wt-status.c:1550
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "Jesteś w rzadkim wybraniu z obecnym %d%% śledzonych plików."
-#: wt-status.c:1733
+#: wt-status.c:1794
msgid "On branch "
msgstr "Na gałęzi "
-#: wt-status.c:1740
+#: wt-status.c:1801
msgid "interactive rebase in progress; onto "
msgstr "trwa interaktywne przestawianie na "
-#: wt-status.c:1742
+#: wt-status.c:1803
msgid "rebase in progress; onto "
msgstr "trwa przestawianie na "
-#: wt-status.c:1747
+#: wt-status.c:1808
msgid "HEAD detached at "
msgstr "HEAD odłączone na "
-#: wt-status.c:1749
+#: wt-status.c:1810
msgid "HEAD detached from "
msgstr "HEAD odłączone od "
-#: wt-status.c:1752
+#: wt-status.c:1813
msgid "Not currently on any branch."
msgstr "Nie jesteś na żadnej gałęzi."
-#: wt-status.c:1769
+#: wt-status.c:1830
msgid "Initial commit"
msgstr "Pierwszy zapis"
-#: wt-status.c:1770
+#: wt-status.c:1831
msgid "No commits yet"
msgstr "Jeszcze nie ma zapisów"
-#: wt-status.c:1784
+#: wt-status.c:1845
msgid "Untracked files"
msgstr "Nieśledzone pliki"
-#: wt-status.c:1786
+#: wt-status.c:1847
msgid "Ignored files"
msgstr "Ignorowane pliki"
-#: wt-status.c:1790
+#: wt-status.c:1851
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9926,30 +10317,30 @@
"może to przyspieszyć, ale musisz wtedy pilnować dodawania\n"
"nowych plików (zobacz „git help status”)."
-#: wt-status.c:1796
+#: wt-status.c:1857
#, c-format
msgid "Untracked files not listed%s"
msgstr "Nie wypisano nieśledzonych plików%s"
-#: wt-status.c:1798
+#: wt-status.c:1859
msgid " (use -u option to show untracked files)"
msgstr " (użyj opcji -u, aby pokazać nieśledzone pliki)"
-#: wt-status.c:1804
+#: wt-status.c:1865
msgid "No changes"
msgstr "Brak zmian"
-#: wt-status.c:1809
+#: wt-status.c:1870
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "brak zmian dodanych do zapisu (użyj „git add” i/lub „git commit -a”)\n"
-#: wt-status.c:1813
+#: wt-status.c:1874
#, c-format
msgid "no changes added to commit\n"
msgstr "brak zmian dodanych do zapisu\n"
-#: wt-status.c:1817
+#: wt-status.c:1878
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9958,67 +10349,85 @@
"nie dodano nic do złożenia, ale są nieśledzone pliki (użyj „git add”, aby "
"śledzić)\n"
-#: wt-status.c:1821
+#: wt-status.c:1882
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nie dodano nic do złożenia, ale są nieśledzone pliki\n"
-#: wt-status.c:1825
+#: wt-status.c:1886
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "nic do złożenia (utwórz/wkopiuj pliki i użyj „git add”, aby śledzić)\n"
-#: wt-status.c:1829 wt-status.c:1835
+#: wt-status.c:1890 wt-status.c:1896
#, c-format
msgid "nothing to commit\n"
msgstr "nic do złożenia\n"
-#: wt-status.c:1832
+#: wt-status.c:1893
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "nic do złożenia (użyj -u, aby pokazać nieśledzone pliki)\n"
-#: wt-status.c:1837
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nic do złożenia, drzewo robocze czyste\n"
-#: wt-status.c:1942
+#: wt-status.c:2003
msgid "No commits yet on "
msgstr "Jeszcze nie ma zapisów na "
-#: wt-status.c:1946
+#: wt-status.c:2007
msgid "HEAD (no branch)"
msgstr "HEAD (brak gałęzi)"
-#: wt-status.c:1977
+#: wt-status.c:2038
msgid "different"
msgstr "różne"
-#: wt-status.c:1979 wt-status.c:1987
+#: wt-status.c:2040 wt-status.c:2048
msgid "behind "
msgstr "wstecz "
-#: wt-status.c:1982 wt-status.c:1985
+#: wt-status.c:2043 wt-status.c:2046
msgid "ahead "
msgstr "do przodu "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2507
+#: wt-status.c:2569
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "nie można wykonać %s: masz nieprzygotowane zmiany."
-#: wt-status.c:2513
+#: wt-status.c:2575
msgid "additionally, your index contains uncommitted changes."
msgstr "dodatkowo, twój indeks zawiera nieoddane zmiany."
-#: wt-status.c:2515
+#: wt-status.c:2577
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "nie można wykonać %s: Twój indeks zawiera niezłożone zmiany."
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:183
+msgid "could not send IPC command"
+msgstr "nie można wysłać polecenia IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:190
+msgid "could not read IPC response"
+msgstr "nie można odczytać odpowiedzi IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:870
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "nie można uruchomić accept_thread „%s”"
+
+#: compat/simple-ipc/ipc-unix-socket.c:882
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "nie można uruchomić worker[0] do „%s”"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "nie można wykonać unlink na „%s”"
@@ -10027,131 +10436,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcje>] [--] <ścieżka>..."
-#: builtin/add.c:58
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "nie można wykonać chmod %cx „%s”"
-#: builtin/add.c:96
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "niespodziewany stan diff %c"
-#: builtin/add.c:101 builtin/commit.c:285
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "aktualizacja plików nie powiodła się"
-#: builtin/add.c:111
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "usuń „%s”\n"
-#: builtin/add.c:186
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Wycofane zmiany po odświeżeniu indeksu:"
-#: builtin/add.c:280 builtin/rev-parse.c:991
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Nie można odczytać indeksu"
-#: builtin/add.c:291
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Nie można otworzyć „%s” do zapisywania."
-
-#: builtin/add.c:295
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Nie można zapisać łatki"
-#: builtin/add.c:298
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "edycja łatki nie powiodła się"
-#: builtin/add.c:301
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Nie można wykonać stat na „%s”"
-#: builtin/add.c:303
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Pusta łatka. Przerwano."
-#: builtin/add.c:308
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Nie można zastosować „%s”"
-#: builtin/add.c:316
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Poniższe ścieżki są ignorowane przez jeden z plików .gitignore:\n"
-#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "na sucho"
-#: builtin/add.c:339
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "interaktywne wybieranie"
-#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "wybierz skrawki interaktywnie"
-#: builtin/add.c:341
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "zmień bieżące różnice i zastosuj"
-#: builtin/add.c:342
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "pozwól na dodawanie inaczej ignorowanych plików"
-#: builtin/add.c:343
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "aktualizuj śledzone pliki"
-#: builtin/add.c:344
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "znormalizuj ponownie końce wierszy w śledzonych plikach (zakłada -u)"
-#: builtin/add.c:345
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "zapisz tylko, że ścieżka zostanie dodana później"
-#: builtin/add.c:346
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "dodaj zmiany z plików śledzonych i nieśledzonych"
-#: builtin/add.c:349
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "pomiń ścieżki usunięte w drzewie roboczym (to samo, co --no-all)"
-#: builtin/add.c:351
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "nie dodawaj, tylko odśwież indeks"
-#: builtin/add.c:352
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "po prostu pomiń pliki, których nie można dodać z powodu błędów"
-#: builtin/add.c:353
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "sprawdź na sucho, czy pliki o takich ścieżkach byłyby ignorowane"
-#: builtin/add.c:355 builtin/update-index.c:1004
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "pozwól aktualizować elementy poza stożkiem rzadkiego wybrania"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "wymuś bit wykonywalności podanych plików"
-#: builtin/add.c:357
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "ostrzegaj przed dodawaniem wbudowanego repozytorium"
-#: builtin/add.c:359
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "silnik do „git stash -p”"
-#: builtin/add.c:377
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10171,7 +10579,7 @@
"Dodano inne repozytorium wewnątrz bieżącego repozytorium.\n"
"Klony zewnętrznego repozytorium nie będą zawierać zawartości\n"
"zawartego repozytorium i nie będą wiedziały, jak ją uzyskać.\n"
-"Jeśli chodziło o dodanie pod-modułu, użyj:\n"
+"Jeśli chodziło o dodanie podmodułu, użyj:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
@@ -10182,12 +10590,12 @@
"\n"
"Więcej informacji w „git help submodule”."
-#: builtin/add.c:405
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dodawanie wbudowanego repozytorium gita: %s"
-#: builtin/add.c:424
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10197,47 +10605,51 @@
"Wyłącz ten komunikat wykonując\n"
"„git config advice.addIgnoredFile false”"
-#: builtin/add.c:433
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "dodawanie plików nie powiodło się"
-#: builtin/add.c:461 builtin/commit.c:345
+#: builtin/add.c:513
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr "--dry-run i --interactive/--patch się wykluczają"
+
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file i --interactive/--patch się wykluczają"
-#: builtin/add.c:478
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file i --edit się wykluczają"
-#: builtin/add.c:490
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u się wykluczają"
-#: builtin/add.c:493
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opcja --ignore-missing może być użyta tylko z --dry-run"
+msgstr "Opcji --ignore-missing można użyć tylko z --dry-run"
-#: builtin/add.c:497
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "parametr --chmod „%s” musi być „-x” albo „+x”"
-#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file i argumenty ze ścieżkami się wykluczają"
-#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul wymaga --pathspec-from-file"
-#: builtin/add.c:526
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nic nie podano, nic nie dodano.\n"
-#: builtin/add.c:528
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10247,110 +10659,110 @@
"Wyłącz ten komunikat wykonując\n"
"„git config advice.addEmptyPathspec false”"
-#: builtin/am.c:352
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "nie można przetworzyć skryptu autorstwa"
-#: builtin/am.c:436
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "skrypt applypatch-msg usunął „%s”"
-#: builtin/am.c:478
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Uszkodzony wiersz wejścia: „%s”."
-#: builtin/am.c:516
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Nie można skopiować uwag z „%s” do „%s”"
-#: builtin/am.c:542
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek nie powiodło się"
-#: builtin/am.c:730
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "nie można przetworzyć łatki „%s”"
-#: builtin/am.c:795
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "Tylko jedna seria łatek StGIT może być nałożona jednocześnie"
-#: builtin/am.c:843
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "nieprawidłowy znacznik czasu"
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "nieprawidłowy wiersz Date"
-#: builtin/am.c:855
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "nieprawidłowe przesunięcie strefy czasowej"
-#: builtin/am.c:948
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Nie można wykryć formatu łatki."
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "nie można utworzyć katalogu „%s”"
-#: builtin/am.c:958
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Nie można rozdzielić łatek."
-#: builtin/am.c:1089
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Kiedy rozwiążesz problem, wykonaj „%s --continue”."
-#: builtin/am.c:1090
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Jeśli wolisz pominąć tę łatkę, wykonaj zamiast tego „%s --skip”."
-#: builtin/am.c:1091
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Aby przywrócić pierwotną gałąź i przerwać łatanie, uruchom „%s --abort”."
-#: builtin/am.c:1174
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Wysłano łatkę z formatem=flowed; odstępy na końcach wierszy mogą zostać "
"stracone."
-#: builtin/am.c:1202
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Łatka jest pusta."
-#: builtin/am.c:1267
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "brakuje wiersza autorstwa w zapisie %s"
-#: builtin/am.c:1270
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "błędny wiersz tożsamości: %.*s"
-#: builtin/am.c:1489
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"W repozytorium brakuje blobów, potrzebnych żeby uciec się do trójstronnego "
"scalania."
-#: builtin/am.c:1491
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Używanie informacji z indeksu do odtworzenia drzewa podstawy..."
-#: builtin/am.c:1510
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10358,24 +10770,24 @@
"Czy łatka była zmieniana ręcznie?\n"
"Nie stosuje się do plików zapisanych w swoim indeksie."
-#: builtin/am.c:1516
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Uciekanie się do podstawy łatania i trójstronnego scalania..."
-#: builtin/am.c:1542
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Nie można scalić zmian."
-#: builtin/am.c:1574
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "stosowanie na pustej historii"
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "nie można wznowić: %s nie istnieje."
-#: builtin/am.c:1648
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Zawartość zapisu to:"
@@ -10383,41 +10795,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1658
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Zastosować? tak [y]/[n]ie/[e]dycja/wyświetl łatkę [v]/za[a]kceptuj "
"wszystkie: "
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "nie można zapisać pliku indeksu"
-#: builtin/am.c:1708
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Brudny indeks: nie można zastosować łatek (brudny: %s)"
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Stosowanie: %.*s"
-#: builtin/am.c:1765
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Brak zmian -- łatka już zastosowana."
-#: builtin/am.c:1771
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Łatanie nie powiodło się przy %s %.*s"
-#: builtin/am.c:1775
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "Użyj „git am --show-current-patch=diff”, aby zobaczyć zawodną łatkę"
-#: builtin/am.c:1819
+#: builtin/am.c:1868
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10427,7 +10839,7 @@
"Jeśli nic nie zostało do przygotowania, jest szansa, że coś innego\n"
"już wprowadziło te same zmiany; możesz chcieć pominąć tę łatkę."
-#: builtin/am.c:1826
+#: builtin/am.c:1875
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10440,17 +10852,17 @@
"Możesz chcieć wykonać „git rm” na pliku, aby zaakceptować na nim „usunięcie "
"przez nich”."
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Nie można przetworzyć obiektu „%s”."
-#: builtin/am.c:1985
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "nie można wyczyścić indeksu"
-#: builtin/am.c:2029
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10458,156 +10870,160 @@
"Wydaje się, że HEAD się przesunęło od ostatniego niepowodzenia „am”.\n"
"Nie cofanie do ORIG_HEAD"
-#: builtin/am.c:2136
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Nieprawidłowa wartość --patch-format: %s"
-#: builtin/am.c:2178
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Nieprawidłowa wartość --show-current-patch: %s"
-#: builtin/am.c:2182
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s i --show-current-patch=%s się wykluczają"
-#: builtin/am.c:2213
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcje>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcje>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "uruchom interaktywnie"
-#: builtin/am.c:2222
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "opcja historyczna — nic nie robi"
-#: builtin/am.c:2224
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "zezwól na uciekanie się do trójstronnego scalania, jeśli potrzebne"
-#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
-#: builtin/repack.c:334 builtin/stash.c:882
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "mniej komunikatów"
-#: builtin/am.c:2227
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "dodaj końcówkę Signed-off-by do komunikatu zapisu"
-#: builtin/am.c:2230
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "przekoduj na utf8 (domyślnie)"
-#: builtin/am.c:2232
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "przekaż flagę -k do git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "przekaż flagę -b do git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "przekaż flagę -m do git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "przekaż flagę --keep-cr do git-mailsplit przy formacie mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"nie przekazuj flagi --keep-cr do git-mailsplit, niezależnie od am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "odetnij wszystko przed wierszem nożyczek"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2297
+msgid "pass it through git-mailinfo"
+msgstr "przepuść przez git-mailinfo"
+
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "przepuść przez git-apply"
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
-#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "format, w którym są łatki"
-#: builtin/am.c:2276
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "zastąp komunikat błędu, kiedy wystąpi błąd łatania"
-#: builtin/am.c:2278
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "kontynuuj stosowanie łatek po rozwiązaniu konfliktu"
-#: builtin/am.c:2281
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "zamienniki dla --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "pomiń obecną ścieżkę"
-#: builtin/am.c:2287
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "przywróć pierwotną gałąź i przerwij łatanie"
-#: builtin/am.c:2290
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "przerwij operację łatania, ale zostaw HEAD, gdzie jest"
-#: builtin/am.c:2294
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "pokaż właśnie stosowaną łatkę"
-#: builtin/am.c:2299
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "zmyśl datę zapisu"
-#: builtin/am.c:2301
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "użyj bieżącego znacznika czasu jako daty utworzenia"
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
-#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "id-klucza"
-#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "podpisuj zapisy GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(użycie wewnętrzne w git-rebase)"
-#: builtin/am.c:2325
+#: builtin/am.c:2379
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."
@@ -10615,17 +11031,17 @@
"Opcja -b/--binary nic nie robi od dłuższego czasu i zostanie\n"
"usunięta. Nie używaj jej już."
-#: builtin/am.c:2332
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "nie można odczytać indeksu"
-#: builtin/am.c:2347
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"poprzedni katalog przestawiania %s nadal istnieje, ale podano skrzynkę mbox."
-#: builtin/am.c:2371
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10634,11 +11050,11 @@
"Znaleziono bezpański katalog %s.\n"
"Użyj „git am --abort” aby go usunąć."
-#: builtin/am.c:2377
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Nie trwa operacja rozwiązywania, nie wznawiamy."
-#: builtin/am.c:2387
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
@@ -10646,46 +11062,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcje>] [<łatka>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "nie można utworzyć pliku archiwum „%s”"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "nie można przekierować wyjścia"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Zdalne repozytorium bez adresu"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: błąd protokołu"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: oczekiwano wypróżnienia"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<zapis>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <dobre_określenie> <złe_określenie> "
-"[<określenie>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10724,73 +11129,86 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rewizja>|<zakres>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <polecenie>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "nie można otworzyć pliku „%s” w trybie „%s”"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "nie można pisać do pliku „%s”"
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "nie można otworzyć pliku „%s” do czytania"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s” nie jest prawidłowym sformułowaniem"
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "nie można użyć wbudowanego polecenia „%s” jako sformułowania"
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "nie można zmienić znaczenia sformułowania „%s”"
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "użyj dwóch różnych sformułowań"
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Teraz nie przeszukujemy.\n"
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "„%s” nie jest prawidłowym zapisem"
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"nie można wybrać pierwotnego HEAD „%s”. Spróbuj „git bisect reset <zapis>”."
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Błędny argument bisect_write: %s"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "nie można uzyskać oid rewizji „%s”"
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "nie można otworzyć pliku „%s”"
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Nieprawidłowe polecenie: przeszukujesz teraz %s/%s"
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10799,7 +11217,7 @@
"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10810,7 +11228,7 @@
"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "przeszukiwanie tylko z zapisem %s"
@@ -10819,15 +11237,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Czy na pewno [Y/n]? "
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "nie zdefiniowano sformułowań"
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10836,7 +11254,7 @@
"Bieżące sformułowania to %s na stary stan\n"
"i %s na nowy stan.\n"
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10845,54 +11263,54 @@
"nieprawidłowy argument %s do „git bisect terms”.\n"
"Wspierane opcje to: --term-good | --term-old i --term-bad | --term-new."
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "nie udało się przygotować przejścia rewizji\n"
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "nie można otworzyć „%s” do dopisywania"
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "„” nie jest prawidłowym sformułowaniem"
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "nierozpoznana opcja: „%s”"
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "„%s” nie wydaje się być prawidłową rewizją"
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "złe HEAD — potrzeba HEAD"
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"wybieranie „%s” nie powiodło się. Spróbuj „git bisect start <prawidłowa-"
"gałąź>”."
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "nie przeszukam na drzewie cg-seek'owanym"
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "złe HEAD — dziwna referencja symboliczna"
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "nieprawidłowa referencja: „%s”"
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Musisz rozpocząć przez „git bisect start”\n"
@@ -10900,99 +11318,151 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Chcesz, żeby to teraz zrobić [Y/n]? "
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Wywołaj „--bisect-state” z przynajmniej jednym argumentem"
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "„git bisect %s” przyjmuje tylko jeden argument."
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Błędne wejście rev: %s"
-#: builtin/bisect--helper.c:912
+#: builtin/bisect--helper.c:904
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Błędne wejście rev (nie jest zapisem): %s"
+
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Teraz nie przeszukujemy."
-#: builtin/bisect--helper.c:962
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "„%s”?? o czym ty w ogóle mówisz?"
-#: builtin/bisect--helper.c:974
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "nie można odczytać „%s” do odtwarzania"
-#: builtin/bisect--helper.c:1047
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "przeszukanie nie powiodło się: nie podano polecenia."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "wykonywanie %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"przeszukanie nie powiodło się: kod wyjścia %d z „%s” jest < 0 lub >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "nie można otworzyć pliku „%s” do zapisywania"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "przeszukanie nie może już kontynuować"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "przeszukanie pomyślne"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "przeszukiwanie znalazło pierwszy zły zapis"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"przeszukanie nie powiodło się: „git bisect--helper --bisect-state %s” "
+"zakończył się z kodem błędu %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "zresetuj stan przeszukiwania"
-#: builtin/bisect--helper.c:1049
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "sprawdź, czy istnieją złe lub dobre określenia"
-#: builtin/bisect--helper.c:1051
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "wypisz tylko określenia przeszukiwania"
-#: builtin/bisect--helper.c:1053
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "rozpocznij sesję przeszukiwania"
-#: builtin/bisect--helper.c:1055
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "znajdź kolejny zapis do przeszukiwania"
-#: builtin/bisect--helper.c:1057
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "oznacz stan referencji"
-#: builtin/bisect--helper.c:1059
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "wypisz dotychczasowe kroki przeszukiwania"
-#: builtin/bisect--helper.c:1061
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "odtwórz proces przeszukiwania z podanego pliku"
-#: builtin/bisect--helper.c:1063
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "pomiń niektóre zapisy do wybrania"
-#: builtin/bisect--helper.c:1065
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "wizualizuj przeszukiwanie"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "użyj <polecenia>... do automatycznego przeszukiwania."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "brak dziennika do BISECT_WRITE"
-#: builtin/bisect--helper.c:1080
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset wymaga jako argumentu albo niczego albo zapisu"
-#: builtin/bisect--helper.c:1085
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
-
-#: builtin/bisect--helper.c:1091
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms wymaga maksymalnie jednego argumentu"
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next wymaga braku argumentów"
-#: builtin/bisect--helper.c:1111
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log wymaga braku argumentów"
-#: builtin/bisect--helper.c:1116
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "nie podano pliku dziennika"
@@ -11004,149 +11474,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<opcje-rewizji> są opisane w git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "oczekiwano koloru: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "musi się kończyć kolorem"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "błędny kolor „%s” w color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "nieprawidłowa wartość blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "nie znaleziono rewizji %s do pominięcia"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "pokaż elementy oskarżenia w miarę znajdywania, przyrostowo"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "nie pokazuj nazw obiektów w brzegowych zapisach (domyślnie wyłączone)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "nie traktuj zapisów-korzeni jako granic (domyślnie wyłączone)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "pokaż statystyki kosztu pracy"
-#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
-#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "wymuś zgłaszanie postępu"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "pokaż wynik wyjściowy elementów oskarżenia"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "pokazuj pierwotną nazwę pliku (Domyślnie: automatycznie)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "pokaż pierwotny numer wiersza (domyślnie wyłączone)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "pokaż w formacie zaprojektowanym do przetwarzania maszynowego"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "pokaż w porcelanowym formacie z informacją o zapisie w każdym wierszu"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "użyj tego samego trybu wyjścia, co git-annotate (domyślnie wyłączone)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "pokaż surowy znacznik czasu (domyślnie wyłączone)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "pokaż długie SHA-1 zapisu (domyślnie wyłączone)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "nie wypisuj nazwiska autora i znacznika czasu (domyślnie wyłączone)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "pokaż adres e-mail autora zamiast nazwiska (domyślnie wyłączone)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignoruj różnice w białych znakach"
-#: builtin/blame.c:883 builtin/log.c:1812
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rewizja"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "pomiń <rewizję> przy obwinianiu"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "pomiń rewizje z <pliku>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "koloruj inaczej zbędne metadane z poprzedniego wiersza"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "koloruj wiersze według wieku"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "poświęć dodatkowe cykle, aby znaleźć lepsze dopasowanie"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "użyj rewizji z <pliku> zamiast wołać git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "użyj zawartości <pliku> jako ostatecznego obrazu"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "wynik"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "znajdź kopie wierszy w plikach i pomiędzy nimi"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "znajdź ruchy wierszy w plikach i pomiędzy nimi"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "zakres"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "przetwórz tylko zakres <start>,<end> lub funkcję :<nazwa-funkcji>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi"
@@ -11158,11 +11630,11 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 lata, 11 miesięcy temu"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -11170,7 +11642,7 @@
msgstr[1] "plik %s ma tylko %lu wiersze"
msgstr[2] "plik %s ma tylko %lu wierszy"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Obwinianie wierszy"
@@ -11271,77 +11743,77 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Usunięto gałąź %s (wskazywała %s).\n"
-#: builtin/branch.c:438 builtin/tag.c:61
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "nie można przetworzyć łańcucha formatu"
-#: builtin/branch.c:469
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "nie można rozwiązać HEAD"
-#: builtin/branch.c:475
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wskazuje poza refs/heads/"
-#: builtin/branch.c:490
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Gałąź %s jest przestawiana na %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Gałąź %s jest przeszukiwana w %s"
-#: builtin/branch.c:511
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "nie można skopiować bieżącej gałęzi, gdy nie ma żadnej bieżącej."
-#: builtin/branch.c:513
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "nie można zmienić nazwy bieżącej gałęzi, gdy nie ma żadnej bieżącej."
-#: builtin/branch.c:524
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nieprawidłowa nazwa gałęzi: „%s”"
-#: builtin/branch.c:553
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Zmiana nazwy gałęzi nie powiodła się"
-#: builtin/branch.c:555
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Kopiowanie gałęzi nie powiodło się"
-#: builtin/branch.c:559
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skopiowano źle nazwaną gałąź „%s”"
-#: builtin/branch.c:562
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Poprawiono nazwę gałęzi „%s”"
-#: builtin/branch.c:568
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nazwa gałęzi zmieniona na %s, ale czoło HEAD nie jest zaktualizowane!"
-#: builtin/branch.c:577
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Zmieniono nazwę gałęzi, ale aktualizacja pliku konfiguracyjnego nie powiodła "
"się"
-#: builtin/branch.c:579
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Skopiowano gałąź, ale aktualizacja pliku konfiguracyjnego nie powiodła się"
-#: builtin/branch.c:595
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11352,180 +11824,180 @@
" %s\n"
"Wiersze zaczynające się od „%c” zostaną wycięte.\n"
-#: builtin/branch.c:629
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Opcje ogólne"
-#: builtin/branch.c:631
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "pokaż skrót i temat; podaj dwukrotnie, aby wypisać gałąź nadrzędną"
-#: builtin/branch.c:632
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "pomiń komunikaty informacyjne"
-#: builtin/branch.c:633
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "ustaw tryb śledzenia (zobacz git-pull(1))"
-#: builtin/branch.c:635
+#: builtin/branch.c:638
msgid "do not use"
msgstr "nie używaj"
-#: builtin/branch.c:637 builtin/rebase.c:534
+#: builtin/branch.c:640
msgid "upstream"
msgstr "zdalne-repozytorium"
-#: builtin/branch.c:637
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "zmień gałąź nadrzędną"
-#: builtin/branch.c:638
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "usuń informacje o gałęzi nadrzędnej"
-#: builtin/branch.c:639
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "użyj kolorowego wyjścia"
-#: builtin/branch.c:640
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "działaj na gałęziach śledzących"
-#: builtin/branch.c:642 builtin/branch.c:644
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "wypisz tylko gałęzie zawierające ten zapis"
-#: builtin/branch.c:643 builtin/branch.c:645
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "wypisz tylko gałęzie nie zawierające tego zapisu"
-#: builtin/branch.c:648
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Działania typowe dla git-branch:"
-#: builtin/branch.c:649
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "wypisz i śledzące i lokalne gałęzie"
-#: builtin/branch.c:651
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "usuń całkowicie scaloną gałąź"
-#: builtin/branch.c:652
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "usuń gałąź (nawet niescaloną)"
-#: builtin/branch.c:653
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "przenieś gałąź i jej dziennik referencji / zmień ich nazwę"
-#: builtin/branch.c:654
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "przenieś gałąź / zmień jej nazwę, nawet jeśli cel istnieje"
-#: builtin/branch.c:655
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "skopiuj gałąź i jej dziennik referencji"
-#: builtin/branch.c:656
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "skopiuj gałąź, nawet jeśli cel istnieje"
-#: builtin/branch.c:657
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "wypisz nazwy gałęzi"
-#: builtin/branch.c:658
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "pokaż nazwę bieżącej gałęzi"
-#: builtin/branch.c:659
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "utwórz dziennik referencji gałęzi"
-#: builtin/branch.c:661
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "edytuj opis gałęzi"
-#: builtin/branch.c:662
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "wymuś utworzenie, przeniesienie/zmianę nazwy, usunięcie"
-#: builtin/branch.c:663
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "wypisz tylko scalone gałęzie"
-#: builtin/branch.c:664
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "wypisz tylko niescalone gałęzie"
-#: builtin/branch.c:665
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "wypisz gałęzie w kolumnach"
-#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:466
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "obiekt"
-#: builtin/branch.c:668
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "wypisz tylko gałęzie obiektu"
-#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sortowanie i filtrowanie nie uwzględniają wielkości liter"
-#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format do użycia na wyjściu"
-#: builtin/branch.c:693 builtin/clone.c:790
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "nie znaleziono HEAD w refs/heads!"
-#: builtin/branch.c:717
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose się wykluczają"
-#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "wymagana nazwa gałęzi"
-#: builtin/branch.c:764
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Nie można nadać opisu odłączonemu HEAD"
-#: builtin/branch.c:769
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "nie można edytować opisu więcej niż jednej gałęzi"
-#: builtin/branch.c:776
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Jeszcze nie ma zapisów na gałęzi „%s”."
-#: builtin/branch.c:779
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Nie ma gałęzi „%s”."
-#: builtin/branch.c:794
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "za dużo gałęzi do operacji kopiowania"
-#: builtin/branch.c:803
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "za dużo argumentów do operacji zmiany nazwy"
-#: builtin/branch.c:808
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "za dużo argumentów do ustawienia nadrzędnej gałęzi"
-#: builtin/branch.c:812
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11533,32 +12005,32 @@
"nie można ustawić gałęzi nadrzędnej HEAD na %s, kiedy nie wskazuje ono na "
"gałąź."
-#: builtin/branch.c:815 builtin/branch.c:838
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "nie ma takiej gałęzi „%s”"
-#: builtin/branch.c:819
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "gałąź „%s” nie istnieje"
-#: builtin/branch.c:832
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "za dużo argumentów do usunięcia nadrzędnej gałęzi"
-#: builtin/branch.c:836
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"nie można usunąć ustawienia gałęzi nadrzędnej HEAD, kiedy nie wskazuje ono "
"żadnej gałęzi."
-#: builtin/branch.c:842
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Gałąź „%s” nie ma informacji o gałęzi nadrzędnej"
-#: builtin/branch.c:852
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11566,7 +12038,7 @@
"Opcje -a i -r do „git branch” nie przyjmują nazwy gałęzi.\n"
"Czy chodziło o: -a | -r --list <wzorzec>?"
-#: builtin/branch.c:856
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11574,32 +12046,32 @@
"opcja „--set-upstream” jest przestarzała i nie jest już wspierana. Użyj "
"zamiast tego „--track” lub ”--set-upstream-to”."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "wersja gita:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() zawiodło z błędem „%s” (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "informacje o kompilacji: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "informacje o bibliotece libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "nie uruchomiono z repozytorium gita — brak skryptów do pokazania\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <plik>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11633,38 +12105,33 @@
"Przejrzyj resztę zgłoszenia błędu poniżej.\n"
"Możesz usunąć wiersze, którymi nie chcesz się dzielić.\n"
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "podaj cel pliku ze zgłoszeniem błędu"
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "podaj sufiks w formacie strftime do nazwy pliku"
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "nie można utworzyć wiodących katalogów „%s”"
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Informacje o systemie"
-#: builtin/bugreport.c:169
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Włączone skrypty Gita"
-#: builtin/bugreport.c:176
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "nie można utworzyć nowego pliku w „%s”"
-
-#: builtin/bugreport.c:179
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "nie można pisać do %s"
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Utworzono nowe zgłoszenie w „%s”.\n"
@@ -11685,27 +12152,27 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <plik> [<referencja>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "nie pokazuj wskaźnika postępu"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "pokazuj wskaźnik postępu"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "pokaż miernik postępu podczas fazy zapisywania obiektów"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "podobne do --all-progress, kiedy pokazany jest wskaźnik postępu"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "podaj wersję formatu wiązki"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
@@ -11713,25 +12180,25 @@
msgid "do not show bundle details"
msgstr "nie pokazuj szczegółów wiązki"
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s jest w porządku\n"
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Potrzebne repozytorium do podzielenia."
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Rozpakowywanie obiektów"
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Nieznane pod-polecenie: %s"
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11739,7 +12206,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <rodzaj> | --textconv | --filters) [--path=<ścieżka>] <obiekt>"
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11747,73 +12214,73 @@
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "można podać tylko jedną opcję wsadową „batch”"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<rodzaj> może być jednym z: blob, tree, commit, tag"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "pokaż typ obiektu"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "pokaż rozmiar obiektu"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "zwróć zero, kiedy nie ma błędu"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "ładnie wypisz zawartość obiektu"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "dla obiektów blob, wykonaj textconv na zawartości obiektu"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "dla obiektów blob, wykonaj filtry na zawartości obiektu"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "użyj podanej ścieżki do --textconv/--filters"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "zezwól, aby -s i -t działały z uszkodzonymi obiektami"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "buforuj wyjście --batch"
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"pokaż informacje i zawartość obiektów pobranych ze standardowego wejścia"
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "pokaż informacje o obiektach pobranych ze standardowego wejścia"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"podążaj za dowiązaniami w drzewie (do użycia z --batch lub --batch-check)"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "pokaż wszystkie obiekty z --batch lub --batch-check"
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "nie porządkuj wyjścia --batch-all-objects"
@@ -11833,7 +12300,7 @@
msgid "use .gitattributes only from the index"
msgstr "użyj .gitattributes tylko z indeksu"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "wczytaj nazwy plików ze standardowego wejścia"
@@ -11841,8 +12308,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "zakończ wpisy wejścia i wyjścia znakiem NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
-#: builtin/worktree.c:489
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "nie zgłaszaj postępu"
@@ -11854,27 +12321,27 @@
msgid "ignore index when checking"
msgstr "pomiń indeks przy sprawdzaniu"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
msgstr "nie można podać ścieżek z --stdin"
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
msgstr "-z ma sens tylko z --stdin"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
msgid "no path specified"
msgstr "nie podano ścieżki"
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet ma sens tylko z pojedynczą ścieżką"
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
msgid "cannot have both --quiet and --verbose"
msgstr "--quiet i --verbose się wykluczają"
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching ma sens tylko z --verbose"
@@ -11895,6 +12362,22 @@
msgid "no contacts specified"
msgstr "nie podano kontaktów"
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<opcje>]"
+
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "string"
+msgstr "łańcuch"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
+
#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
@@ -11903,96 +12386,85 @@
msgid "stage should be between 1 and 3 or all"
msgstr "przygotowanie powinno być pomiędzy 1 a 3 lub „all”"
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:187
msgid "check out all files in the index"
msgstr "wybierz wszystkie pliki z indeksu"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
msgid "force overwrite of existing files"
msgstr "wymuś nadpisanie istniejących plików"
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:190
msgid "no warning for existing files and files not in index"
msgstr "nie ostrzegaj przed istniejącymi plikami i plikami nie w indeksie"
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:192
msgid "don't checkout new files"
msgstr "nie wybieraj nowych plików"
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:194
msgid "update stat information in the index file"
msgstr "zaktualizuj informacje stat w pliku indeksu"
-#: builtin/checkout-index.c:197
+#: builtin/checkout-index.c:198
msgid "read list of paths from the standard input"
msgstr "odczytaj listę ścieżek ze standardowego wejścia"
-#: builtin/checkout-index.c:199
+#: builtin/checkout-index.c:200
msgid "write the content to temporary files"
msgstr "zapisz zawartość do plików tymczasowych"
-#: builtin/checkout-index.c:200 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:717
-msgid "string"
-msgstr "ciąg znaków"
-
-#: builtin/checkout-index.c:201
-msgid "when creating files, prepend <string>"
-msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
-
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:204
msgid "copy out the files from named stage"
msgstr "wykopiuj pliki z nazwanego przygotowania"
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcje>] <gałąź>"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcje>] [<gałąź>] -- <plik>..."
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<opcje>] <gałąź>"
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opcje>] [--source=<gałąź>] <plik>..."
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have our version"
msgstr "ścieżka „%s” nie ma „naszej” wersji"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
#, c-format
msgid "path '%s' does not have their version"
msgstr "ścieżka „%s” nie ma „ich” wersji"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "ścieżka „%s” nie ma wszystkich potrzebnych wersji"
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ścieżka „%s” nie ma potrzebnych wersji"
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "path '%s': cannot merge"
msgstr "ścieżka „%s”: nie można scalić"
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Nie można dodać wyniku scalenia dla „%s”"
-#: builtin/checkout.c:396
+#: builtin/checkout.c:411
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
@@ -12000,7 +12472,7 @@
msgstr[1] "Odtworzono %d konflikty scalenia"
msgstr[2] "Odtworzono %d konfliktów scalenia"
-#: builtin/checkout.c:401
+#: builtin/checkout.c:416
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
@@ -12008,7 +12480,7 @@
msgstr[1] "Zaktualizowano %d ścieżki z %s"
msgstr[2] "Zaktualizowano %d ścieżek z %s"
-#: builtin/checkout.c:408
+#: builtin/checkout.c:423
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
@@ -12016,48 +12488,48 @@
msgstr[1] "Zaktualizowano %d ścieżki z indeksu"
msgstr[2] "Zaktualizowano %d ścieżek z indeksu"
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "Nie można użyć „%s” przy aktualizowaniu ścieżek"
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:459 builtin/checkout.c:462
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "„%s” i %s wykluczają się"
-#: builtin/checkout.c:451
+#: builtin/checkout.c:466
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s”."
-#: builtin/checkout.c:455
+#: builtin/checkout.c:470
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "nie podano ani „%s” ani „%s”"
-#: builtin/checkout.c:459
+#: builtin/checkout.c:474
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "należy użyć „%s”, jeśli nie podano „%s”"
-#: builtin/checkout.c:464 builtin/checkout.c:469
+#: builtin/checkout.c:479 builtin/checkout.c:484
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "nie można użyć „%s” ani „%s” z %s"
-#: builtin/checkout.c:543 builtin/checkout.c:550
+#: builtin/checkout.c:558 builtin/checkout.c:565
#, c-format
msgid "path '%s' is unmerged"
msgstr "ścieżka „%s” jest niescalona"
-#: builtin/checkout.c:718
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "musisz najpierw rozwiązać bieżący indeks"
-#: builtin/checkout.c:772
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12066,50 +12538,50 @@
"nie można kontynuować z przygotowanymi zmianami w następujących plikach:\n"
"%s"
-#: builtin/checkout.c:865
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "nie można wykonać reflog na „%s”: %s\n"
-#: builtin/checkout.c:907
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD wskazuje teraz na"
-#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "nie można zaktualizować HEAD"
-#: builtin/checkout.c:915
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Zresetuj gałąź „%s”\n"
-#: builtin/checkout.c:918
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Już jesteś na „%s”\n"
-#: builtin/checkout.c:922
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Przełączono na gałąź „%s” i zresetowano ją\n"
-#: builtin/checkout.c:924 builtin/checkout.c:1355
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Przełączono na nową gałąź „%s”\n"
-#: builtin/checkout.c:926
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Przełączono na gałąź „%s”\n"
-#: builtin/checkout.c:977
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d innych.\n"
-#: builtin/checkout.c:983
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12137,7 +12609,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1002
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12170,19 +12642,19 @@
" git branch <nazwa-nowej-gałęzi> %s\n"
"\n"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "wewnętrzny błąd w przechodzeniu rewizji"
-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Poprzednim wskazaniem HEAD było"
-#: builtin/checkout.c:1081 builtin/checkout.c:1350
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Jesteś na gałęzi, która dopiero ma powstać"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12191,7 +12663,7 @@
"„%s” może być jednocześnie lokalnym plikiem i gałęzią śledzącą.\n"
"Użyj -- (i opcjonalnie --no-guess), żeby ujednoznacznić"
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12211,51 +12683,51 @@
"<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
"checkout.defaultRemote=origin w swoich ustawieniach."
-#: builtin/checkout.c:1180
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s” pasuje do wielu (%d) gałęzi śledzących"
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "oczekiwano tylko jednej referencji"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "oczekiwano tylko jednej referencji, podano %d."
-#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "nieprawidłowa referencja: %s"
-#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "referencja nie jest drzewem: %s"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "oczekiwano gałęzi, otrzymano tag „%s”"
-#: builtin/checkout.c:1371
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "oczekiwano gałęzi, otrzymano zdalną gałąź „%s”"
-#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "oczekiwano gałęzi, otrzymano „%s”"
-#: builtin/checkout.c:1375
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "oczekiwano gałęzi, otrzymano zapis „%s”"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12263,7 +12735,7 @@
"Nie można przełączyć gałęzi w trakcie scalania\n"
"Rozważ „git merge --quit” lub „git worktree add”."
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12271,7 +12743,7 @@
"Nie można przełączyć gałęzi w trakcie sesji am\n"
"Rozważ „git am --quit” lub „git worktree add”."
-#: builtin/checkout.c:1399
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12279,7 +12751,7 @@
"Nie można przełączyć gałęzi w trakcie przestawiania\n"
"Rozważ „git rebase --quit” lub „git worktree add”."
-#: builtin/checkout.c:1403
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12287,7 +12759,7 @@
"Nie można przełączyć gałęzi w trakcie dobierania\n"
"Rozważ „git cherry-pick --quit” lub „git worktree add”."
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12295,137 +12767,137 @@
"Nie można przełączyć gałęzi w trakcie odwracania\n"
"Rozważ „git revert --quit” lub „git worktree add”."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "zmiana gałęzi w trakcie przeszukiwania"
-#: builtin/checkout.c:1418
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "ścieżki nie mogą być podane z przełączaniem gałęzi"
-#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "„%s” nie może być użyte z przełączaniem gałęzi"
+msgstr "„%s” nie można użyć z przełączaniem gałęzi"
-#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
-#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "„%s” i „%s” wykluczają się"
-#: builtin/checkout.c:1446
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "„%s” nie może przyjąć <punktu-startowego>"
-#: builtin/checkout.c:1454
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Nie można przełączyć gałęzi na nie-zapis „%s”"
-#: builtin/checkout.c:1461
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "brakuje argumentu gałęzi lub zapisu"
-#: builtin/checkout.c:1504
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "dokonaj trójstronnego scalenia z nową gałęzią"
-#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "styl"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "styl konfliktów (merge lub diff3)"
-#: builtin/checkout.c:1518 builtin/worktree.c:486
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "odłącz HEAD na podanym zapisie"
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "ustaw gałąź nadrzędną nowej gałęzi"
-#: builtin/checkout.c:1521
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "wymuś wybranie (wyrzuć lokalne zmiany)"
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nowa-gałąź"
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nowa gałąź bez rodzica"
-#: builtin/checkout.c:1525 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "aktualizuj ignorowane pliki (domyślnie)"
-#: builtin/checkout.c:1528
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "nie sprawdzaj, czy inne drzewo robocze trzyma podaną referencję"
-#: builtin/checkout.c:1541
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "wybierz „naszą” wersję niescalonych plików"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "wybierz „ich” wersję niescalonych plików"
-#: builtin/checkout.c:1548
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "nie ograniczaj ścieżek tylko do rzadkich elementów"
-#: builtin/checkout.c:1603
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c i --orphan się wykluczają"
-#: builtin/checkout.c:1607
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p i --overlay się wykluczają"
-#: builtin/checkout.c:1644
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track potrzebuje nazwy gałęzi"
-#: builtin/checkout.c:1649
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "brakuje nazwy gałęzi; spróbuj -%c"
-#: builtin/checkout.c:1681
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "nie można rozwiązać %s"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "nieprawidłowa ścieżka"
-#: builtin/checkout.c:1704
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s” nie jest zapisem, a nie można z niego utworzyć gałęzi „%s”"
-#: builtin/checkout.c:1708
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nie przyjmuje argumentu ścieżki „%s”"
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file i --detach się wykluczają"
-#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file i --patch się wykluczają"
-#: builtin/checkout.c:1733
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12433,70 +12905,71 @@
"git checkout: --ours/--theirs, --force i --merge się wykluczają, gdy\n"
"wybieranie z indeksu."
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "musisz podać ścieżkę (ścieżki) do przywrócenia"
-#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
-#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
-#: builtin/worktree.c:484
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "gałąź"
-#: builtin/checkout.c:1765
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "utwórz i wybierz nową gałąź"
-#: builtin/checkout.c:1767
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "utwórz/zresetuj i wybierz gałąź"
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "utwórz dziennik referencji nowej gałęzi"
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "spróbuj zgadnąć „git checkout <nieistniejąca-gałąź>” (domyślnie)"
-#: builtin/checkout.c:1771
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "użyj trybu nakładki (domyślnie)"
-#: builtin/checkout.c:1816
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "utwórz i przełącz na nową gałąź"
-#: builtin/checkout.c:1818
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "utwórz/zresetuj i przełącz na gałąź"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "spróbuj zgadnąć „git switch <nieistniejąca-gałąź>”"
-#: builtin/checkout.c:1822
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "wyrzuć lokalne zmiany"
-#: builtin/checkout.c:1856
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "z którego drzewa wybrać"
-#: builtin/checkout.c:1858
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "przywróć indeks"
-#: builtin/checkout.c:1860
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "przywróć drzewo robocze (domyślnie)"
-#: builtin/checkout.c:1862
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "pomiń niescalone elementy"
-#: builtin/checkout.c:1863
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "użyj trybu nakładki"
@@ -12526,17 +12999,12 @@
msgid "Would skip repository %s\n"
msgstr "Pominięto by repozytorium %s\n"
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "nie można usunąć %s"
-
#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "nie można wykonać lstat na %s\n"
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12549,7 +13017,7 @@
"foo - wybierz element po unikatowym początku\n"
" - (puste) nic nie wybiera\n"
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12570,33 +13038,33 @@
"* - wybierz wszystko\n"
" - (puste) zakończ zaznaczanie\n"
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hę (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Wprowadź wzorce ignorowania>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:693
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "Ostrzeżenie: Nie znaleziono elementów pasujących do: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:714
msgid "Select items to delete"
msgstr "Wybierz elementy do skasowania"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Usunąć %s [y/N]? "
-#: builtin/clean.c:789
+#: builtin/clean.c:786
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12614,53 +13082,53 @@
"help - ten ekran\n"
"? - pomoc do zachęty wyboru"
-#: builtin/clean.c:825
+#: builtin/clean.c:822
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Usunięto by następujący element:"
msgstr[1] "Usunięto by następujące elementy:"
msgstr[2] "Usunięto by następujące elementy:"
-#: builtin/clean.c:841
+#: builtin/clean.c:838
msgid "No more files to clean, exiting."
msgstr "Brak plików do wyczyszczenia, wyjście."
-#: builtin/clean.c:903
+#: builtin/clean.c:900
msgid "do not print names of files removed"
msgstr "nie wypisuj nazw usuwanym plików"
-#: builtin/clean.c:905
+#: builtin/clean.c:902
msgid "force"
msgstr "wymuś"
-#: builtin/clean.c:906
+#: builtin/clean.c:903
msgid "interactive cleaning"
msgstr "interaktywne czyszczenie"
-#: builtin/clean.c:908
+#: builtin/clean.c:905
msgid "remove whole directories"
msgstr "usuwaj całe katalogi"
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "wzorzec"
-#: builtin/clean.c:910
+#: builtin/clean.c:907
msgid "add <pattern> to ignore rules"
msgstr "dodaj <wzorzec> do reguł ignorowania"
-#: builtin/clean.c:911
+#: builtin/clean.c:908
msgid "remove ignored files, too"
msgstr "usuń też ignorowane pliki"
-#: builtin/clean.c:913
+#: builtin/clean.c:910
msgid "remove only ignored files"
msgstr "usuń tylko ignorowane pliki"
-#: builtin/clean.c:929
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12668,7 +13136,7 @@
"clean.requireForce ustawione na true, a nie podano -i, -n ani -f; odmawiam "
"czyszczenia"
-#: builtin/clean.c:932
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12676,7 +13144,7 @@
"clean.requireForce to domyślnie true, a nie podano -i, -n ani -f; odmawiam "
"czyszczenia"
-#: builtin/clean.c:944
+#: builtin/clean.c:940
msgid "-x and -X cannot be used together"
msgstr "-x i -X wykluczają się"
@@ -12684,208 +13152,206 @@
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcje>] [--] <repozytorium> [<katalog>]"
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "nie klonuj płytkiego repozytorium"
+
+#: builtin/clone.c:98
msgid "don't create a checkout"
msgstr "nie wybieraj plików"
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "utwórz suche repozytorium"
-#: builtin/clone.c:99
+#: builtin/clone.c:103
msgid "create a mirror repository (implies bare)"
msgstr "utwórz lustrzane repozytorium (zakłada suche)"
-#: builtin/clone.c:101
+#: builtin/clone.c:105
msgid "to clone from a local repository"
msgstr "aby sklonować z lokalnego repozytorium"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "don't use local hardlinks, always copy"
msgstr "nie używaj twardych dowiązań, zawsze kopiuj"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "setup as shared repository"
msgstr "ustaw jako repozytorium dzielone"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "pathspec"
msgstr "ścieżka"
-#: builtin/clone.c:107
-msgid "initialize submodules in the clone"
-msgstr "zainicjuj pod-moduły w klonie"
-
#: builtin/clone.c:111
-msgid "number of submodules cloned in parallel"
-msgstr "liczba pod-modułów klonowanych równolegle"
+msgid "initialize submodules in the clone"
+msgstr "zainicjuj podmoduły w klonie"
-#: builtin/clone.c:112 builtin/init-db.c:552
+#: builtin/clone.c:115
+msgid "number of submodules cloned in parallel"
+msgstr "liczba podmodułów klonowanych równolegle"
+
+#: builtin/clone.c:116 builtin/init-db.c:539
msgid "template-directory"
msgstr "katalog-szablonów"
-#: builtin/clone.c:113 builtin/init-db.c:553
+#: builtin/clone.c:117 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "katalog, z którego zostaną użyte szablony"
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "repozytorium odniesienia"
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "użyj --reference tylko podczas klonowania"
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "nazwa"
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
msgstr "użyj <nazwy> zamiast „origin”, żeby śledzić zdalne repozytorium"
-#: builtin/clone.c:123
+#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "wybierz <gałąź> zamiast zdalnego HEAD"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "path to git-upload-pack on the remote"
msgstr "ścieżka do git-upload-pack na zdalnej maszynie"
-#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "głębokość"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "create a shallow clone of that depth"
msgstr "utwórz płytki klon o tej głębokości"
-#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "czas"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "create a shallow clone since a specific time"
msgstr "utwórz płytki klon od podanego czasu"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "rewizja"
-#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "pogłęb historię płytkiego klonu pomijając rewizję"
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "sklonuj tylko jedną gałąź, HEAD lub --branch"
-#: builtin/clone.c:135
+#: builtin/clone.c:139
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"nie klonuj żadnych tagów, i spraw, by późniejsze pobrania za nimi nie "
"podążały"
-#: builtin/clone.c:137
+#: builtin/clone.c:141
msgid "any cloned submodules will be shallow"
-msgstr "wszystkie sklonowane pod-moduły będą płytkie"
+msgstr "wszystkie sklonowane podmoduły będą płytkie"
-#: builtin/clone.c:138 builtin/init-db.c:561
+#: builtin/clone.c:142 builtin/init-db.c:548
msgid "gitdir"
msgstr "katalog-gita"
-#: builtin/clone.c:139 builtin/init-db.c:562
+#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "oddziel katalog gita od drzewa roboczego"
-#: builtin/clone.c:140
+#: builtin/clone.c:144
msgid "key=value"
msgstr "klucz=wartość"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "set config inside the new repository"
msgstr "ustaw konfigurację w nowym repozytorium"
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "zależne-od-serwera"
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "nadaj opcję"
-#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "używaj tylko adresów IPv4"
-#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "używaj tylko adresów IPv6"
-#: builtin/clone.c:150
+#: builtin/clone.c:154
msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "wszystkie sklonowane pod-moduły będą używały swoich gałęzi śledzących"
+msgstr "wszystkie sklonowane podmoduły będą używały swoich gałęzi śledzących"
-#: builtin/clone.c:152
+#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"zainicjuj plik rzadkiego wybrania, żeby zawierał tylko pliki w korzeniu"
-#: builtin/clone.c:288
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nie można zgadnąć nazwy katalogu.\n"
-"Podaj katalog w wierszu poleceń"
-
-#: builtin/clone.c:341
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Nie można dodać alternatywnego obiektu do „%s”: %s\n"
-#: builtin/clone.c:414
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s istnieje i nie jest katalogiem"
-#: builtin/clone.c:432
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "nie można rozpocząć iteracji po „%s”"
-#: builtin/clone.c:463
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "nie można utworzyć dowiązania „%s”"
-#: builtin/clone.c:467
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "nie można skopiować pliku do „%s”"
-#: builtin/clone.c:472
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "nie można iterować po „%s”"
-#: builtin/clone.c:499
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "gotowe.\n"
-#: builtin/clone.c:513
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12895,149 +13361,153 @@
"Możesz zobaczyć, co zostało wybrane w „git status”\n"
"i ponowić przez „git restore --source=HEAD :/”\n"
-#: builtin/clone.c:590
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Nie znaleziono zdalnej gałęzi %s do sklonowania."
-#: builtin/clone.c:709
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "nie można zaktualizować %s"
-#: builtin/clone.c:757
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "nie można zainicjować rzadkiego wybrania"
-#: builtin/clone.c:780
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "zdalne HEAD wskazuje nieistniejącą referencję, nie można wybrać.\n"
-#: builtin/clone.c:812
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "nie można wybrać drzewa roboczego"
-#: builtin/clone.c:887
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "nie można zapisać parametrów do pliku konfiguracyjnego"
-#: builtin/clone.c:950
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "nie można przepakować, żeby posprzątać"
-#: builtin/clone.c:952
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "nie można wykonać unlink na tymczasowym pliku alternatywnych położeń"
-#: builtin/clone.c:993 builtin/receive-pack.c:2493
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Zbyt dużo argumentów."
-#: builtin/clone.c:997
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Musisz określić repozytorium do sklonowania."
-#: builtin/clone.c:1010
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "opcje --bare i --origin %s wykluczają się."
-#: builtin/clone.c:1013
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir się wykluczają."
-#: builtin/clone.c:1026
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "repozytorium „%s” nie istnieje"
-#: builtin/clone.c:1030 builtin/fetch.c:1951
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "głębokość %s nie jest liczbą dodatnią"
-#: builtin/clone.c:1040
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "docelowa ścieżka „%s” już istnieje i nie jest pustym katalogiem."
-#: builtin/clone.c:1046
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "ścieżka repozytorium „%s” już istnieje i nie jest pustym katalogiem."
-#: builtin/clone.c:1060
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "drzewo robocze „%s” już istnieje."
-#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
-#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "nie można utworzyć wiodących katalogów „%s”"
-#: builtin/clone.c:1080
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "nie można utworzyć katalogu drzewa roboczego „%s”"
-#: builtin/clone.c:1100
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonowanie do suchego repozytorium „%s”...\n"
-#: builtin/clone.c:1102
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonowanie do „%s”...\n"
-#: builtin/clone.c:1126
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive nie pasuje do --reference ani do --reference-if-able"
-#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s” nie jest prawidłową nazwą zdalnego repozytorium"
-#: builtin/clone.c:1211
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth jest ignorowana w lokalnych klonach; użyj zamiast tego file://"
-#: builtin/clone.c:1213
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since jest ignorowana w lokalnych klonach; użyj zamiast tego "
"file://"
-#: builtin/clone.c:1215
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude jest ignorowane w lokalnych klonach; użyj zamiast tego "
"file://"
-#: builtin/clone.c:1217
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter jest ignorowany w lokalnych klonach; użyj zamiast tego file://"
-#: builtin/clone.c:1220
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "źródłowe repozytorium jest płytkie, ignorowanie --local"
-#: builtin/clone.c:1225
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local jest ignorowane"
-#: builtin/clone.c:1315 builtin/clone.c:1323
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "zdalny transport zgłosił błąd"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nie znaleziono zdalnej gałęzi %s w repozytorium %s"
-#: builtin/clone.c:1326
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Wygląda na to, że sklonowano puste repozytorium."
@@ -13054,33 +13524,33 @@
msgstr "układ do użycia"
#: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Maksymalna szerokość"
+msgid "maximum width"
+msgstr "maksymalna szerokość"
#: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Wyrównawczy odstęp przy lewej krawędzi"
+msgid "padding space on left border"
+msgstr "wyrównawczy odstęp przy lewej krawędzi"
#: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Wyrównawczy odstęp przy prawej krawędzi"
+msgid "padding space on right border"
+msgstr "wyrównawczy odstęp przy prawej krawędzi"
#: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Wyrównawczy odstęp między kolumnami"
+msgid "padding space between columns"
+msgstr "wyrównawczy odstęp między kolumnami"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command musi być pierwszym argumentem"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <katalog-obiektów>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13090,94 +13560,92 @@
"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opcje podziału>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "nie znaleziono katalogu obiektów pasującego do „%s”"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "katalog"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "katalog obiektów do przechowania grafu"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "jeśli graf zapisów jest podzielony, zweryfikuj tylko plik czubka"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Nie można otworzyć grafu zapisów „%s”"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "nierozpoznany argument --split, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "nieoczekiwany nieszesnastkowy identyfikator obiektu: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "nieprawidłowy obiekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "zacznij przechodzenie po wszystkich referencjach"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "przeskanuj indeksy paczek wymienione na wejściu dla zapisów"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "zacznij przechodzenie od zapisów wypisanych na standardowym wejściu"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "uwzględnij wszystkie zapisy już w pliku grafu zapisów"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "włącz obliczanie zmienionych ścieżek"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "pozwól zapisać przyrostowy plik grafu zapisów"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "maksymalna liczba zapisów w niepodstawowym rozdzieleniu grafu zapisów"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"maksymalny stosunek pomiędzy dwoma poziomami rozdzielonego grafu zapisów"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "wygaś tylko obiekty starsze niż podany czas"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maksymalna liczba filtrów Blooma zmienionych ścieżek do obliczenia"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "--reachable, --stdin-commits i --stdin-packs wykluczają się"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Zbieranie zapisów z wejścia"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "nieznane pod-polecenie: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13191,70 +13659,65 @@
msgid "duplicate parent %s ignored"
msgstr "zignorowano powtórzonego rodzica %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "nieprawidłowa nazwa obiektu %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: nie można otworzyć „%s”"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: nie można odczytać „%s”"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: nie można zamknąć „%s”"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "rodzic"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "identyfikator obiektu zapisu rodzica"
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
-#: builtin/tag.c:445
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "komunikat"
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "komunikat zapisu"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "odczytaj komunikat dziennika zapisu z pliku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "podpisz zapis GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "należy podać tylko jedno drzewo"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: nie można odczytać"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcje>] [--] <ścieżka>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcje>] [--] <ścieżka>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13264,7 +13727,7 @@
"Możesz powtórzyć polecenie z --allow-empty, lub usunąć ten zapis\n"
"całkowicie przez „git reset HEAD^”.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13279,15 +13742,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "W przeciwnym wypadku użyj „git rebase --skip”\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "W przeciwnym wypadku użyj „git cherry-pick --skip”\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13309,73 +13772,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "nie można rozpakować obiektu drzewa HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file i -a wykluczają się"
-#: builtin/commit.c:361
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "Brak ścieżek z --include/--only nie ma sensu."
-#: builtin/commit.c:373
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "nie można utworzyć tymczasowego indeksu"
-#: builtin/commit.c:382
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "interaktywne dodawanie nie powiodło się"
-#: builtin/commit.c:397
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "nie można zaktualizować tymczasowego indeksu"
-#: builtin/commit.c:399
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Nie można zaktualizować głównego drzewa pamięci podręcznej"
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "nie można zapisać pliku new_index"
-#: builtin/commit.c:476
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "nie można złożyć częściowego zapisu w czasie scalania."
-#: builtin/commit.c:478
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "nie można złożyć częściowego zapisu w czasie dobierania."
-#: builtin/commit.c:480
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "nie można złożyć częściowego zapisu w czasie przestawiania."
-#: builtin/commit.c:488
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "nie można odczytać indeksu"
-#: builtin/commit.c:507
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "nie można zapisać tymczasowego pliku indeksu"
-#: builtin/commit.c:605
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "zapis „%s” nie ma nagłówka autora"
-#: builtin/commit.c:607
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "zapis „%s” ma nieprawidłowy wiersz autorstwa"
-#: builtin/commit.c:626
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "nieprawidłowy parametr --author"
-#: builtin/commit.c:679
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13383,38 +13846,81 @@
"nie można wybrać znaku komentarza, który nie jest użyty\n"
"w bieżącym komunikacie zapisu"
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "nie odnaleziono zapisu %s"
-#: builtin/commit.c:729 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(czytanie komunikatu dziennika ze standardowego wejścia)\n"
-#: builtin/commit.c:731
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "nie można odczytać dziennika ze standardowego wejścia"
-#: builtin/commit.c:735
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "nie można odczytać pliku dziennika „%s”"
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:802
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "-m i --fixup się wykluczają:%s"
+
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "nie można odczytać SQUASH_MSG"
-#: builtin/commit.c:773
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "nie czytaj MERGE_MSG"
-#: builtin/commit.c:833
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "nie można zapisać szablonu zapisu"
-#: builtin/commit.c:853
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą ignorowane.\n"
+
+#: builtin/commit.c:896
+#, 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 ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą ignorowane, a pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:900
+#, 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"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+
+#: builtin/commit.c:904
+#, 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 ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+"Pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13428,7 +13934,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"i spróbuj ponownie.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13442,165 +13948,175 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"i spróbuj ponownie.\n"
-#: builtin/commit.c:868
-#, 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 ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
-"od „%c” będą ignorowane, a pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:876
-#, 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 ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
-"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
-"Pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:893
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:901
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:908
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sSkładający: %.*s <%.*s>"
-#: builtin/commit.c:926
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Nie można odczytać indeksu"
-#: builtin/commit.c:997
+#: builtin/commit.c:1026
+msgid "unable to pass trailers to --trailers"
+msgstr "nie można przekazać końcówek do --trailers"
+
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Błąd budowania drzew"
-#: builtin/commit.c:1011 builtin/tag.c:308
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Należy podać komunikat przy użyciu opcji -m lub -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author „%s” nie jest postaci „Nazwa <e-mail>” i nie pasuje do istniejących "
"twórców"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Nieprawidłowy tryb pomijanych plików „%s”"
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Nieprawidłowy tryb nieśledzonych plików „%s”"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long i -z się wykluczają"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1227
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Jesteś w trakcie scalania — nie można przeredagować."
+
+#: builtin/commit.c:1229
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Jesteś w trakcie dobierania — nie można przeredagować."
+
+#: builtin/commit.c:1232
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr "nie można łączyć opcji przeredagowania w --fixup ze ścieżką „%s”"
+
+#: builtin/commit.c:1234
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"opcja przeredagowania w --fixup i --patch/--interactive/--all/--include/--"
+"only się wykluczają"
+
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Użycie jednoczenie --reset-author i --author nie ma sensu"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Nie masz nic do poprawienia."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Jesteś w trakcie scalania — nie można poprawiać."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Jesteś w trakcie dobierania — nie można poprawiać."
-#: builtin/commit.c:1187
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Jesteś w trakcie przestawiania — nie można poprawiać."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opcje --squash i --fixup się wykluczają"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c, -C, -F i --fixup się wykluczają."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opcje -m, -c, -C i -F się wykluczają."
-#: builtin/commit.c:1211
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author może być użyte tylko z -C, -c lub --amend."
+msgstr "--reset-author można użyć tylko z -C, -c lub --amend."
-#: builtin/commit.c:1229
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "--include, --only, --all, --interactive i --patch się wykluczają."
-#: builtin/commit.c:1235
+#: builtin/commit.c:1337
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "nieznana opcja: --fixup=%s:%s"
+
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "ścieżki „%s ...” z -a nie mają sensu"
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "pokaż stan zwięźle"
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "pokaż informacje o gałęzi"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "pokaż informacje o schowku"
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "oblicz pełne wartości przed/w tyle"
-#: builtin/commit.c:1374
+#: builtin/commit.c:1493
msgid "version"
msgstr "wersja"
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:679
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "wyjście czytelne dla maszyny"
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "pokazuj stan w długim formacie (domyślnie)"
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "rozdziel elementy znakiem NUL"
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "tryb"
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"pokaż nieśledzone pliki, dodatkowe tryby: all, normal, no. (domyślnie all)"
-#: builtin/commit.c:1387
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13608,186 +14124,207 @@
"pokaż pomijane pliki, dodatkowe tryby: traditional, matching, no. (domyślnie "
"traditional)"
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "kiedy"
-#: builtin/commit.c:1390
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-"pomiń zmiany w pod-modułach, możliwe <kiedy>: all, dirty, untracked. "
+"pomiń zmiany w podmodułach, możliwe <kiedy>: all, dirty, untracked. "
"(domyślnie all)"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "wypisz nieśledzone pliki w kolumnach"
-#: builtin/commit.c:1393
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "nie wykrywaj zmian nazw"
-#: builtin/commit.c:1395
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "wykryj zmiany nazw, opcjonalnie ustaw wskaźnik podobieństwa"
-#: builtin/commit.c:1415
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Niewspierane połączenie argumentów o plikach nieśledzonych i pomijanych"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "pomiń podsumowanie po udanym zapisie"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "pokaż różnice w szablonie komunikatu zapisu"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Opcje komunikatu zapisu"
-#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "odczytaj komunikat z pliku"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "nadpisz autora w zapisie"
-#: builtin/commit.c:1503 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "data"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "nadpisz datę zapisu"
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "zapis"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "użyj komunikatu jak w podanym zapisie i edytuj go"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "użyj komunikatu jak w podanym zapisie"
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr ""
-"użyj komunikatu automatycznego spłaszczania, mówiącego, aby naprawić podany "
-"zapis"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1633
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]zapis"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1633
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby poprawić/"
+"przeredagować podany zapis"
+
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"użyj komunikatu automatycznego spłaszczania, mówiącego, aby spłaszczyć "
"podany zapis"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "ten zapis jest teraz mojego autorstwa (do użycia z -C/-c/--amend)"
-#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "końcówka"
+
+#: builtin/commit.c:1636
+msgid "add custom trailer(s)"
+msgstr "dodaj niestandardowe końcówki"
+
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "dodaj końcówkę Signed-off-by"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "użyj określonego pliku szablonu"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "wymuś edycję zapisu"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "uwzględnij status w szablonie komunikatu zapisu"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Opcje zawartości zapisu"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "złóż wszystkie zmienione pliki"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "dodaj podane pliki do indeksu do złożenia"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "interaktywnie dodaj pliki"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "interaktywnie dodaj zmiany"
-#: builtin/commit.c:1524
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "złóż tylko podane pliki"
-#: builtin/commit.c:1525
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "omiń skrypty pre-commit i commit-msg"
-#: builtin/commit.c:1526
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "pokaż, co byłoby złożone"
-#: builtin/commit.c:1539
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "popraw poprzedni zapis"
-#: builtin/commit.c:1540
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "omiń skrypt post-rewrite"
-#: builtin/commit.c:1547
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "pozwól złożyć pustą zmianę"
-#: builtin/commit.c:1549
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "pozwól złożyć zmianę z pustym komunikatem"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Uszkodzony plik MERGE_HEAD (%s)"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "nie można odczytać MERGE_MODE"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "nie można odczytać komunikatu zapisu: %s"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Przerwano składanie z powodu pustego komunikatu zapisu.\n"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Przerywanie zapisu; nie wpisano komunikatu.\n"
-#: builtin/commit.c:1696
+#: builtin/commit.c:1803
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Przerwano składanie z powodu pustej treści komunikatu zapisu.\n"
+
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14039,15 +14576,15 @@
#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
-msgstr "--local może być użyty tylko w repozytorium gita"
+msgstr "--local można użyć tylko w repozytorium gita"
#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
-msgstr "--blob może być użyty tylko w repozytorium gita"
+msgstr "--blob można użyć tylko w repozytorium gita"
#: builtin/config.c:662
msgid "--worktree can only be used inside a git repository"
-msgstr "--worktree może być użyte tylko w repozytorium gita"
+msgstr "--worktree można użyć tylko w repozytorium gita"
#: builtin/config.c:684
msgid "$HOME not set"
@@ -14134,7 +14671,7 @@
msgid "print sizes in human readable format"
msgstr "wypisz rozmiary w formacie czytelnym dla człowieka"
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14147,15 +14684,15 @@
"\n"
"\tchmod 0700 %s"
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
msgid "print debugging messages to stderr"
msgstr "wypisuj informacje diagnostyczne na stderr"
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon niedostępny; brak wsparcia dla gniazd uniksa"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache niedostępna; brak wsparcia dla gniazd uniksa"
@@ -14356,7 +14893,7 @@
msgid "Not a git repository"
msgstr "To nie jest repozytorium gita"
-#: builtin/diff.c:532 builtin/grep.c:682
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "podano nieprawidłowy obiekt „%s”."
@@ -14376,56 +14913,56 @@
msgid "%s...%s: multiple merge bases, using %s"
msgstr "%s...%s: wiele podstaw scalenia, używanie %s"
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]"
-#: builtin/difftool.c:260
-#, c-format
-msgid "failed: %d"
-msgstr "nie powiodło się: %d"
-
-#: builtin/difftool.c:302
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "nie można odczytać dowiązania symbolicznego %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "nie można odczytać pliku dowiązania symbolicznego %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "nie można odczytać obiektu %s dowiązania symbolicznego %s"
-#: builtin/difftool.c:412
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"złączone formaty różnic („-c” i „--cc”) nie są wspierane w\n"
"trybie różnic katalogu („-d” i „--dir-diff”)."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "oba pliki zmienione: „%s” i „%s”."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "plik z drzewem roboczym został opuszczony."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "istnieją tymczasowe pliki w „%s”."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "możesz chcieć je wyczyścić lub odzyskać."
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "nie powiodło się: %d"
+
#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "użyj „diff.guitool” zamiast „diff.tool”"
@@ -14456,7 +14993,7 @@
#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"niech „git-difftool” wyjdzie, kiedy wywołane narzędzie różnic zwróci "
@@ -14470,23 +15007,23 @@
msgid "passed to `diff`"
msgstr "przekazywane do „diff”"
-#: builtin/difftool.c:731
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool wymaga drzewa roboczego lub --no-index"
-#: builtin/difftool.c:738
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff i --no-index się wykluczają"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool i --extcmd się wykluczają"
-#: builtin/difftool.c:749
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "nie podano <narzędzia> do --tool=<narzędzie>"
-#: builtin/difftool.c:756
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
@@ -14494,7 +15031,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opcje> <zmienna-środ>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "rodzaj"
@@ -14525,111 +15062,111 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcje-listy-rewizji]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Błąd: Nie można wyeksportować zagnieżdżonych tagów, jeśli nie podano --mark-"
"tags."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "żeton --anonymize-map nie może być pusty"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "pokaż wskaźnik postępu po <n> obiektach"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "wybierz traktowanie podpisanych tagów"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "wybierz traktowanie tagów przypisanych do filtrowanych obiektów"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "wybierz traktowanie komunikatów zapisów w alternatywnym kodowaniu"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "zrzuć znaczniki to tego pliku"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "wczytaj znaczniki z tego pliku"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "wczytaj znaczniki z tego pliku, jeśli istnieje"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "zmyśl tagującego w tagach, które go nie mają"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "wypisz pełne drzewo dla każdego zapisu"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "użyj funkcji done, żeby zakończyć strumień"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "pomiń wypisywanie danych binarnych"
-#: builtin/fast-export.c:1222 builtin/log.c:1815
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "referencja"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "zastosuj referencję do wyeksportowanych referencji"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimizuj wyjście"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "od:do"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "zamień <z> na <na> w zanonimizowanym wyjściu"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"odwołaj się do rodziców, którzy nie są w strumieniu szybkiego eksportu, "
"według identyfikatora obiektu"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "pokaż pierwotne identyfikatory obiektów blobów/zapisów"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "oznacz tagi identyfikatorami znaczników"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize nie ma sensu bez --anonymize"
+msgstr "--anonymize-map nie ma sensu bez --anonymize"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Nie można przekazać i --import-marks i --import-marks-if-exists"
#: builtin/fast-import.c:3088
#, c-format
msgid "Missing from marks for submodule '%s'"
-msgstr "Brakujące znaczniki od z pod-modułu „%s”"
+msgstr "Brakujące znaczniki od z podmodułu „%s”"
#: builtin/fast-import.c:3090
#, c-format
msgid "Missing to marks for submodule '%s'"
-msgstr "Brakujące znaczniki do z pod-modułu „%s”"
+msgstr "Brakujące znaczniki do z podmodułu „%s”"
#: builtin/fast-import.c:3225
#, c-format
@@ -14643,8 +15180,7 @@
#: builtin/fast-import.c:3322
msgid "Expected format name:filename for submodule rewrite option"
-msgstr ""
-"W opcji przeredagowania pod-modułu oczekiwano formatu nazwa:nazwa-pliku"
+msgstr "W opcji przeredagowania podmodułu oczekiwano formatu nazwa:nazwa-pliku"
#: builtin/fast-import.c:3377
#, c-format
@@ -14672,199 +15208,209 @@
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcje>]"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:122
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel nie może być ujemne"
-#: builtin/fetch.c:143 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "pobierz ze wszystkich zdalnych repozytoriów"
-#: builtin/fetch.c:145 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "ustaw gałąź nadrzędną do git pull/fetch"
-#: builtin/fetch.c:147 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "dopisz do .git/FETCH_HEAD zamiast nadpisywać"
-#: builtin/fetch.c:149
+#: builtin/fetch.c:151
msgid "use atomic transaction to update references"
msgstr "zażądaj atomowej transakcji do aktualizacji referencji"
-#: builtin/fetch.c:151 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "ścieżka do wysyłania paczki po zdalnej stronie"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:154
msgid "force overwrite of local reference"
msgstr "wymuś nadpisanie lokalnej referencji"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
msgid "fetch from multiple remotes"
msgstr "pobierz z wielu zdalnych repozytoriów"
-#: builtin/fetch.c:156 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "pobierz wszystkie tagi i powiązane obiekty"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:160
msgid "do not fetch all tags (--no-tags)"
msgstr "nie pobieraj wszystkich tagów (--no-tags)"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
msgid "number of submodules fetched in parallel"
-msgstr "liczba pod-modułów pobieranych równolegle"
+msgstr "liczba podmodułów pobieranych równolegle"
-#: builtin/fetch.c:162 builtin/pull.c:198
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"zmień podaną referencję, aby umieścić wszystkie referencje w refs/prefetch/"
+
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "przytnij gałęzie śledzące usunięte ze zdalnego repozytorium"
-#: builtin/fetch.c:164
+#: builtin/fetch.c:168
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"przytnij lokalne tagi, których już nie ma w zdalnym repozytorium, i nadpisz "
"zmienione tagi"
-#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:170
msgid "control recursive fetching of submodules"
-msgstr "steruj rekurencyjnym pobieraniem pod-modułów"
+msgstr "steruj rekurencyjnym pobieraniem podmodułów"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:175
msgid "write fetched references to the FETCH_HEAD file"
msgstr "zapisz pobrane referencje do pliku FETCH_HEAD"
-#: builtin/fetch.c:172 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "zachowaj pobraną paczkę"
-#: builtin/fetch.c:174
+#: builtin/fetch.c:178
msgid "allow updating of HEAD ref"
msgstr "zezwól na aktualizację referencji HEAD"
-#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "pogłęb historię płytkiego klonu"
-#: builtin/fetch.c:179 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "pogłęb historię płytkiego repozytorium według czasu"
-#: builtin/fetch.c:185 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "przekształć w pełne repozytorium"
-#: builtin/fetch.c:188
+#: builtin/fetch.c:192
msgid "prepend this to submodule path output"
-msgstr "dodaj to przed wyjściem ścieżki pod-modułu"
+msgstr "dodaj to przed wyjściem ścieżki podmodułu"
-#: builtin/fetch.c:191
+#: builtin/fetch.c:195
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-"domyślnie w rekurencyjnym pobieraniu pod-modułów (niższy priorytet niż pliki "
+"domyślnie w rekurencyjnym pobieraniu podmodułów (niższy priorytet niż pliki "
"konfiguracji)"
-#: builtin/fetch.c:195 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "przyjmuj referencje, które aktualizują .git/shallow"
-#: builtin/fetch.c:196 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "mapowanie"
-#: builtin/fetch.c:197 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "podaj mapę referencji do pobrania"
-#: builtin/fetch.c:204 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "zgłaszaj, że mamy tylko obiekty osiągalne z tego obiektu"
-#: builtin/fetch.c:207 builtin/fetch.c:209
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"nie pobieraj pliku paczki; zamiast tego wypisz przodków czubków negocjacji"
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
msgid "run 'maintenance --auto' after fetching"
msgstr "wykonaj „maintenance --auto” po pobraniu"
-#: builtin/fetch.c:211 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr ""
"sprawdź na wszystkich zaktualizowanych gałęziach, czy wystąpiły wymuszone "
"aktualizacje"
-#: builtin/fetch.c:213
+#: builtin/fetch.c:219
msgid "write the commit-graph after fetching"
msgstr "wypisz graf zapisów po pobraniu"
-#: builtin/fetch.c:215
+#: builtin/fetch.c:221
msgid "accept refspecs from stdin"
msgstr "przyjmuj referencje ze standardowego wejścia"
-#: builtin/fetch.c:526
+#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
msgstr "Nie znaleziono zdalnej referencji HEAD"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "ustawienie fetch.output zawiera nieprawidłową wartość %s"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "nie znaleziono obiektu %s"
-#: builtin/fetch.c:800
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[aktualne]"
-#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[odrzucono]"
-#: builtin/fetch.c:814
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "nie można pobrać na bieżącej gałęzi"
-#: builtin/fetch.c:824
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[aktualizacja tagu]"
-#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
-#: builtin/fetch.c:896
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "nie można zaktualizować lokalnej referencji"
-#: builtin/fetch.c:829
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "nadpisałoby istniejący tag"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[nowy tag]"
-#: builtin/fetch.c:854
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nowa gałąź]"
-#: builtin/fetch.c:857
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[nowa referencja]"
-#: builtin/fetch.c:896
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "wymuszona aktualizacja"
-#: builtin/fetch.c:901
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "nieprzewinięte"
-#: builtin/fetch.c:1005
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14875,7 +15421,7 @@
"użyj flagi „--show-forced-updates” lub wykonaj\n"
"„git fetch.showForcedUpdates true”."
-#: builtin/fetch.c:1009
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14888,22 +15434,22 @@
"false”\n"
" aby uniknąć tego sprawdzenia.\n"
-#: builtin/fetch.c:1041
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s nie wysłał wszystkich potrzebnych obiektów\n"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1134
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "odrzucanie %s, bo nie można aktualizować płytkich korzeni"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "odrzucanie %s, bo nie dozwolono aktualizowania płytkich korzeni"
-#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Z %.*s\n"
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14912,56 +15458,61 @@
"nie można zaktualizować niektórych lokalnych referencji;\n"
" spróbuj wykonać „git remote prune %s”, aby usunąć stare niepasujące gałęzie"
-#: builtin/fetch.c:1267
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s będzie wiszący)"
-#: builtin/fetch.c:1268
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s stał się wiszący)"
-#: builtin/fetch.c:1300
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[usunięto]"
-#: builtin/fetch.c:1301 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(brak)"
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Odmawiam pobrania na bieżącą gałąź %s nie-suchego repozytorium"
-#: builtin/fetch.c:1343
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "W opcji „%s” wartość „%s” jest nieprawidłowa przy %s"
-#: builtin/fetch.c:1346
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opcja „%s” jest ignorowana przez %s\n"
-#: builtin/fetch.c:1558
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "obiekt „%s” nie istnieje"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "wykryto wiele gałęzi, wyklucza się to z --set-upstream"
-#: builtin/fetch.c:1573
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "nie ustawiam gałęzi nadrzędnej w gałęzi śledzącej"
-#: builtin/fetch.c:1575
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "nie ustawiam głównego nurtu w zdalnym tagu"
-#: builtin/fetch.c:1577
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "nieznany rodzaj gałęzi"
-#: builtin/fetch.c:1579
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14969,22 +15520,22 @@
"nie znaleziono gałęzi źródłowej.\n"
"należy podać dokładnie jedną gałąź z opcją --set-upstream."
-#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Pobieranie %s\n"
-#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Nie można pobrać %s"
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "nie można pobrać „%s” (kod wyjścia: %d)\n"
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14992,44 +15543,56 @@
"Nie ustawiono zdalnego repozytorium. Podaj adres URL lub\n"
"nazwę zdalnego repozytorium, z którego mają być pobrane nowe rewizje."
-#: builtin/fetch.c:1870
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Musisz określić nazwę tagu."
-#: builtin/fetch.c:1935
+#: builtin/fetch.c:2009
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only wymaga jednego lub wielu --negotiate-tip=*"
+
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "ujemna głębokość w --deepen nie jest wspierana"
-#: builtin/fetch.c:1937
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepend i --depth się wykluczają"
+msgstr "--deepen i --depth się wykluczają"
-#: builtin/fetch.c:1942
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow wykluczają się"
-#: builtin/fetch.c:1944
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow w pełnym repozytorium nie ma sensu"
-#: builtin/fetch.c:1961
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all nie przyjmuje argumentów z repozytoriów"
-#: builtin/fetch.c:1963
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "--all i referencje się wykluczają"
-#: builtin/fetch.c:1972
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Nie ma takiego zdalnego repozytorium ani ich grupy: %s"
-#: builtin/fetch.c:1979
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "pobieranie grupy i podanie referencji nie ma sensu"
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2073
+msgid "must supply remote when using --negotiate-only"
+msgstr "należy podać zdalne repozytorium przy --negotiate-only"
+
+#: builtin/fetch.c:2078
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokół nie wspiera --negotiate-only, wyjście."
+
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15037,12 +15600,12 @@
"można użyć --filter tylko ze zdalnym repozytorium ustawionym w extensions."
"partialclone"
-#: builtin/fetch.c:2001
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
"można użyć --atomic tylko przy pobieraniu z jednego zdalnego repozytorium"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"można użyć --stdin tylko przy pobieraniu z jednego zdalnego repozytorium"
@@ -15089,47 +15652,47 @@
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<zapis>]] [--no-contains [<zapis>]]"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
msgstr "użyj cytowania jak w powłokach"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
msgstr "użyj cytowania jak w perlu"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
msgstr "użyj cytowania jak w pythonie"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
msgstr "użyj cytowania jak w Tclu"
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr "pokazuj tylko <n> pasujących referencji"
-#: builtin/for-each-ref.c:39 builtin/tag.c:472
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "uszanuj kolory formatu"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
msgid "print only refs which points at the given object"
msgstr "wypisz tylko referencje wskazujące ten obiekt"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
msgid "print only refs that are merged"
msgstr "wypisz tylko scalone referencje"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
msgid "print only refs that are not merged"
msgstr "wypisz tylko niescalone referencje"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
msgid "print only refs which contain the commit"
msgstr "wypisz tylko referencje zawierające ten zapis"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
msgid "print only refs which don't contain the commit"
msgstr "wypisz tylko referencje nie zawierające tego zapisu"
@@ -15137,44 +15700,44 @@
msgid "git for-each-repo --config=<config> <command-args>"
msgstr "git for-each-repo --config=<konfiguracja> <argumenty-polecenia>"
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr "konfiguracja"
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr "klucz konfiguracji przechowujący listę ścieżek repozytoriów"
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr "brakuje --config=<konfiguracja>"
-#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
msgid "unknown"
msgstr "nieznane"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:83 builtin/fsck.c:103
+#: builtin/fsck.c:78 builtin/fsck.c:100
#, c-format
msgid "error in %s %s: %s"
msgstr "błąd w %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:97
+#: builtin/fsck.c:94
#, c-format
msgid "warning in %s %s: %s"
msgstr "ostrzeżenie w %s %s:%s"
-#: builtin/fsck.c:126 builtin/fsck.c:129
+#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
msgstr "zepsute łącze z %7s %s"
-#: builtin/fsck.c:138
+#: builtin/fsck.c:136
msgid "wrong object type in link"
msgstr "zły rodzaj obiektu w łączu"
-#: builtin/fsck.c:154
+#: builtin/fsck.c:152
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -15183,211 +15746,221 @@
"zepsute łącze z %7s %s\n"
" do %7s %s"
-#: builtin/fsck.c:265
+#: builtin/fsck.c:264
#, c-format
msgid "missing %s %s"
msgstr "brakujący %s %s"
-#: builtin/fsck.c:292
+#: builtin/fsck.c:291
#, c-format
msgid "unreachable %s %s"
msgstr "nieosiągalny %s %s"
-#: builtin/fsck.c:312
+#: builtin/fsck.c:311
#, c-format
msgid "dangling %s %s"
msgstr "wiszące %s %s"
-#: builtin/fsck.c:322
+#: builtin/fsck.c:321
msgid "could not create lost-found"
msgstr "nie można utworzyć biura obiektów znalezionych"
-#: builtin/fsck.c:333
+#: builtin/fsck.c:332
#, c-format
msgid "could not finish '%s'"
msgstr "nie można zakończyć „%s”"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:349
#, c-format
msgid "Checking %s"
msgstr "Sprawdzanie %s"
-#: builtin/fsck.c:388
+#: builtin/fsck.c:387
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Sprawdzanie spójności (%d obiektów)"
-#: builtin/fsck.c:407
+#: builtin/fsck.c:406
#, c-format
msgid "Checking %s %s"
msgstr "Sprawdzanie %s %s"
-#: builtin/fsck.c:412
+#: builtin/fsck.c:411
msgid "broken links"
msgstr "zepsute łącza"
-#: builtin/fsck.c:421
+#: builtin/fsck.c:420
#, c-format
msgid "root %s"
msgstr "korzeń %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:428
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "otagowano %s %s (%s) w %s"
-#: builtin/fsck.c:458
+#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: brakujący lub uszkodzony obiekt"
-#: builtin/fsck.c:483
+#: builtin/fsck.c:482
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: nieprawidłowy element dziennika referencji %s"
-#: builtin/fsck.c:497
+#: builtin/fsck.c:496
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Sprawdzanie dziennika referencji %s->%s"
-#: builtin/fsck.c:531
+#: builtin/fsck.c:530
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: nieprawidłowy wskaźnik SHA-1 %s"
-#: builtin/fsck.c:538
+#: builtin/fsck.c:537
#, c-format
msgid "%s: not a commit"
msgstr "%s: nie jest zapisem"
-#: builtin/fsck.c:592
+#: builtin/fsck.c:591
msgid "notice: No default references"
msgstr "uwaga: Brak domyślnych referencji"
-#: builtin/fsck.c:607
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: konflikt skrótów ścieżek, znaleziono w: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: brakujący lub uszkodzony obiekt: %s"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: obiekt jest nieznanego rodzaju „%s”: %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nie można przetworzyć obiektu: %s"
-#: builtin/fsck.c:640
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "zły plik SHA-1: %s"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Sprawdzanie katalogu obiektów"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Sprawdzanie katalogów obiektów"
-#: builtin/fsck.c:673
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Sprawdzanie połączenia %s"
-#: builtin/fsck.c:678 builtin/index-pack.c:865
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "błędny %s"
-#: builtin/fsck.c:685
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s wskazuje na coś dziwnego (%s)"
-#: builtin/fsck.c:691
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: oddzielone HEAD niczego nie wskazuje"
-#: builtin/fsck.c:695
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "uwaga: %s wskazuje nienarodzoną gałąź (%s)"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Sprawdzanie drzewa pamięci podręcznej"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: nieprawidłowy wskaźnik SHA-1 w drzewie pamięci podręcznej"
-#: builtin/fsck.c:721
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "nie-drzewo w drzewie pamięci podręcznej"
-#: builtin/fsck.c:752
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcje>] [<obiekt>...]"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "pokazuj nieosiągalne obiekty"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "pokaż wiszące obiekty"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "zgłaszaj tagi"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "zgłaszaj węzły korzenia"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "dodaj obiekty indeksu do naczelnych węzłów"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "dodaj dzienniki referencji do węzłów naczelnych (domyślnie)"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "przejrzyj też paczki i obiekty alternatywne"
-#: builtin/fsck.c:765
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "sprawdź tylko spójność"
-#: builtin/fsck.c:766 builtin/mktag.c:78
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "włącz ściślejsze sprawdzanie"
-#: builtin/fsck.c:768
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "zapisz wiszące obiekty w .git/lost-found"
-#: builtin/fsck.c:769 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "pokazuj postęp"
-#: builtin/fsck.c:770
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "pokaż rozwlekłe nazwy osiągalnych obiektów"
-#: builtin/fsck.c:829 builtin/index-pack.c:261
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Sprawdzanie obiektów"
-#: builtin/fsck.c:857
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: brakujący obiekt"
-#: builtin/fsck.c:868
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "nieprawidłowy parametr: oczekiwano SHA-1, otrzymano „%s”"
@@ -15406,12 +15979,12 @@
msgid "failed to parse '%s' value '%s'"
msgstr "nie można przetworzyć wartości „%s” „%s”"
-#: builtin/gc.c:487 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "nie można wykonać stat na „%s”"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "nie można odczytać „%s”"
@@ -15420,13 +15993,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"Ostatnie wykonanie gc zgłosiło, co następuje. Napraw główną przyczynę\n"
-"i usuń %s.\n"
+"i usuń %s\n"
"Automatyczne czyszczenie nie zostanie przeprowadzone, póki ten plik nie "
"zniknie.\n"
"\n"
@@ -15506,151 +16079,191 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "nierozpoznany argument --schedule „%s”"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "nie można wypisać grafu zapisów"
-#: builtin/gc.c:914
-msgid "failed to fill remotes"
-msgstr "nie można wypełnić zdalnych repozytoriów"
+#: builtin/gc.c:904
+msgid "failed to prefetch remotes"
+msgstr "nie można pobrać zdalnych repozytoriów z wyprzedzeniem"
-#: builtin/gc.c:1037
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "nie można uruchomić procesu „git pack-objects”"
-#: builtin/gc.c:1054
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "nie można ukończyć procesu „git pack-objects”"
-#: builtin/gc.c:1106
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "nie można zapisać indeksu wielu paczek"
-#: builtin/gc.c:1124
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "„git multi-pack-index expire” nie powiodło się"
-#: builtin/gc.c:1185
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "„git multi-pack-index repack” nie powiodło się"
-#: builtin/gc.c:1194
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"pomijanie zadania przyrostowego przepakowania, bo core.multiPackIndex jest "
"wyłączone"
-#: builtin/gc.c:1298
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "istnieje plik blokady „%s”, pomijanie porządków"
-#: builtin/gc.c:1328
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "zadanie „%s” nie powiodło się"
-#: builtin/gc.c:1410
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "„%s” nie jest prawidłowym zadaniem"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "nie można wybrać wiele razy zadania „%s”"
-#: builtin/gc.c:1430
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "uruchamiaj zadania w oparciu o stan repozytorium"
-#: builtin/gc.c:1431
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "częstotliwość"
-#: builtin/gc.c:1432
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "uruchamiaj zadania w oparciu o częstotliwość"
-#: builtin/gc.c:1435
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr ""
"nie zgłaszaj postępu ani innych informacji na standardowe wyjście "
"diagnostyczne"
-#: builtin/gc.c:1436
+#: builtin/gc.c:1414
msgid "task"
msgstr "zadanie"
-#: builtin/gc.c:1437
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "uruchom konkretne zadanie"
-#: builtin/gc.c:1454
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto i --schedule=<frequency> się wykluczają"
-#: builtin/gc.c:1497
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "nie można wykonać „git config”"
-#: builtin/gc.c:1562
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "nie można rozwinąć ścieżki „%s”"
-#: builtin/gc.c:1591
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "nie można uruchomić launchctl"
-#: builtin/gc.c:1628
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "nie można utworzyć katalogów na „%s”"
-#: builtin/gc.c:1689
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "nie można wydostać usługi %s"
-#: builtin/gc.c:1760
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "nie można utworzyć tymczasowego pliku XML"
-#: builtin/gc.c:1850
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "nie można uruchomić schtasks"
-#: builtin/gc.c:1894
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "nie można wykonać „crontab -l”; ten system może nie wspierać crona"
-#: builtin/gc.c:1911
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "nie można wykonać „crontab”; ten system może nie wspierać crona"
-#: builtin/gc.c:1915
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "nie można otworzyć standardowego wejścia „crontab”"
-#: builtin/gc.c:1956
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "„crontab” padł"
-#: builtin/gc.c:1990
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "nie można uruchomić systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "nie można wykonać systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "nie można skasować „%s”"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nierozpoznany argument --scheduler „%s”"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "nie jest dostępny ani crontab, ani wyzwalacze systemd"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "planista %s nie jest dostępny"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "inny proces planuje porządki w tle"
-#: builtin/gc.c:2009
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planista>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planista"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planista do wyzwolenia sprzątania repozytorium"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "nie można dodać repozytorium do globalnej konfiguracji"
-#: builtin/gc.c:2019
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <pod-polecenie> [<opcje>]"
-#: builtin/gc.c:2038
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "nieprawidłowe pod-polecenie: %s"
@@ -15659,12 +16272,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcje>] [-e] <wzorzec> [<rewizja>...] [[--] <ścieżka>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: nie można utworzyć wątku: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
@@ -15673,262 +16286,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792
-#: builtin/pack-objects.c:2944
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "brak obsługi wątków, ignorowanie %s"
-#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "nie można odczytać drzewa (%s)"
-#: builtin/grep.c:656
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "nie można przeprowadzić grep z obiektu rodzaju %s"
-#: builtin/grep.c:737
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "przełącznik „%c” oczekuje wartości liczbowej"
-#: builtin/grep.c:836
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "wyszukaj w indeksie zamiast w drzewie roboczym"
-#: builtin/grep.c:838
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "znajdź w zawartości nie zarządzanej przez gita"
-#: builtin/grep.c:840
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "szukaj i w plikach śledzonych i nieśledzonych"
-#: builtin/grep.c:842
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "pomiń pliki wymienione w „.gitignore”"
-#: builtin/grep.c:844
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
-msgstr "wyszukaj rekurencyjnie w każdym pod-module"
+msgstr "wyszukaj rekurencyjnie w każdym podmodule"
-#: builtin/grep.c:847
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "pokaż niepasujące wiersze"
-#: builtin/grep.c:849
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "ignorowanie wielkości liter przy dopasowaniu"
-#: builtin/grep.c:851
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "dopasuj wzorce tylko na brzegach słów"
-#: builtin/grep.c:853
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "przetwarzaj pliki binarne jako tekst"
-#: builtin/grep.c:855
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "nie dopasowuj wzorców w plikach binarnych"
-#: builtin/grep.c:858
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "przetwarzaj pliki binarne filtrami textconv"
-#: builtin/grep.c:860
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "wyszukaj w pod-katalogach (domyślnie)"
-#: builtin/grep.c:862
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "zejdź o co najwyżej <głębokość> poziomów"
-#: builtin/grep.c:866
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "użyj rozszerzonych wyrażeń regularnych POSIX"
-#: builtin/grep.c:869
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "użyj podstawowych wyrażeń regularnych POSIX (domyślnie)"
-#: builtin/grep.c:872
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "interpretuj wzorce jako stałe łańcuchy"
-#: builtin/grep.c:875
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "użyj wyrażeń regularnych kompatybilnych z Perlem"
-#: builtin/grep.c:878
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "pokaż numery wierszy"
-#: builtin/grep.c:879
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "pokaż numer kolumny pierwszego dopasowania"
-#: builtin/grep.c:880
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "nie pokazuj nazw plików"
-#: builtin/grep.c:881
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "pokaż nazwy plików"
-#: builtin/grep.c:883
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "pokaż nazwy plików względem głównego katalogu"
-#: builtin/grep.c:885
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "pokazuj tylko nazwy plików zamiast pasujących wierszy"
-#: builtin/grep.c:887
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "zamiennik na --files-with-matches"
-#: builtin/grep.c:890
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "pokazuj tylko nazwy plików bez trafień"
-#: builtin/grep.c:892
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "wypisuj NUL po nazwach plików"
-#: builtin/grep.c:895
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "pokaż tylko pasujące fragmenty wiersza"
-#: builtin/grep.c:897
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "pokaż liczbę dopasowań zamiast pasujących wierszy"
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "podświetl dopasowania"
-#: builtin/grep.c:900
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "wypisz pusty wiersz pomiędzy dopasowaniami z różnych plików"
-#: builtin/grep.c:902
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr "pokaż nazwę pliku tylko raz nad dopasowaniami z jednego pliku"
-#: builtin/grep.c:905
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami i po nich"
-#: builtin/grep.c:908
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami"
-#: builtin/grep.c:910
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "pokaż <n> wierszy kontekstu po dopasowaniach"
-#: builtin/grep.c:912
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "użyj <n> wątków roboczych"
-#: builtin/grep.c:913
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "skrót na -C ILE"
-#: builtin/grep.c:916
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "pokaż wiersz z nazwą funkcji przed dopasowaniami"
-#: builtin/grep.c:918
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "pokaż okalającą funkcję"
-#: builtin/grep.c:921
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "wczytaj wzorce z pliku"
-#: builtin/grep.c:923
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "dopasuj <wzorzec>"
-#: builtin/grep.c:925
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "łącz wzorce podane przez -e"
-#: builtin/grep.c:937
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "zgłoś trafienie kodem wyjścia bez wypisywania"
-#: builtin/grep.c:939
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "pokaż tylko dopasowania z plików, które pasują do wszystkich wzorców"
-#: builtin/grep.c:942
+#: builtin/grep.c:957
msgid "pager"
msgstr "czytnik"
-#: builtin/grep.c:942
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "pokaż pasujące pliki w czytniku"
-#: builtin/grep.c:946
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "pozwól wykonać grep(1) (ignorowane w tej wersji)"
-#: builtin/grep.c:1012
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "nie podano wzorca"
-#: builtin/grep.c:1048
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index i --untracked wykluczają się z rewizjami"
-#: builtin/grep.c:1056
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "nie można rozwiązać rewizji: %s"
-#: builtin/grep.c:1086
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked niewspierane z --recurse-submodules"
-#: builtin/grep.c:1090
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "nieprawidłowe połączenie opcji, pomijanie --threads"
-#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "brak obsługi wątków, ignorowanie --threads"
-#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "podano nieprawidłową liczbę wątków (%d)"
-#: builtin/grep.c:1130
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager działa tylko w drzewie roboczym"
-#: builtin/grep.c:1156
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached i --untracked wykluczają się z --no-index"
-#: builtin/grep.c:1159
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked i --cached się wykluczają"
-#: builtin/grep.c:1165
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "Nie można użyć --[no-]exclude-standard do śledzonej zawartości"
-#: builtin/grep.c:1173
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "podano jednocześnie --cached i drzewa"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15936,97 +16549,109 @@
"git hash-object [-t <rodzaj>] [-w] [--path=<ścieżka> | --no-filters] [--"
"stdin] [--] <plik>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "rodzaj obiektu"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "zapisz obiekt do bazy danych obiektu"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "wczytaj obiekt ze standardowego wejścia"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "przechowaj plik jak jest, bez filtrów"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"skróć po prostu jakieś losowe śmieci, żeby utworzyć uszkodzone obiekty do "
"odpluskwiania Gita"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "przetwórz plik, jakby był z tej ścieżki"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "wypisz wszystkie dostępne polecenia"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "pomiń przewodniki"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "wypisz listę przydatnych podręczników"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "pokaż podręcznik użytkowania"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "pokaż podręcznik w przeglądarce"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "pokaż stronę podręcznika info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "wypisz opis polecenia"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<polecenie>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "wypisz listę przydatnych podręczników"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<polecenie>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nierozpoznany format pomocy „%s”"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Nie można uruchomić emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Nie można przetworzyć wersji emacsclienta."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "wersja emacsclienta „%d” za stara (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "nie można wykonać „%s”"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16035,7 +16660,7 @@
"„%s”: ścieżka do niewspieranego czytnika podręcznika.\n"
"Rozważ zamiast tego użycie „man.<narzędzie>.cmd”."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16044,35 +16669,39 @@
"„%s”: polecenie niewspieranego czytnika podręcznika.\n"
"Rozważ zamiast tego użycie „man.<narzędzie>.path”."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s”: nieznany czytnik podręcznika."
-#: builtin/help.c:453
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "żaden czytnik podręcznika nie obsłużył żądania"
-#: builtin/help.c:461
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "żaden czytnik podręcznika info nie obsłużył żądania"
-#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s” jest skrótem na „%s”"
-#: builtin/help.c:534 git.c:372
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "zły łańcuch alias.%s: %s"
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "ta opcja nie przyjmuje innych argumentów"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "użycie: %s%s"
-#: builtin/help.c:577
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "więcej informacji w „git help config”"
@@ -16111,7 +16740,7 @@
msgid "used more bytes than were available"
msgstr "użyto więcej bajtów niż było dostępnych"
-#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paczka za duża na obecną definicję off_t"
@@ -16119,53 +16748,43 @@
msgid "pack exceeds maximum allowed size"
msgstr "paczka przekracza maksymalny dozwolony rozmiar"
-#: builtin/index-pack.c:342
-#, c-format
-msgid "unable to create '%s'"
-msgstr "nie można utworzyć „%s”"
-
-#: builtin/index-pack.c:348
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "nie można otworzyć pliku paczki „%s”"
-
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "niezgodność podpisu paczki"
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "wersja paczki %<PRIu32> niewspierana"
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paczka ma zły obiekt na pozycji %<PRIuMAX>: %s"
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "dekompresja zwróciła %d"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "przepełnienie wartości przesunięcia dla obiektu podstawowego delty"
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "podstawowe przesunięcie delty jest poza zakresem"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "nieznany typ obiektu %d"
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "nie można wykonać pread na pliku paczki"
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16173,88 +16792,88 @@
msgstr[1] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
msgstr[2] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "poważna niespójność dekompresji"
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "ZNALEZIONO KOLIZJĘ SHA1 Z %s !"
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "nie można odczytać %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "nie można odczytać informacji istniejącego obiektu %s"
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "nie można odczytać istniejącego obiektu %s"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "nieprawidłowy obiekt blob %s"
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "błąd fsck w spakowanym obiekcie"
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nie wszystkie obiekty potomne %s są osiągalne"
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "nie można zastosować delty"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Pobieranie obiektów"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Indeksowanie obiektów"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paczka jest uszkodzona (różnica w SHA1)"
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "nie można wykonać fstat na pliku paczki"
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "paczka ma śmieci na końcu"
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "dezorientacja ponad szaleństwo w parse_pack_objects()"
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Rozwiązywanie delt"
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "nie można utworzyć wątku: %s"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "dezorientacja ponad szaleństwo"
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -16262,12 +16881,12 @@
msgstr[1] "wykonano z %d lokalnymi obiektami"
msgstr[2] "wykonano z %d lokalnymi obiektami"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Nieoczekiwana końcowa suma kontrolna %s (uszkodzenie dysku?)"
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -16275,63 +16894,56 @@
msgstr[1] "paczka ma %d nierozwiązane delty"
msgstr[2] "paczka ma %d nierozwiązanych delt"
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "nie można skompresować dodanego obiektu (%d)"
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalny obiekt %s jest uszkodzony"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "nazwa pliku paczki „%s” nie kończy się na „.%s”"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "nie można zapisać pliku %s „%s”"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "nie można zamknąć zapisanego pliku %s „%s”"
-#: builtin/index-pack.c:1503
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "nie można zmienić nazwy pliku tymczasowego „*.%s” na „%s”"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "błąd podczas zamykania pliku paczki"
-#: builtin/index-pack.c:1517
-msgid "cannot store pack file"
-msgstr "nie można zapisać pliku paczki"
-
-#: builtin/index-pack.c:1525
-msgid "cannot store index file"
-msgstr "nie można zapisać pliku indeksu"
-
-#: builtin/index-pack.c:1534
-msgid "cannot store reverse index file"
-msgstr "nie można zapisać pliku odwrotnego indeksu"
-
-#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "zła wartość pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Nie można otworzyć istniejącego pliku paczki „%s”"
-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Nie można otworzyć istniejącego pliku idx paczki dla „%s”"
-#: builtin/index-pack.c:1700
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -16339,7 +16951,7 @@
msgstr[1] "nie delta: %d obiekty"
msgstr[2] "nie delta: %d obiektów"
-#: builtin/index-pack.c:1707
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -16347,131 +16959,131 @@
msgstr[1] "długość łańcucha = %d: %lu obiekty"
msgstr[2] "długość łańcucha = %d: %lu obiektów"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Nie można wrócić do cwd"
-#: builtin/index-pack.c:1803 builtin/index-pack.c:1806
-#: builtin/index-pack.c:1822 builtin/index-pack.c:1826
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "błędny %s"
-#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "nieznany algorytm skrótu „%s”"
-#: builtin/index-pack.c:1851
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin i --stdin wykluczają się"
-#: builtin/index-pack.c:1853
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin wymaga repozytorium gita"
-#: builtin/index-pack.c:1855
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format i --stdin wykluczają się"
+msgstr "--object-format i --stdin się wykluczają"
-#: builtin/index-pack.c:1870
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify bez podanej nazwy pliku paczki"
-#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "błąd fsck w obiektach paczek"
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "nie można wykonać stat na szablonie „%s”"
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "nie można otworzyć katalogu „%s”"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "nie można wykonać readlink na „%s”"
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "nie można wykonać symlink na „%s” „%s”"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "nie można skopiować „%s” do „%s”"
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "pomijanie szablonu %s"
-#: builtin/init-db.c:124
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "nie znaleziono szablonów w %s"
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "nie kopiowanie szablonów z „%s”: %s"
-#: builtin/init-db.c:275
+#: builtin/init-db.c:263
#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "nieprawidłowa początkowa nazwa gałęzi: „%s”"
-#: builtin/init-db.c:367
+#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "nie można obsłużyć typu pliku %d"
-#: builtin/init-db.c:370
+#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "nie można przenieść %s do %s"
-#: builtin/init-db.c:386
+#: builtin/init-db.c:373
msgid "attempt to reinitialize repository with different hash"
msgstr "próba ponownego zainicjowania repozytorium innym skrótem"
-#: builtin/init-db.c:410 builtin/init-db.c:413
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s już istnieje"
-#: builtin/init-db.c:445
+#: builtin/init-db.c:432
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr "re-init: pominięto --initial-branch=%s"
-#: builtin/init-db.c:476
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Przeinicjowano istniejące współdzielone repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:477
+#: builtin/init-db.c:464
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Przeinicjowano istniejące repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:481
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Zainicjowano puste współdzielone repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:482
+#: builtin/init-db.c:469
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Zainicjowano puste repozytorium Gita w %s%s\n"
-#: builtin/init-db.c:531
+#: builtin/init-db.c:518
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -16479,42 +17091,42 @@
"git init [-q | --quiet] [--bare] [--template=<katalog-szablonu>] [--"
"shared[=<uprawnienia>]] [<katalog>]"
-#: builtin/init-db.c:557
+#: builtin/init-db.c:544
msgid "permissions"
msgstr "uprawnienia"
-#: builtin/init-db.c:558
+#: builtin/init-db.c:545
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"podaj, że repozytorium gita ma być współdzielone pomiędzy użytkownikami"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:551
msgid "override the name of the initial branch"
msgstr "wymuś nazwę początkowej gałęzi"
-#: builtin/init-db.c:565 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
msgstr "skrót"
-#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr "podaj algorytm skrótu do użycia"
-#: builtin/init-db.c:573
+#: builtin/init-db.c:560
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--separate-git-dir i --bare się wykluczają"
-#: builtin/init-db.c:602 builtin/init-db.c:607
+#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr "nie można utworzyć katalogu %s"
-#: builtin/init-db.c:611 builtin/init-db.c:666
+#: builtin/init-db.c:600 builtin/init-db.c:655
#, c-format
msgid "cannot chdir to %s"
msgstr "nie można wejść do %s"
-#: builtin/init-db.c:638
+#: builtin/init-db.c:627
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16523,12 +17135,12 @@
"%s (lub --work-tree=<katalog>) niedozwolone bez podania %s (lub --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:690
+#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Nie można dostać się do drzewa roboczego „%s”"
-#: builtin/init-db.c:695
+#: builtin/init-db.c:684
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir i suche repozytorium się wykluczają"
@@ -16580,17 +17192,13 @@
msgid "do not treat --- specially"
msgstr "nie traktuj specjalnie ---"
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "końcówka"
-
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "końcówka(-i) do dodania"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
-msgstr "--trailer i --only-input wykluczają się"
+msgstr "--trailer i --only-input się wykluczają"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
@@ -16641,85 +17249,85 @@
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<zakres>:<plik> i ścieżki się wykluczają"
-#: builtin/log.c:303
+#: builtin/log.c:306
#, c-format
msgid "Final output: %d %s\n"
msgstr "Ostateczne wyjście: %d %s\n"
-#: builtin/log.c:566
+#: builtin/log.c:571
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: zły plik"
-#: builtin/log.c:581 builtin/log.c:671
+#: builtin/log.c:586 builtin/log.c:676
#, c-format
msgid "could not read object %s"
msgstr "nie można odczytać obiektu %s"
-#: builtin/log.c:696
+#: builtin/log.c:701
#, c-format
msgid "unknown type: %d"
msgstr "nieznany rodzaj: %d"
-#: builtin/log.c:841
+#: builtin/log.c:846
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: nieprawidłowy tryb listu motywacyjnego z opisu"
-#: builtin/log.c:848
+#: builtin/log.c:853
msgid "format.headers without value"
msgstr "format.headers bez wartości"
-#: builtin/log.c:977
+#: builtin/log.c:982
#, c-format
msgid "cannot open patch file %s"
msgstr "nie można otworzyć pliku łatki %s"
-#: builtin/log.c:994
+#: builtin/log.c:999
msgid "need exactly one range"
msgstr "potrzeba dokładnie jednego zakresu"
-#: builtin/log.c:1004
+#: builtin/log.c:1009
msgid "not a range"
msgstr "to nie jest zakres"
-#: builtin/log.c:1168
+#: builtin/log.c:1173
msgid "cover letter needs email format"
msgstr "list motywacyjny wymaga formatu e-mail"
-#: builtin/log.c:1174
+#: builtin/log.c:1179
msgid "failed to create cover-letter file"
msgstr "nie można utworzyć pliku z listem motywacyjnym"
-#: builtin/log.c:1261
+#: builtin/log.c:1266
#, c-format
msgid "insane in-reply-to: %s"
msgstr "szalone in-reply-to: %s"
-#: builtin/log.c:1288
+#: builtin/log.c:1293
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcje>] [<od-kiedy> | <zakres-rewizji>]"
-#: builtin/log.c:1346
+#: builtin/log.c:1351
msgid "two output directories?"
msgstr "dwa katalogi wyjściowe?"
-#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
#, c-format
msgid "unknown commit %s"
msgstr "nieznany zapis %s"
-#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "nie można rozwiązać „%s” jako prawidłowej referencji"
-#: builtin/log.c:1517
+#: builtin/log.c:1522
msgid "could not find exact merge base"
msgstr "nie znaleziono dokładnej podstawy scalania"
-#: builtin/log.c:1527
+#: builtin/log.c:1532
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -16730,288 +17338,292 @@
"zdalną gałąź.\n"
"Albo możesz podać zapis podstawy ręcznie przez --base=<id-zapisu-podstawy>"
-#: builtin/log.c:1550
+#: builtin/log.c:1555
msgid "failed to find exact merge base"
msgstr "nie znaleziono dokładnej podstawy scalania"
-#: builtin/log.c:1567
+#: builtin/log.c:1572
msgid "base commit should be the ancestor of revision list"
msgstr "podstawowy zapis powinien być przodkiem listy rewizji"
-#: builtin/log.c:1577
+#: builtin/log.c:1582
msgid "base commit shouldn't be in revision list"
msgstr "podstawowy zapis nie powinien być na liście rewizji"
-#: builtin/log.c:1635
+#: builtin/log.c:1640
msgid "cannot get patch id"
msgstr "nie można uzyskać identyfikatora łatki"
-#: builtin/log.c:1692
+#: builtin/log.c:1703
msgid "failed to infer range-diff origin of current series"
msgstr "nie można wywnioskować źródła różnic zakresów z bieżącej serii"
-#: builtin/log.c:1694
+#: builtin/log.c:1705
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "użycie „%s” jako źródła różnic zakresów z bieżącej serii"
-#: builtin/log.c:1738
+#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
msgstr "użyj [PATCH n/m] nawet przy pojedynczej łatce"
-#: builtin/log.c:1741
+#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
msgstr "użyj [PATCH] nawet przy wielu łatkach"
-#: builtin/log.c:1745
+#: builtin/log.c:1756
msgid "print patches to standard out"
msgstr "wypisz łatki na standardowe wyjście"
-#: builtin/log.c:1747
+#: builtin/log.c:1758
msgid "generate a cover letter"
msgstr "wygeneruj list motywacyjny"
-#: builtin/log.c:1749
+#: builtin/log.c:1760
msgid "use simple number sequence for output file names"
msgstr "użyj tylko numerów w nazwach wynikowych plików"
-#: builtin/log.c:1750
+#: builtin/log.c:1761
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1751
+#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
msgstr "użyj <sfx> zamiast „.patch”"
-#: builtin/log.c:1753
+#: builtin/log.c:1764
msgid "start numbering patches at <n> instead of 1"
msgstr "zacznij numerować łatki od <n> zamiast od 1"
-#: builtin/log.c:1755
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "liczba-podejść"
+
+#: builtin/log.c:1766
msgid "mark the series as Nth re-roll"
msgstr "oznacz serię jako N-te podejście"
-#: builtin/log.c:1757
+#: builtin/log.c:1768
msgid "max length of output filename"
msgstr "maksymalna długość nazwy wynikowego pliku"
-#: builtin/log.c:1759
+#: builtin/log.c:1770
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "użyj [RFC PATCH] zamiast [PATCH]"
-#: builtin/log.c:1762
+#: builtin/log.c:1773
msgid "cover-from-description-mode"
msgstr "tryb-listu-z-opisu"
-#: builtin/log.c:1763
+#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr "wygeneruj części listu motywacyjnego w oparciu o opis gałęzi"
-#: builtin/log.c:1765
+#: builtin/log.c:1776
msgid "use [<prefix>] instead of [PATCH]"
msgstr "użyj [<prefiksu>] zamiast [PATCH]"
-#: builtin/log.c:1768
+#: builtin/log.c:1779
msgid "store resulting files in <dir>"
msgstr "zachowaj wynikowe pliki w <katalogu>"
-#: builtin/log.c:1771
+#: builtin/log.c:1782
msgid "don't strip/add [PATCH]"
msgstr "nie usuwaj/nie dodawaj [PATCH]"
-#: builtin/log.c:1774
+#: builtin/log.c:1785
msgid "don't output binary diffs"
msgstr "nie wypisuj binarnych różnic"
-#: builtin/log.c:1776
+#: builtin/log.c:1787
msgid "output all-zero hash in From header"
msgstr "wypisz skrót z samych zer w nagłówku Od"
-#: builtin/log.c:1778
+#: builtin/log.c:1789
msgid "don't include a patch matching a commit upstream"
msgstr "nie uwzględniaj łatki pasującej do już istniejącego zapisu"
-#: builtin/log.c:1780
+#: builtin/log.c:1791
msgid "show patch format instead of default (patch + stat)"
msgstr "pokaż format łatki zamiast domyślnego (łatka + statystyki)"
-#: builtin/log.c:1782
+#: builtin/log.c:1793
msgid "Messaging"
msgstr "Wiadomości"
-#: builtin/log.c:1783
+#: builtin/log.c:1794
msgid "header"
msgstr "nagłówek"
-#: builtin/log.c:1784
+#: builtin/log.c:1795
msgid "add email header"
msgstr "dodaj nagłówek e-maila"
-#: builtin/log.c:1785 builtin/log.c:1786
+#: builtin/log.c:1796 builtin/log.c:1797
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1785
+#: builtin/log.c:1796
msgid "add To: header"
msgstr "dodaj pole Do:"
-#: builtin/log.c:1786
+#: builtin/log.c:1797
msgid "add Cc: header"
msgstr "dodaj pole DW:"
-#: builtin/log.c:1787
+#: builtin/log.c:1798
msgid "ident"
msgstr "tożsamość"
-#: builtin/log.c:1788
+#: builtin/log.c:1799
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"ustaw adres Od na <tożsamość> (lub tożsamość składającego, jeśli nie podano)"
-#: builtin/log.c:1790
+#: builtin/log.c:1801
msgid "message-id"
msgstr "id-wiadomości"
-#: builtin/log.c:1791
+#: builtin/log.c:1802
msgid "make first mail a reply to <message-id>"
msgstr "niech pierwszy list będzie odpowiedzią na <id-wiadomości>"
-#: builtin/log.c:1792 builtin/log.c:1795
+#: builtin/log.c:1803 builtin/log.c:1806
msgid "boundary"
msgstr "granica/boundary"
-#: builtin/log.c:1793
+#: builtin/log.c:1804
msgid "attach the patch"
msgstr "załącz łatkę"
-#: builtin/log.c:1796
+#: builtin/log.c:1807
msgid "inline the patch"
msgstr "umieść łatkę w treści"
-#: builtin/log.c:1800
+#: builtin/log.c:1811
msgid "enable message threading, styles: shallow, deep"
msgstr "zezwól na wątkowanie komunikatów, style: shallow, deep"
-#: builtin/log.c:1802
+#: builtin/log.c:1813
msgid "signature"
msgstr "podpis"
-#: builtin/log.c:1803
+#: builtin/log.c:1814
msgid "add a signature"
msgstr "dodaj podpis"
-#: builtin/log.c:1804
+#: builtin/log.c:1815
msgid "base-commit"
msgstr "zapis-podstawy"
-#: builtin/log.c:1805
+#: builtin/log.c:1816
msgid "add prerequisite tree info to the patch series"
msgstr "dodaj informacje o wymaganym początkowym drzewie do serii łatek"
-#: builtin/log.c:1808
+#: builtin/log.c:1819
msgid "add a signature from a file"
msgstr "dodaj podpis z pliku"
-#: builtin/log.c:1809
+#: builtin/log.c:1820
msgid "don't print the patch filenames"
msgstr "nie wypisuj nazw plików łatek"
-#: builtin/log.c:1811
+#: builtin/log.c:1822
msgid "show progress while generating patches"
msgstr "pokaż postęp podczas generowania łatek"
-#: builtin/log.c:1813
+#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"pokaż zmiany względem <rewizji> w liście motywacyjnym lub pojedynczej łatce"
-#: builtin/log.c:1816
+#: builtin/log.c:1827
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"pokaż zmiany względem <referencji> w liście motywacyjnym lub pojedynczej "
"łatce"
-#: builtin/log.c:1818
+#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "procent, według jakiego ważone jest tworzenie"
-#: builtin/log.c:1904
+#: builtin/log.c:1916
#, c-format
msgid "invalid ident line: %s"
msgstr "błędny wiersz tożsamości: %s"
-#: builtin/log.c:1919
+#: builtin/log.c:1931
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k się wykluczają"
-#: builtin/log.c:1921
+#: builtin/log.c:1933
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k się wykluczają"
-#: builtin/log.c:1929
+#: builtin/log.c:1941
msgid "--name-only does not make sense"
msgstr "--name-only nie ma sensu"
-#: builtin/log.c:1931
+#: builtin/log.c:1943
msgid "--name-status does not make sense"
msgstr "--name-status nie ma sensu"
-#: builtin/log.c:1933
+#: builtin/log.c:1945
msgid "--check does not make sense"
msgstr "--check nie ma sensu"
-#: builtin/log.c:1955
+#: builtin/log.c:1967
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr "--stdout, --output i --output-directory się wykluczają"
-#: builtin/log.c:2078
+#: builtin/log.c:2089
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff wymaga --cover-letter lub pojedynczej łatki"
-#: builtin/log.c:2082
+#: builtin/log.c:2093
msgid "Interdiff:"
msgstr "Różnice w różnicach:"
-#: builtin/log.c:2083
+#: builtin/log.c:2094
#, c-format
msgid "Interdiff against v%d:"
msgstr "Różnice w różnicach względem v%d:"
-#: builtin/log.c:2089
+#: builtin/log.c:2100
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor wymaga --range-diff"
-#: builtin/log.c:2093
+#: builtin/log.c:2104
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff wymaga --cover-letter lub pojedynczej łatki"
-#: builtin/log.c:2101
+#: builtin/log.c:2112
msgid "Range-diff:"
msgstr "Różnice zakresów:"
-#: builtin/log.c:2102
+#: builtin/log.c:2113
#, c-format
msgid "Range-diff against v%d:"
msgstr "Różnice zakresów względem v%d:"
-#: builtin/log.c:2113
+#: builtin/log.c:2124
#, c-format
msgid "unable to read signature file '%s'"
msgstr "nie można odczytać pliku podpisu „%s”"
-#: builtin/log.c:2149
+#: builtin/log.c:2160
msgid "Generating patches"
msgstr "Generowanie łatek"
-#: builtin/log.c:2193
+#: builtin/log.c:2204
msgid "failed to create output files"
msgstr "nie można utworzyć plików wyjściowych"
-#: builtin/log.c:2252
+#: builtin/log.c:2263
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<nadrzędna> [<czoło> [<limit>]]]"
-#: builtin/log.c:2306
+#: builtin/log.c:2317
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17019,130 +17631,134 @@
"Nie znaleziono śledzonej zdalnej gałęzi, podaj ręcznie <zdalne-"
"repozytorium>.\n"
-#: builtin/ls-files.c:486
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcje>] [<plik>...]"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rozdziel ścieżki znakiem NUL"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "opisz stan pliku tagami"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "użyj małych liter do plików o „założonej niezmienności”"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "użyj małych liter do plików „prawidłowo monitorowanych”"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "pokaż w wyjściu zapamiętane pliki (domyślnie)"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "pokaż w wyjściu usunięte pliki"
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "pokaż w wyjściu zmienione pliki"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "pokazuj pliki innego typu w wyjściu"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "pokaż w wyjściu ignorowane pliki"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "pokaż w wyjściu nazwę obiektu przygotowanej zawartości"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "pokaż pliki w systemie plików, które należy skasować"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "pokaż tylko nazwy nieśledzonych katalogów"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "pokaż zakończenia wierszy w plikach"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "nie pokazuj pustych katalogów"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "pokaż niescalone pliki w wyjściu"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "pokaż informacje o resolve-undo"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "pomiń pliki spełniające kryteria"
-#: builtin/ls-files.c:577
-msgid "exclude patterns are read from <file>"
-msgstr "wzorce wyłączające czytane są z <pliku>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "wczytaj wzorce wyłączeń z <pliku>"
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"odczytaj dodatkowe wzorce wyłączające z poszczególnych katalogów w <pliku>"
-#: builtin/ls-files.c:582
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "dodaj standardowe wyjątki gita"
-#: builtin/ls-files.c:586
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "podawaj wyjście względem głównego katalogu projektu"
-#: builtin/ls-files.c:589
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
-#: builtin/ls-files.c:591
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "jeśli którykolwiek <plik> nie jest w indeksie, potraktuj to jako błąd"
-#: builtin/ls-files.c:592
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "drzewo"
-#: builtin/ls-files.c:593
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "udawaj, że ścieżki usunięte po <drzewie> są nadal obecne"
-#: builtin/ls-files.c:595
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "pokaż dane diagnostyczne"
-#: builtin/ls-files.c:597
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "ukryj podwójne wpisy"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<program>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repozytorium> [<referencje>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repozytorium> [<referencje>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "nie wyświetlaj adresu repozytorium"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "program"
@@ -17184,7 +17800,7 @@
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
@@ -17210,7 +17826,56 @@
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "wypisz całe drzewo; nie tylko bieżący katalog (zakłada --full-name)"
-#: builtin/mailsplit.c:241
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opcje>] <komunikat> <łatka> < list >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "zachowaj temat"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "zachowaj w temacie nawiasy oprócz PATCH"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "skopiuj ID listu (Message-ID) z końcówki komunikatu zapisu"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "przekoduj metadane na i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "wyłącz przekodowywanie zestawów znaków w metadanych"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "kodowanie"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "przekoduj metadane na to kodowanie"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "użyj nożyczek"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<działanie>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "działanie po znalezieniu cytowanego powrotu karetki (CRa)"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "użyj nagłówków w treści listu"
+
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "pusta skrzynka mbox: „%s”"
@@ -17327,191 +17992,183 @@
msgid "Merging %s with %s\n"
msgstr "Scalanie %s z %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcje>] [<zapis>...]"
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "przełącznik „m” wymaga wartości"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "opcja „%s” wymaga wartości"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Nie znaleziono strategii scalania „%s”.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Dostępne strategie:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Dostępne niestandardowe strategie:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "nie pokazuj statystyk różnic pod koniec scalenia"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "pokaż statystyki różnic pod koniec scalenia"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonim do --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"dodaj (co najwyżej <n>) wpisy z krótkiego dziennika do komunikatu zapisu "
"scalenia"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "utwórz pojedynczy zapis zamiast scalać"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "złóż zapis, jeśli scalenie się powiedzie (domyślnie)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "edytuj komunikat przed złożeniem"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "zezwól na przewijanie (domyślne)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "przerwij, jeśli przewinięcie nie jest możliwe"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "zweryfikuj, czy podany zapis ma prawidłowy podpis GPG"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategia"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "strategia scalania"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "opcja=wartość"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "opcja wybranej strategii scalania"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "komunikat zapisu scalenia (do nieprzewiniętego scalenia)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "przerwij bieżące trwające scalanie"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "jak --abort, ale zostaw w spokoju indeks i drzewo robocze"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "kontynuuj bieżące trwające scalanie"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "zezwól na scalenie niepowiązanych historii"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "omiń skrypty pre-merge-commit i commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "nie można wykonać dodania do schowka."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "dodanie zmian do schowka nie powiodło się"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "nieprawidłowy obiekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree nie powiodło się"
-#: builtin/merge.c:399
-msgid " (nothing to squash)"
-msgstr " (nic do spłaszczenia)"
+#: builtin/merge.c:401
+msgid "Already up to date. (nothing to squash)"
+msgstr "Już aktualne. (nic do spłaszczenia)"
-#: builtin/merge.c:410
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Spłaszczony zapis — nie aktualizowanie HEAD\n"
-#: builtin/merge.c:460
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Brak komunikatu scalenia — nie aktualizowanie HEAD\n"
-#: builtin/merge.c:511
+#: builtin/merge.c:515
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s” nie wskazuje na zapis"
-#: builtin/merge.c:598
+#: builtin/merge.c:603
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Zły łańcuch branch.%s.mergeoptions: %s"
-#: builtin/merge.c:724
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Nie rozpatrywanie niczego poza scalaniem dwóch czół."
-#: builtin/merge.c:737
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Nieznana opcja merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "nieznana opcja strategii: -X%s"
-#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "nie można zapisać %s"
-#: builtin/merge.c:808
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Nie można odczytać „%s”"
-#: builtin/merge.c:817
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Nie składanie scalenia; użyj „git commit”, aby ukończyć scalanie.\n"
-#: builtin/merge.c:823
+#: builtin/merge.c:829
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"
@@ -17521,11 +18178,11 @@
"zwłaszcza jeśli scala zaktualizowaną gałąź nadrzędną z gałęzią tematyczną.\n"
"\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Pusty komunikat przerywa zapis.\n"
-#: builtin/merge.c:831
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17534,73 +18191,73 @@
"Wiersze zaczynające się od „%c” będą ignorowane, a pusty komunikat\n"
"przerwie zapis.\n"
-#: builtin/merge.c:884
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Pusty komunikat zapisu."
-#: builtin/merge.c:899
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Wspaniale.\n"
-#: builtin/merge.c:960
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatyczne scalanie nie powiodło się; napraw konflikty i złóż wynik.\n"
-#: builtin/merge.c:999
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Nie ma bieżącej gałęzi."
-#: builtin/merge.c:1001
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Bieżąca gałąź nie ma zdalnego repozytorium."
-#: builtin/merge.c:1003
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Nie zdefiniowano gałęzi nadrzędnej wobec bieżącej."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Brak gałęzi śledzącej dla %s z %s"
-#: builtin/merge.c:1065
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Błędna wartość „%s” w środowisku „%s”"
-#: builtin/merge.c:1168
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "to nie jest coś, co można scalić w %s: %s"
-#: builtin/merge.c:1202
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "to nie jest coś, co można scalić"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort nie przyjmuje argumentów"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Nie ma scalenia, które można by przerwać (brak MERGE_HEAD)."
-#: builtin/merge.c:1334
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit nie przyjmuje argumentów"
-#: builtin/merge.c:1347
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue nie przyjmuje argumentów"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Nie trwa żadne scalenie (brak MERGE_HEAD)."
-#: builtin/merge.c:1367
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17608,7 +18265,7 @@
"Nie zwieńczono scalania (MERGE_HEAD istnieje).\n"
"Złóż swoje zmiany przed scaleniem."
-#: builtin/merge.c:1374
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17616,96 +18273,84 @@
"Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje).\n"
"Złóż swoje zmiany przed scaleniem."
-#: builtin/merge.c:1377
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje)."
-#: builtin/merge.c:1391
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash i --no-ff się wykluczają."
-#: builtin/merge.c:1393
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "--squash i --commit się wykluczają."
-#: builtin/merge.c:1409
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nie podano zapisu, a nie ustawiono merge.defaultToUpstream."
-#: builtin/merge.c:1426
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Spłaszczenie zapisu w puste czoło nie jest jeszcze wspierane"
-#: builtin/merge.c:1428
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Nieprzewinięty zapis nie ma sensu przy pustym czele (HEAD) gałęzi"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s — nie jest czymś, co możemy scalić"
-#: builtin/merge.c:1435
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Można scalić tylko dokładnie jeden zapis w puste czoło"
-#: builtin/merge.c:1516
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "odmawiam scalenia niepowiązanych historii"
-#: builtin/merge.c:1525
-msgid "Already up to date."
-msgstr "Już aktualne."
-
-#: builtin/merge.c:1535
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualizowanie %s..%s\n"
-#: builtin/merge.c:1581
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Próba naprawdę trywialnego scalenia w indeksie...\n"
-#: builtin/merge.c:1588
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "O nie.\n"
-#: builtin/merge.c:1613
-msgid "Already up to date. Yeeah!"
-msgstr "Już aktualne. Hurra!"
-
-#: builtin/merge.c:1619
-msgid "Not possible to fast-forward, aborting."
-msgstr "Nie da się przewinąć, przerywanie."
-
-#: builtin/merge.c:1647 builtin/merge.c:1712
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Cofanie drzewa do nieskalanego stanu...\n"
-#: builtin/merge.c:1651
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Próba strategii scalania %s...\n"
-#: builtin/merge.c:1703
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Żadna strategia scalania nie podołała temu scalaniu.\n"
-#: builtin/merge.c:1705
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Scalanie ze strategią %s nie powiodło się.\n"
-#: builtin/merge.c:1714
+#: builtin/merge.c:1732
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Użycie %s, żeby przygotować ręczne rozwiązywanie.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Użycie strategii %s, żeby przygotować ręczne rozwiązywanie.\n"
-#: builtin/merge.c:1728
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -17716,41 +18361,41 @@
msgid "git mktag"
msgstr "git mktag"
-#: builtin/mktag.c:30
+#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
msgstr "ostrzeżenie: wejście tagu nie przechodzi sprawdzenia fsck: %s"
-#: builtin/mktag.c:41
+#: builtin/mktag.c:38
#, c-format
msgid "error: tag input does not pass fsck: %s"
msgstr "błąd: wejście tagu nie przechodzi sprawdzenia fsck: %s"
-#: builtin/mktag.c:44
+#: builtin/mktag.c:41
#, c-format
msgid "%d (FSCK_IGNORE?) should never trigger this callback"
msgstr "%d (FSCK_IGNORE?) nie powinno nigdy wyzwolić tej funkcji zwrotnej"
-#: builtin/mktag.c:59
+#: builtin/mktag.c:56
#, c-format
msgid "could not read tagged object '%s'"
msgstr "nie można odczytać otagowanego obiektu „%s”"
-#: builtin/mktag.c:62
+#: builtin/mktag.c:59
#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "obiekt „%s” otagowany jako „%s”, ale jest rodzaju „%s”"
-#: builtin/mktag.c:99
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
"tag na standardowym wejściu nie przeszedł naszego ścisłego sprawdzenia fsck"
-#: builtin/mktag.c:102
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "tag na standardowym wejściu nie odnosił się do prawidłowego obiektu"
-#: builtin/mktag.c:105 builtin/tag.c:232
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "nie można zapisać pliku tagu"
@@ -17770,19 +18415,51 @@
msgid "allow creation of more than one tree"
msgstr "pozwól na tworzenie więcej niż jednego drzewa"
-#: builtin/multi-pack-index.c:9
+#: builtin/multi-pack-index.c:10
msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
msgstr ""
-"git multi-pack-index [<opcje>] (write|verify|expire|repack --batch-"
-"size=<rozmiar>)"
+"git multi-pack-index [<opcje>] write [--preferred-pack=<paczka>][--refs-"
+"snapshot=<ścieżka>]"
-#: builtin/multi-pack-index.c:26
+#: builtin/multi-pack-index.c:14
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opcje>] verify"
+
+#: builtin/multi-pack-index.c:17
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opcje>] expire"
+
+#: builtin/multi-pack-index.c:20
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opcje>] repack [--batch-size=<rozmiar>]"
+
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "katalog obiektu ze zbiorem par pliku paczki i indeksu paczki"
-#: builtin/multi-pack-index.c:29
+#: builtin/multi-pack-index.c:98
+msgid "preferred-pack"
+msgstr "preferowana-paczka"
+
+#: builtin/multi-pack-index.c:99
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "paczka do ponownego użycia przy obliczaniu bitmapy wielu paczek"
+
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "zapisz bitmapę wielu paczek"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "zapisz indeks wielu paczek tylko z podanymi indeksami"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "obraz referencji do zaznaczania zapisów bitmapy"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -17790,22 +18467,6 @@
"podczas przepakowania zbierz pliki paczek mniejszego rozmiaru w porcję "
"większą niż ten rozmiar"
-#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431
-#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598
-#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963
-#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575
-msgid "too many arguments"
-msgstr "za dużo argumentów"
-
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "opcja --batch-size jest tylko do pod-polecenia „repack”"
-
-#: builtin/multi-pack-index.c:69
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "nieznane pod-polecenie: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opcje>] <źródło>... <cel>"
@@ -17813,7 +18474,7 @@
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "Katalog %s jest w indeksie i brak pod-modułu?"
+msgstr "Katalog %s jest w indeksie i brak podmodułu?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
@@ -17833,72 +18494,72 @@
msgid "skip move/rename errors"
msgstr "pomiń błędy przenoszenia/zmiany nazwy"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "cel „%s” nie jest katalogiem"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Sprawdzanie zmiany nazwy „%s” na „%s”\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "złe źródło"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "nie można przenieść katalogu do niego samego"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "nie można przesunąć katalogu na plik"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "katalog źródłowy jest pusty"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "nie podlega kontroli wersji"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "skonfliktowane"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "cel istnieje"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "nadpisywanie „%s”"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Nie można nadpisać"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "wiele źródeł do tego samego celu"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "katalog docelowy nie istnieje"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, źródło=%s, cel=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Zmiana nazwy z %s na %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "nie można zmienić nazwy „%s”"
@@ -18076,47 +18737,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "nie można ukończyć „show” na obiekcie „%s”"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "należy podać zawartość notatki przy użyciu opcji -m lub -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "nie można zapisać obiektu uwagi"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "pozostawiono zawartość uwagi w %s"
-#: builtin/notes.c:242 builtin/tag.c:565
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "nie można otworzyć lub odczytać „%s”"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "nie można rozwiązać „%s” jako prawidłowej referencji."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "nie można odczytać obiektu „%s”."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "nie można odczytać danych uwagi z obiektu „%s” niebędącego blobem."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "uszkodzony wiersz wejścia: „%s”."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "nie można skopiować uwag z „%s” do „%s”"
@@ -18124,41 +18785,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "notes %s: odmawiam wykonania w %s (poza refs/notes/)"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
+msgid "too many arguments"
+msgstr "za dużo argumentów"
+
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "brak uwag do obiektu %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "zawartość uwagi jako łańcuch"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "zawartość uwag w pliku"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "użyj ponownie i edytuj podany obiekt uwagi"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "odrzuć podany obiekt węzła"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "pozwól zachować pustą uwagę"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "zastąp istniejące uwagi"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18167,29 +18835,29 @@
"Nie można dodać uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-f”, "
"aby nadpisać istniejące uwagi"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Nadpisywanie istniejących uwag do obiektu %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Usuwanie uwagi do obiektu %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "wczytaj obiekty ze standardowego wejścia"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "wczytaj ustawienia przepisywania dla <polecenia> (zakłada --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "za mało argumentów"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18198,12 +18866,12 @@
"Nie można skopiować uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-"
"f”, aby nadpisać istniejące uwagi"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "brakuje uwag do obiektu źródłowego %s. Nie można skopiować."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18212,52 +18880,52 @@
"Opcje -m/-F/-c/-C są przestarzałe w pod-poleceniu „edit”.\n"
"użyj zamiast tego „git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "nie można usunąć referencji NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "nie można usunąć referencji NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "nie można usunąć drzewa roboczego „git notes merge”"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "nie można odczytać referencji NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "nie znaleziono zapisu z NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "nie można przetworzyć zapisu z NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "nie można rozwiązać NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "nie można zwieńczyć scalenia uwag"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "nieznana strategia scalenia uwag %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Opcje ogólne"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Opcje scalania"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18265,46 +18933,46 @@
"rozwiąż konflikty uwag używając podanej strategii (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Składanie niescalonych uwag"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "zwieńcz scalenie uwag składając niescalone uwagi"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Przerywanie rozwiązania scalenia uwag"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "przerwij scalanie uwag"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort i -s/--strategy wykluczają się"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "należy podać referencję uwag do scalenia"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "nieznana wartość -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "scalenie uwag do %s już trwa w %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "nie można zapisać dowiązania do bieżącej referencji uwag (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18315,60 +18983,60 @@
"wynik przez „git notes merge --commit”, lub przerwij scalanie przez „git "
"notes merge --abort”.\n"
-#: builtin/notes.c:897 builtin/tag.c:578
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Nie można rozwiązać „%s” jako prawidłowej referencji."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Obiekt %s nie ma uwag\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "próba usunięcia nieistniejącej uwagi nie jest błędem"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "odczytaj nazwy obiektów ze standardowego wejścia"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "nie usuwaj, tylko pokaż"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "zgłaszaj przycięte uwagi"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "ref-uwagi"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "użyj uwag z <referencja-uwagi>"
-#: builtin/notes.c:1034 builtin/stash.c:1671
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "nieznana podkomenda: %s"
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcje>...] [< <lista-referencji> | < <lista-"
"obiektów>]"
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcje>...] <baza> [< <lista-referencji> | < <lista-"
"obiektów>]"
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18377,107 +19045,111 @@
"write_reuse_object: nie odnaleziono %s, oczekiwano na pozycji %<PRIuMAX> w "
"paczce %s"
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
#, c-format
msgid "bad packed object CRC for %s"
msgstr "zły CRC spakowanego obiektu dla %s"
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
#, c-format
msgid "corrupt packed object for %s"
msgstr "uszkodzony spakowany obiekt dla %s"
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
#, c-format
msgid "recursive delta detected for object %s"
msgstr "wykryto rekurencyjną deltę dla obiektu %s"
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "zamówiono %u obiektów, oczekiwano %<PRIu32>"
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "oczekiwano obiektu na pozycji %<PRIuMAX> w paczce %s"
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"wyłączone zapisywanie bitmapy, paczki są dzielone według pack.packSizeLimit"
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Zapisywanie obiektów"
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "nie można wykonać stat na „%s”"
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "nie można zapisać indeksu bitmapy"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "wypisano %<PRIu32> obiektów, a oczekiwano %<PRIu32>"
-#: builtin/pack-objects.c:1358
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "wyłączanie zapisywania bitmapy, niektóre obiekty nie są pakowane"
-#: builtin/pack-objects.c:1806
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "przepełnienie podstawowego przesunięcia delty w paczce w %s"
-#: builtin/pack-objects.c:1815
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "podstawowe przesunięcie delty poza zakresem w %s"
-#: builtin/pack-objects.c:2096
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Zliczanie obiektów"
-#: builtin/pack-objects.c:2241
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "nie można przetworzyć nagłówka obiektu %s"
-#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "nie można odczytać obiektu %s"
-#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "niespójna długość obiektu %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2351
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "nieoptymalna paczka — brak pamięci"
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Kompresja delt z użyciem do %d wątków"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "nie można spakować obiektów osiągalnych z tagu %s"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Kompresowanie obiektów"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "niespójność z liczbą delt"
-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18486,14 +19158,25 @@
"wartość uploadpack.blobpackfileuri musi być postaci „<skrót-obiektu> <skrót-"
"paczki> <uri>” (otrzymano „%s”)"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
"już ustawiono obiekt w innym uploadpack.blobpackfileuri (otrzymano „%s”)"
-#: builtin/pack-objects.c:3008
+#: builtin/pack-objects.c:3212
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "nie można uzyskać rodzaju obiektu %s w paczce %s"
+
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "nie znaleziono paczki „%s”"
+
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18502,7 +19185,7 @@
"oczekiwano identyfikatora obiektu krawędzi, otrzymano śmieci:\n"
"%s"
-#: builtin/pack-objects.c:3014
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18511,235 +19194,247 @@
"oczekiwano identyfikatora obiektu, otrzymano śmieci:\n"
"%s"
-#: builtin/pack-objects.c:3112
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "nieprawidłowa wartość --missing"
-#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "nie można otworzyć indeksu paczki"
-#: builtin/pack-objects.c:3202
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "nie można przebadać wolnego obiektu w %s"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "nie można wymusić wolnego obiektu"
-#: builtin/pack-objects.c:3380
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "nie jest rewizją „%s”"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "zła rewizja „%s”"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "nie można dodać ostatnich obiektów"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "nieobsługiwana wersja indeksu %s"
-#: builtin/pack-objects.c:3465
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "zła wersja indeksu „%s”"
-#: builtin/pack-objects.c:3503
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<wersja>[,<pozycja>]"
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "zapisz plik indeksu paczek w podanej wersji formatu indeksu"
-#: builtin/pack-objects.c:3507
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "maksymalny rozmiar pojedynczego wyjściowego pliku paczki"
-#: builtin/pack-objects.c:3509
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "pomiń pożyczone obiekty z alternatywnych zbiorów obiektów"
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignoruj spakowane obiekty"
-#: builtin/pack-objects.c:3513
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "ogranicz okno paczki w obiektach"
-#: builtin/pack-objects.c:3515
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "ogranicz okno paczki w pamięci oprócz limitu w obiektach"
-#: builtin/pack-objects.c:3517
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maksymalna długość łańcucha delt dopuszczona w wynikowej paczce"
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "użyj ponownie istniejących delt"
-#: builtin/pack-objects.c:3521
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "użyj ponownie istniejących obiektów"
-#: builtin/pack-objects.c:3523
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "użyj obiektów OFS_DELTA"
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "użyj wątków przy wyszukiwaniu najlepiej dopasowanych delt"
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "nie można utworzyć pustej paczki na wyjściu"
-#: builtin/pack-objects.c:3529
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "odczytaj argumenty rewizji ze standardowego wejścia"
-#: builtin/pack-objects.c:3531
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "ogranicz obiekty do jeszcze nie spakowanych"
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "uwzględnij obiekty osiągalne z dowolnej referencji"
-#: builtin/pack-objects.c:3537
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "uwzględnij obiekty z odniesieniami z wpisów dziennika referencji"
-#: builtin/pack-objects.c:3540
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "uwzględnij obiekty z odniesieniami z indeksu"
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3924
+msgid "read packs from stdin"
+msgstr "wczytaj paczki ze standardowego wejścia"
+
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "wypisz paczkę na standardowe wyjście"
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "uwzględnij obiekty tagów odnoszące się do pakowanych obiektów"
-#: builtin/pack-objects.c:3547
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "zachowaj nieosiągalne obiekty"
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "spakuj luźnie nieosiągalne obiekty"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "rozpakuj nieosiągalne obiekty nowsze niż <czas>"
-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "użyj rzadkiego algorytmu osiągalności"
-#: builtin/pack-objects.c:3556
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "twórz wąskie paczki"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "utwórz paczki odpowiednie do płytkich pobrań"
-#: builtin/pack-objects.c:3560
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "pomiń paczki, którym towarzyszy plik .keep"
-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "pomiń tę paczkę"
-#: builtin/pack-objects.c:3564
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "stopień kompresji paczki"
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "nie ukrywaj przeszczepionych zapisów"
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"użyj indeksu bitmapy, jeśli dostępny, żeby przyspieszyć zliczanie obiektów"
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "zapisz indeks bitmapy razem z indeksem paczek"
-#: builtin/pack-objects.c:3574
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "zapisz indeks bitmapy jeśli możliwe"
-#: builtin/pack-objects.c:3578
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "traktowanie brakujących obiektów"
-#: builtin/pack-objects.c:3581
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "nie pakuj obiektów w obiecujące pliki paczek"
-#: builtin/pack-objects.c:3583
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "uszanuj wyspy podczas kompresji delt"
-#: builtin/pack-objects.c:3585
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protokół"
-#: builtin/pack-objects.c:3586
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "wyłącz w tym protokole wszystkie ustawione uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:3617
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "łańcuch delt za głęboki: %d, wymuszanie %d"
-#: builtin/pack-objects.c:3622
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit za wysoki, wymuszanie %d"
-#: builtin/pack-objects.c:3676
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "nie można użyć --max-pack-size do budowania paczki do przesyłu"
-#: builtin/pack-objects.c:3678
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "minimalna granica rozmiaru paczki to 1 MiB"
-#: builtin/pack-objects.c:3683
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "nie można użyć --thin, aby zbudować indeksowalną paczkę"
-#: builtin/pack-objects.c:3686
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i --unpack-unreachable się wykluczają"
-#: builtin/pack-objects.c:3692
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "nie można użyć --filter bez --stdout"
-#: builtin/pack-objects.c:3752
+#: builtin/pack-objects.c:4081
+msgid "cannot use --filter with --stdin-packs"
+msgstr "--filter i --stdin-packs się wykluczają"
+
+#: builtin/pack-objects.c:4085
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "nie można użyć listy wewnętrznych rewizji z --stdin-packs"
+
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Wymienianie obiektów"
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18794,7 +19489,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ogranicz przejście do obiektów poza obiecującymi plikami paczek"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "nie można przyciąć repozytorium o cennych obiektach"
@@ -18807,55 +19502,59 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opcje>] [<repozytorium> [<referencja>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
-msgstr "sterowanie rekurencyjnym pobieraniem pod-modułów"
+msgstr "sterowanie rekurencyjnym pobieraniem podmodułów"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Opcje związane ze scalaniem"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "wciel zmiany przez przestawienie, a nie scalanie"
-#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "zezwól na przewijanie"
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "steruj użyciem skryptów pre-merge-commit i commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "automatycznie dodaj zmiany do schowka przed i przywróć je po"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Opcje związane z pobieraniem"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "wymuś nadpisanie lokalnej gałęzi"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
-msgstr "liczba pod-modułów zaciąganych równolegle"
+msgstr "liczba podmodułów zaciąganych równolegle"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Nieprawidłowa wartość pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Wśród właśnie pobranych referencji nie ma kandydata na przestawianie."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Wśród właśnie pobranych referencji nie ma kandydatów na scalanie."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18863,7 +19562,7 @@
"Zwykle oznacza to, że podano referencję z globem bez dopasowań\n"
"po zdalnej stronie."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18874,43 +19573,43 @@
"gałęzi. Ponieważ nie jest to domyślne ustawione repozytorium zdalne\n"
"dla bieżącej gałęzi, musisz podać gałąź w wierszu poleceń."
-#: builtin/pull.c:456 builtin/rebase.c:1253
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Nie jesteś obecnie w gałęzi."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Podaj, względem jakiej gałęzi przestawić."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Podaj, z jaką gałęzią scalić."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Więcej szczegółów w git-pull(1)."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1259
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<zdalne-repozytorium>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<gałąź>"
-#: builtin/pull.c:471 builtin/rebase.c:1251
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Bieżąca gałąź nie ma informacji o śledzeniu."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
"przez:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18919,20 +19618,20 @@
"Konfiguracja podaje, żeby scalić z referencją „%s”\n"
"ze zdalnego repozytorium, ale nie pobrano stamtąd żadnej takiej."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "brak dostępu do zapisu %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "pomijanie --verify-signatures przy przestawianiu"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -18944,9 +19643,9 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Odradza się zaciągania bez podania, jak pogodzić rozbieżne gałęzie.\n"
-"Można uciszyć ten komunikat wykonując jedno z poniższych\n"
-"poleceń kiedyś przed następnym zaciągnięciem:\n"
+"Gałęzie są rozbieżne i należy podać, jak je pogodzić.\n"
+"Można to zrobić wykonując jedno z poniższych poleceń kiedyś przed\n"
+"następnym zaciągnięciem:\n"
"\n"
" git config pull.rebase false # scalenie (domyślna strategia)\n"
" git config pull.rebase true # przestawienie\n"
@@ -18957,19 +19656,19 @@
"lub --ff-only w wierszu poleceń, aby zmienić ustawione zachowanie\n"
"w jednym wywołaniu.\n"
-#: builtin/pull.c:991
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "Aktualizowanie nienarodzonej gałęzi o zmiany dodane do indeksu."
-#: builtin/pull.c:995
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "zaciągnij z przestawieniem"
-#: builtin/pull.c:996
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "złóż je lub dodaj do schowka."
-#: builtin/pull.c:1021
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18980,7 +19679,7 @@
"przewijanie drzewa roboczego\n"
"z zapisu %s."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18997,17 +19696,25 @@
"$ git reset --hard\n"
"by się pozbierać."
-#: builtin/pull.c:1042
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Nie można scalić wielu gałęzi w puste czoło."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Nie można przestawić na wiele gałęzi."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Nie można przewinąć na wiele gałęzi."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Należy podać, jak godzić rozbieżne gałęzie."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "nie można przestawić z lokalnie zapisanymi zmianami pod-modułów"
+msgstr "nie można przestawić z lokalnie zapisanymi zmianami podmodułów"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -19068,7 +19775,7 @@
"\n"
" git push %s HEAD:<nazwa-zdalnej-gałęzi>\n"
-#: builtin/push.c:194
+#: builtin/push.c:191
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -19082,12 +19789,19 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:202
+#: builtin/push.c:199
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Bieżąca gałąź %s ma wiele gałęzi nadrzędnych, odmawiam wypchnięcia."
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
+"„nothing”."
+
+#: builtin/push.c:243
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -19098,14 +19812,7 @@
"bieżącej gałęzi „%s”, bez podania, co wypchnąć i na jaką\n"
"zdalną gałąź."
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
-"„nothing”."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19117,7 +19824,7 @@
"„git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:273
+#: builtin/push.c:264
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"
@@ -19129,7 +19836,7 @@
"zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:279
+#: builtin/push.c:270
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"
@@ -19143,12 +19850,12 @@
"zintegrować zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
-#: builtin/push.c:286
+#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualizacje zostały odrzucone, bo tag już istnieje w zdalnym repozytorium."
-#: builtin/push.c:289
+#: builtin/push.c:280
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"
@@ -19158,7 +19865,7 @@
"nie będący zapisem, ani sprawić, żeby wskazywała na taki obiekt,\n"
"chyba że użyjesz opcji „--force”.\n"
-#: builtin/push.c:294
+#: builtin/push.c:285
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
"branch has been updated since the last checkout. You may want\n"
@@ -19170,103 +19877,103 @@
"zintegrować te zmiany lokalnie (np. „git pull ...”)\n"
"przed wymuszeniem wypchnięcia.\n"
-#: builtin/push.c:364
+#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
msgstr "Wypychanie do %s\n"
-#: builtin/push.c:371
+#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "nie można wypchnąć niektórych referencji do „%s”"
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "repozytorium"
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "wypchnij wszystkie referencje"
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "odwzoruj wszystkie referencje"
-#: builtin/push.c:557
+#: builtin/push.c:548
msgid "delete refs"
msgstr "usuń referencje"
-#: builtin/push.c:558
+#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
-msgstr "wypchnij tagi (nie może być użyte z --all ani --mirror)"
+msgstr "wypchnij tagi (nie można użyć z --all ani --mirror)"
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "wymuszone aktualizacje"
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<referencja>:<oczekiwana>"
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "wymagaj, żeby stara wartość referencji wskazywała tę wartość"
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "wymagaj, by zdalne aktualizacje były wcielone lokalnie"
-#: builtin/push.c:569
+#: builtin/push.c:560
msgid "control recursive pushing of submodules"
-msgstr "steruj rekurencyjnym wypychaniem pod-modułów"
+msgstr "steruj rekurencyjnym wypychaniem podmodułów"
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "użyj wąskiej paczki"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program do odbierania paczek"
-#: builtin/push.c:573
+#: builtin/push.c:564
msgid "set upstream for git pull/status"
msgstr "ustaw gałąź nadrzędną do git pull/status"
-#: builtin/push.c:576
+#: builtin/push.c:567
msgid "prune locally removed refs"
msgstr "przytnij lokalnie usunięte referencje"
-#: builtin/push.c:578
+#: builtin/push.c:569
msgid "bypass pre-push hook"
msgstr "omiń skrypt pre-push"
-#: builtin/push.c:579
+#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "wypchnij brakujące, ale mające związek tagi"
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "podpisz wypchnięcie GPG"
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "zażądaj atomowej transakcji po stronie zdalnej"
-#: builtin/push.c:601
+#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete wyklucza się z --all, --mirror i --tags"
-#: builtin/push.c:603
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete nie ma sensu bez żadnych referencji"
-#: builtin/push.c:623
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "złe repozytorium „%s”"
-#: builtin/push.c:624
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -19288,27 +19995,27 @@
"\n"
" git push <nazwa>\n"
-#: builtin/push.c:639
+#: builtin/push.c:630
msgid "--all and --tags are incompatible"
msgstr "--all i --tags się wykluczają"
-#: builtin/push.c:641
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
-msgstr "--all i referencje wykluczają się"
+msgstr "--all i referencje się wykluczają"
-#: builtin/push.c:645
+#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags się wykluczają"
-#: builtin/push.c:647
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror i referencje wykluczają się"
+msgstr "--mirror i referencje się wykluczają"
-#: builtin/push.c:650
+#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror się wykluczają"
-#: builtin/push.c:657
+#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "opcje wypychania nie mogą zawierać znaków końca wiersza"
@@ -19326,10 +20033,6 @@
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<opcje>] <podstawa> <stary-czubek> <nowy-czubek>"
-#: builtin/range-diff.c:28
-msgid "Percentage by which creation is weighted"
-msgstr "Procent, według jakiego ważone jest tworzenie"
-
#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "użyj prostych kolorów zmian"
@@ -19366,82 +20069,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<plik>] (--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-output=<plik>] "
+"(--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "zapisz wynikowy indeks w <pliku>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "tylko opróżnij indeks"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Scalanie"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "dokonaj scalenia oprócz odczytu"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "trójstronne scalanie jeśli nie trzeba scalać na poziomie plików"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "trójstronne scalanie w obecności dodań i usunięć"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "to samo, co -m, ale odrzuć niescalone elementy"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<podkatalog>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "wczytaj drzewo do indeksu w <podkatalogu>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "zaktualizuj drzewo robocze wynikiem scalenia"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "zezwól na nadpisywanie jawnie ignorowanych plików"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "nie sprawdzaj drzewa roboczego po scaleniu"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "nie aktualizuj indeksu ani drzewa roboczego"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "pomiń stosowanie filtru rzadkiego wybrania"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "odpluskwianie unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "pomiń komunikaty zwrotne"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Musisz najpierw rozwiązać bieżący indeks"
@@ -19464,193 +20167,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista zadań do zrobienia się nie nadaje: „%s”"
-
-#: builtin/rebase.c:312
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "nie można utworzyć tymczasowego %s"
-#: builtin/rebase.c:318
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "nie można oznaczyć jako interaktywne"
-#: builtin/rebase.c:371
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "nie można wygenerować listy zadań do zrobienia"
-#: builtin/rebase.c:413
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "zapis podstawy należy podać z --upstream lub --onto"
-#: builtin/rebase.c:482
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcje>]"
-
-#: builtin/rebase.c:495 builtin/rebase.c:1394
-msgid "keep commits which start empty"
-msgstr "zachowaj zapisy, które zaczynają puste"
-
-#: builtin/rebase.c:499 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "pozwól na zapisy z pustymi komunikatami"
-
-#: builtin/rebase.c:501
-msgid "rebase merge commits"
-msgstr "przestawiaj zapisy scaleń"
-
-#: builtin/rebase.c:503
-msgid "keep original branch points of cousins"
-msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
-
-#: builtin/rebase.c:505
-msgid "move commits that begin with squash!/fixup!"
-msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
-
-#: builtin/rebase.c:506
-msgid "sign commits"
-msgstr "podpisuj zapisy"
-
-#: builtin/rebase.c:508 builtin/rebase.c:1333
-msgid "display a diffstat of what changed upstream"
-msgstr "wyświetl statystyki zmian nadrzędnych"
-
-#: builtin/rebase.c:510
-msgid "continue rebase"
-msgstr "kontynuuj przestawianie"
-
-#: builtin/rebase.c:512
-msgid "skip commit"
-msgstr "pomiń zapis"
-
-#: builtin/rebase.c:513
-msgid "edit the todo list"
-msgstr "edytuj listę zadań do zrobienia"
-
-#: builtin/rebase.c:515
-msgid "show the current patch"
-msgstr "pokaż bieżącą łatkę"
-
-#: builtin/rebase.c:518
-msgid "shorten commit ids in the todo list"
-msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:520
-msgid "expand commit ids in the todo list"
-msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:522
-msgid "check the todo list"
-msgstr "sprawdź listę zadań do zrobienia"
-
-#: builtin/rebase.c:524
-msgid "rearrange fixup/squash lines"
-msgstr "zmień kolejność wierszy fixup/squash"
-
-#: builtin/rebase.c:526
-msgid "insert exec commands in todo list"
-msgstr "wstaw polecenia exec na listę zadań do zrobienia"
-
-#: builtin/rebase.c:527
-msgid "onto"
-msgstr "na"
-
-#: builtin/rebase.c:530
-msgid "restrict-revision"
-msgstr "ogranicz-rewizję"
-
-#: builtin/rebase.c:530
-msgid "restrict revision"
-msgstr "ogranicz rewizję"
-
-#: builtin/rebase.c:532
-msgid "squash-onto"
-msgstr "spłaszcz-na"
-
-#: builtin/rebase.c:533
-msgid "squash onto"
-msgstr "spłaszcz na"
-
-#: builtin/rebase.c:535
-msgid "the upstream commit"
-msgstr "zapis głównego nurtu"
-
-#: builtin/rebase.c:537
-msgid "head-name"
-msgstr "nazwa-czoła"
-
-#: builtin/rebase.c:537
-msgid "head name"
-msgstr "nazwa czoła"
-
-#: builtin/rebase.c:542
-msgid "rebase strategy"
-msgstr "strategia przestawiania"
-
-#: builtin/rebase.c:543
-msgid "strategy-opts"
-msgstr "opcje-strategii"
-
-#: builtin/rebase.c:544
-msgid "strategy options"
-msgstr "opcje strategii"
-
-#: builtin/rebase.c:545
-msgid "switch-to"
-msgstr "przełącz-na"
-
-#: builtin/rebase.c:546
-msgid "the branch or commit to checkout"
-msgstr "gałąź lub zapis do wybrania"
-
-#: builtin/rebase.c:547
-msgid "onto-name"
-msgstr "nazwa-na"
-
-#: builtin/rebase.c:547
-msgid "onto name"
-msgstr "nazwa rewizji „na”"
-
-#: builtin/rebase.c:548
-msgid "cmd"
-msgstr "polecenie"
-
-#: builtin/rebase.c:548
-msgid "the command to run"
-msgstr "polecenie do wykonania"
-
-#: builtin/rebase.c:551 builtin/rebase.c:1427
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "automatycznie przeplanuj każdy nieudany „exec”"
-
-#: builtin/rebase.c:567
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
-
-#: builtin/rebase.c:583
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s wymaga silnika scalenia"
-#: builtin/rebase.c:626
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "nie można uzyskać „onto”: „%s”"
-#: builtin/rebase.c:643
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "nieprawidłowe pierwotne czoło: „%s”"
-#: builtin/rebase.c:668
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "pomijanie błędnego allow_rerere_autoupdate: „%s”"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19664,7 +20218,7 @@
"Aby przerwać i powrócić do stanu sprzed „git rebase”, wykonaj „git rebase --"
"abort”."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19683,7 +20237,7 @@
"\n"
"Z tego powodu git nie może ich przestawić."
-#: builtin/rebase.c:1227
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19692,7 +20246,7 @@
"nierozpoznany pusty rodzaj „%s”; prawidłowe wartości to „drop”, „keep” i "
"„ask”."
-#: builtin/rebase.c:1245
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19709,7 +20263,7 @@
" git rebase '<gałąź>'\n"
"\n"
-#: builtin/rebase.c:1261
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19722,191 +20276,192 @@
" git branch --set-upstream-to=%s/<gałąź> %s\n"
"\n"
-#: builtin/rebase.c:1291
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "polecenia exec nie mogą zawierać znaków nowego wiersza"
-#: builtin/rebase.c:1295
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "puste polecenie exec"
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "przestaw na podaną gałąź zamiast na główny nurt"
-#: builtin/rebase.c:1326
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "użyj podstawy scalania głównego nurtu i gałęzi jako bieżącej podstawy"
-#: builtin/rebase.c:1328
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "pozwól wykonać skrypt pre-rebase"
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "bądź cicho. zakłada --no-stat"
-#: builtin/rebase.c:1336
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "wyświetl statystyki zmian nadrzędnych"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "nie pokazuj statystyk różnic ze zmian głównego nurtu"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "dodaj końcówkę Signed-off-by do każdego zapisu"
-#: builtin/rebase.c:1342
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "ustaw datę złożenia na datę utworzenia"
-#: builtin/rebase.c:1344
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "pomiń datę utworzenia i użyj bieżącej"
-#: builtin/rebase.c:1346
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "zamiennik na --reset-author-date"
-#: builtin/rebase.c:1348 builtin/rebase.c:1352
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "przekaż do „git apply”"
-#: builtin/rebase.c:1350
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignoruj zmiany w białych znakach"
-#: builtin/rebase.c:1354 builtin/rebase.c:1357
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "dobierz wszystkie zapisy, nawet jeśli niezmienione"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "kontynuuj"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "pomiń obecną łatkę i kontynuuj"
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "przerwij i wybierz pierwotną gałąź"
-#: builtin/rebase.c:1367
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "przerwij, ale zostaw HEAD, gdzie jest"
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "edytuj listę zadań do zrobienia podczas interaktywnego przestawiania"
-#: builtin/rebase.c:1371
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "pokaż plik łatki właśnie stosowanej lub scalanej"
-#: builtin/rebase.c:1374
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "użyj strategii stosowania do przestawiania"
-#: builtin/rebase.c:1378
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "użyj strategii scalania do przestawiania"
-#: builtin/rebase.c:1382
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "pozwól użytkownikowi edytować listę zapisów do przestawienia"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(PRZESTARZAŁE) spróbuj odtworzyć scalenia zamiast je pomijać"
-#: builtin/rebase.c:1391
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "jak traktować zapisy, które staną się puste"
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "zachowaj zapisy, które zaczynają puste"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "przenieś zapisy, które zaczynają się od squash!/fixup! pod -i"
-#: builtin/rebase.c:1405
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "dodaj wiersz exec po każdym zapisie z edytowalnej listy"
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "pozwól przestawiać zapisy z pustymi komunikatami"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "spróbuj przestawić scalenia zamiast je pomijać"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "użyj „git merge-base --fork-point”, aby poprawić gałąź nadrzędną"
+msgstr "użyj „merge-base --fork-point”, aby poprawić gałąź nadrzędną"
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "użyj podanej strategii scalania"
-#: builtin/rebase.c:1420 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "opcja"
-#: builtin/rebase.c:1421
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "przekaż argument do strategii scalania"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "przestaw wszystkie osiągalne zapisy aż do korzenia"
-#: builtin/rebase.c:1429
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "automatycznie przeplanuj każdy nieudany „exec”"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "zastosuj wszystkie zmiany, nawet te już obecne w głównym nurcie"
-#: builtin/rebase.c:1446
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"wsparcie rebase.useBuiltin zostało usunięte!\n"
-"Zobacz szczegóły pod jego opisem w „git help config”."
-
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Wygląda, że trwa „git am”. Nie można przestawić."
-#: builtin/rebase.c:1493
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges jest przestarzałe. Użyj zamiast tego --rebase-"
-"merges."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges zostało zastąpione --rebase-merges"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "„--keep-base” i „--onto” się wykluczają."
+msgstr "„--keep-base” i „--onto” się wykluczają"
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
-msgstr "„--keep-base” i „--root” się wykluczają."
+msgstr "„--keep-base” i „--root” się wykluczają"
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
-msgstr "„--keep-base” i „--fork-point” się wykluczają."
+msgstr "„--root” i „--fork-point” się wykluczają"
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Nie trwa żadne przestawianie?"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-"Akcja --edit-todo może być użyta tylko podczas interaktywnego przestawiania."
+"Działania --edit-todo można użyć tylko podczas interaktywnego przestawiania."
-#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Nie można odczytać HEAD"
-#: builtin/rebase.c:1546
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19914,16 +20469,16 @@
"Musisz edytować wszystkie konflikty scalania\n"
"i oznaczyć je jako rozwiązane przy pomocy git add"
-#: builtin/rebase.c:1565
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "nie można odrzucić zmian w drzewie roboczym"
-#: builtin/rebase.c:1584
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "nie można cofnąć do %s"
-#: builtin/rebase.c:1630
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19944,140 +20499,131 @@
"i wykonaj mnie ponownie. Przerywam na wypadek, gdyby było tam\n"
"coś cennego.\n"
-#: builtin/rebase.c:1658
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "przełącznik „C” oczekuje wartości liczbowej"
-#: builtin/rebase.c:1700
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Nieznany tryb: %s"
-#: builtin/rebase.c:1739
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy wymaga --merge lub --interactive"
-#: builtin/rebase.c:1769
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "nie można łączyć opcji stosowania z opcjami scalania"
-#: builtin/rebase.c:1782
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Nieznany silnik przestawiania: %s"
-#: builtin/rebase.c:1812
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedule-failed wymaga --exec lub --interactive"
+msgstr "--reschedule-failed-exec wymaga --exec lub --interactive"
-#: builtin/rebase.c:1832
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "„--preserve-merges” i „--rebase-merges” się wykluczają"
-
-#: builtin/rebase.c:1836
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "błąd: „--preserve-merges” i „--reschedule-failed-exec” się wykluczają"
-
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "nieprawidłowa gałąź nadrzędna „%s”"
-#: builtin/rebase.c:1866
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Nie można utworzyć nowego zapisu korzenia"
-#: builtin/rebase.c:1892
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania z gałęzią"
-#: builtin/rebase.c:1895
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania"
-#: builtin/rebase.c:1903
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Nie wskazuje na prawidłowy zapis „%s”"
-#: builtin/rebase.c:1931
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "błąd krytyczny: brak gałęzi/zapisu „%s”"
+msgid "no such branch/commit '%s'"
+msgstr "brak gałęzi/zapisu „%s”"
-#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Nie ma takiej referencji: %s"
-#: builtin/rebase.c:1950
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Nie można rozwiązać HEAD do rewizji"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Złóż je lub dodaj do schowka."
-#: builtin/rebase.c:2007
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "nie można przełączyć na %s"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD jest aktualne."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Obecna gałąź %s jest aktualna.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD jest aktualne, wymuszono przestawianie."
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Bieżąca gałąź %s jest aktualna, wymuszono przestawianie.\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Skrypt pre-rebase odmówił przestawiania."
-#: builtin/rebase.c:2045
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Zmiany w %s:\n"
-#: builtin/rebase.c:2048
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Zmiany z %s na %s:\n"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "Najpierw cofanie czoła gałęzi, aby odtworzyć na nim pracę...\n"
-#: builtin/rebase.c:2082
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Nie można odłączyć HEAD"
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Przewinięto %s do %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <katalog-gita>"
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20107,7 +20653,7 @@
"Aby wyciszyć tę wiadomość i utrzymać domyślne zachowanie, ustaw\n"
"wartość konfiguracji „receive.denyCurrentBranch” na „refuse”."
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20127,7 +20673,7 @@
"\n"
"Żeby wyciszyć ten komunikat, możesz ustawić ją na „refuse”."
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "cicho"
@@ -20172,7 +20718,7 @@
msgid "%s points nowhere!"
msgstr "%s nigdzie nie wskazuje!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "nie podano dziennika referencji do skasowania"
@@ -20328,7 +20874,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "podanie gałęzi do śledzenia ma sens tylko ze zwierciadłami pobierania"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "zdalne repozytorium %s już istnieje."
@@ -20338,25 +20884,30 @@
msgid "Could not setup master '%s'"
msgstr "Nie można ustawić głównej gałęzi „%s”"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nierozpoznane branch.%s.rebase=%s; zakładam „true”"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Nie można pobrać mapy do referencji %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(pasujące)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(usunięcie)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "nie można ustawić „%s”"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20367,17 +20918,17 @@
"\t%s:%d\n"
"wskazuje teraz nieistniejące zdalne repozytorium „%s”"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Nie ma takiego zdalnego repozytorium: „%s”"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Nie można zmienić nazwy rozdziału konfiguracji „%s” na „%s”"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20388,17 +20939,17 @@
"\t%s\n"
"\tJeśli to konieczne, zaktualizuj ustawienia ręcznie."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "nie można usunąć „%s”"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "nie można utworzyć „%s”"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20415,118 +20966,118 @@
"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
"aby je usunąć, użyj:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Nie można usunąć rozdziału konfiguracji „%s”"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nowe (następne pobranie zapisze w remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " śledzone"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " zastała (użyj „git remote prune”, aby usunąć)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "złe branch.%s.merge; nie można przestawiać na > 1 gałąź"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "przestawia interaktywnie na zdalne repozytorium %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "przestawia interaktywnie (ze scaleniami) na zdalne repozytorium %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "przestawia się na zdalne repozytorium %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " scala się ze zdalnym repozytorium %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "scala się ze zdalnym repozytorium %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i ze zdalnym repozytorium %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "utwórz"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "usuń"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "aktualne"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "przewijalne"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "lokalna nieaktualna"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s wymusza na %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s wypycha na %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s wymusza na %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s wypycha na %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "nie odpytuj zdalnych repozytoriów"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* zdalne repozytorium %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " Adres do pobierania: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(brak adresu URL)"
@@ -20534,25 +21085,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " Adres do wypychania: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " gałąź HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(nie odpytano)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(nieznane)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -20560,7 +21111,7 @@
" gałąź HEAD (zdalne HEAD jest niejednoznaczne, może być jednym z "
"następujących):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -20568,22 +21119,22 @@
msgstr[1] " Zdalne gałęzie:%s"
msgstr[2] " Zdalne gałęzie:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (nie odpytano stanu)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokalna gałąź ustawiona do „git pull”:"
msgstr[1] " Lokalne gałęzie ustawione do „git pull”:"
msgstr[2] " Lokalne gałęzie ustawione do „git pull”:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokalne referencje będą odzwierciedlane przez „git push”"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -20591,132 +21142,136 @@
msgstr[1] " Lokalne referencje ustawione do „git push”%s:"
msgstr[2] " Lokalne referencje ustawione do „git push”%s:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "ustaw refs/remotes/<nazwa>/HEAD według zdalnego repozytorium"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "usuń refs/remotes/<nazwa>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Nie można ustalić zdalnego HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Wiele gałęzi HEAD. Wybierz jedną jawnie przez:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Nie można usunąć %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Nieprawidłowa referencja: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Nie można ustawić %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s będzie wiszący!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s stał się wiszący!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Przycinanie %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "Adres URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [przycięto by] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [przycięto] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "przytnij zdalne repozytoria po pobraniu"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Nie ma takiego zdalnego repozytorium „%s”"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "dodaj gałąź"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "nie podano zdalnego repozytorium"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "operuj na adresach wypychania zamiast pobierania"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "zwróć wszystkie adresy URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "zdalne repozytorium „%s” nie ma skonfigurowanych adresów"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "operuj na adresach wypychania"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "dodaj adres URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "usuń adresy URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete nie ma sensu"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Nieprawidłowy stary wzorzec adresu: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Nie znaleziono takiego adresu URL: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Nie skasuje wszystkich adresów nie do wypychania"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<opcje>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20724,118 +21279,154 @@
"Przyrostowe przepakowania są niekompatybilne z indeksami bitmap. Użyj\n"
"--no-write-bitmap-index lub wyłącz konfigurację pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "nie można uruchomić pack-objects, żeby przepakować obiecujące obiekty"
-#: builtin/repack.c:270 builtin/repack.c:446
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Oczekiwano tylko wierszy z pełnych szesnastkowych identyfikatorów "
"obiektów z pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "nie można ukończyć pack-objects, żeby przepakować obiecujące obiekty"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
+#, c-format
+msgid "cannot open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: builtin/repack.c:371
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr "paczka %s za duża do rozważania w postępie geometrycznym"
+
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "paczka %s za duża do zwiększenia"
+
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "nie można otworzyć tymczasowego pliku %s do zapisywania"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "nie można zamknąć pliku tymczasowego obrazu referencji"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "spakuj wszystko w jedną paczkę"
-#: builtin/repack.c:324
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "to samo, co -a, i zamień nieosiągalne obiekty w luźne"
-#: builtin/repack.c:327
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "usuń zbędne paczki i wykonaj git-prune-packed"
-#: builtin/repack.c:329
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "przekaż --no-reuse-delta do git-pack-objects"
-#: builtin/repack.c:331
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "przekaż --no-reuse-object do git-pack-objects"
-#: builtin/repack.c:333
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "nie wykonuj git-update-server-info"
-#: builtin/repack.c:336
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "przekaż --local do git-pack-objects"
-#: builtin/repack.c:338
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "zapisz indeks bitmapy"
-#: builtin/repack.c:340
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "przekaż --delta-islands do git-pack-objects"
-#: builtin/repack.c:341
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "przybliżona-data"
-#: builtin/repack.c:342
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "z -A, nie luzuj obiektów starszych niż podana data"
-#: builtin/repack.c:344
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "z -a przepakuj wszystkie nieosiągalne obiekty"
-#: builtin/repack.c:346
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "rozmiar okna użytego do kompresji delt"
-#: builtin/repack.c:347 builtin/repack.c:353
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "bajty"
-#: builtin/repack.c:348
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "jak wyżej, ale ogranicz rozmiar pamięci zamiast liczby elementów"
-#: builtin/repack.c:350
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "ogranicza maksymalną głębokość delty"
-#: builtin/repack.c:352
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "ogranicza maksymalną liczbę wątków"
-#: builtin/repack.c:354
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "maksymalny rozmiar pojedynczego pliku paczki"
-#: builtin/repack.c:356
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "przepakuj obiekty w paczki oznaczone przez .keep"
-#: builtin/repack.c:358
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "nie przepakowuj tej paczki"
-#: builtin/repack.c:368
+#: builtin/repack.c:666
+msgid "find a geometric progression with factor <N>"
+msgstr "znajdź postęp geometryczny z czynnikiem <N>"
+
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "zapisz indeks wielu paczek wynikowych paczek"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "nie można usuwać paczek w repozytorium o cennych obiektach"
-#: builtin/repack.c:372
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A się wykluczają"
-#: builtin/repack.c:455
+#: builtin/repack.c:713
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric i -A, -a się wykluczają"
+
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Nic nowego do spakowania."
-#: builtin/repack.c:485
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "brakuje wymaganego pliku: %s"
-#: builtin/repack.c:487
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "nie można usunąć przez unlink: %s"
@@ -21093,15 +21684,15 @@
msgstr ""
"git rerere [clear | forget <ścieżka>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "zarejestruj gładkie rozwiązania w indeksie"
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
msgstr "„git rerere forget” bez ścieżek jest przestarzałe"
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "nie można wygenerować różnic dla „%s”"
@@ -21145,93 +21736,93 @@
msgid "keep"
msgstr "zachowaj"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "HEAD jest nieprawidłowe."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Nie znaleziono drzewa HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Nie znaleziono drzewa %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD wskazuje teraz %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Nie można wykonać resetu %s podczas scalania."
-#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
-#: builtin/stash.c:685
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "mniej komunikatów, wypisuj tylko błędy"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "zresetuj HEAD i indeks"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "zresetuj tylko HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "zresetuj HEAD, indeks i drzewo robocze"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "zresetuj HEAD, ale zachowaj lokalne zmiany"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "zapisz tylko, że usunięte ścieżki zostaną dodane później"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Nie można rozwiązać „%s” jako prawidłowej rewizji."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Nie można rozwiązać „%s” jako prawidłowego drzewa."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch i --{hard,mixed,soft} się wykluczają"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed ze ścieżkami jest przestarzałe; użyj zamiast tego „git reset -- "
"<ścieżki>”."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Nie można wykonać resetu %s ze ścieżkami."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "resetowanie %s nie jest dozwolone w suchym repozytorium"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
-msgstr "-N może być użyte tylko z --mixed"
+msgstr "-N można użyć tylko z --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Nieprzygotowane zmiany po resecie:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21244,28 +21835,28 @@
"Możesz użyć „--quiet”, żeby tego uniknąć. Ustaw konfigurację reset.quiet\n"
"na true, aby było to domyślne.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Nie można zresetować pliku indeksu do rewizji „%s”."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Nie można zapisać nowego pliku indeksu."
-#: builtin/rev-list.c:534
+#: builtin/rev-list.c:541
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "--exclude-promisor-objects i --missing się wykluczają"
-#: builtin/rev-list.c:595
+#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr "filtrowanie obiektów wymaga --objects"
-#: builtin/rev-list.c:651
+#: builtin/rev-list.c:674
msgid "rev-list does not support display of notes"
msgstr "rev-list nie wspiera wyświetlania uwag"
-#: builtin/rev-list.c:656
+#: builtin/rev-list.c:679
msgid "marked counting is incompatible with --objects"
msgstr "znaczone zliczanie i --objects się wykluczają"
@@ -21285,6 +21876,18 @@
msgid "output in stuck long form"
msgstr "wypisz w zbitej długiej postaci"
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "przedwczesny koniec wejścia"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "brak opisu użycia przed separatorem „--”"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Potrzeba pojedynczej rewizji"
+
#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21300,6 +21903,50 @@
"Wykonaj „git rev-parse --parseopt -h”, aby uzyskać więcej informacji o "
"pierwszym użyciu."
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir wymaga argumentu"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "nie jest katalogiem gita „%s”"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path wymaga argumentu"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n wymaga argumentu"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format wymaga argumentu"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "nieznany argument do --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default wymaga argumentu"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix wymaga argumentu"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "nieznany tryb do --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "nieznany tryb do --show-object-format: %s"
+
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<opcje>] <zmiana>..."
@@ -21324,7 +21971,7 @@
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
-msgstr "%s: %s i %s wykluczają się"
+msgstr "%s: %s i %s się wykluczają"
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
@@ -21374,23 +22021,27 @@
msgid "preserve initially empty commits"
msgstr "zachowaj początkowo puste zapisy"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "pozwól na zapisy z pustymi komunikatami"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "zachowaj zbędne puste zapisy"
-#: builtin/revert.c:239
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "odwrócenie nie powiodło się"
-#: builtin/revert.c:252
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "dobieranie nie powiodło się"
-#: builtin/rm.c:19
+#: builtin/rm.c:20
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opcje>] [--] <plik>..."
-#: builtin/rm.c:207
+#: builtin/rm.c:208
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -21407,7 +22058,7 @@
"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
"i od HEAD:"
-#: builtin/rm.c:212
+#: builtin/rm.c:213
msgid ""
"\n"
"(use -f to force removal)"
@@ -21415,14 +22066,14 @@
"\n"
"(użyj -f, by wymusić usunięcie)"
-#: builtin/rm.c:216
+#: builtin/rm.c:217
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "następujący plik ma zmiany przygotowane w indeksie:"
msgstr[1] "następujące pliki mają zmiany przygotowane w indeksie:"
msgstr[2] "następujące pliki mają zmiany przygotowane w indeksie:"
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -21430,77 +22081,77 @@
"\n"
"(użyj --cached, aby zachować plik, lub -f, by wymusić usunięcie)"
-#: builtin/rm.c:226
+#: builtin/rm.c:227
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "następujący plik ma lokalne zmiany:"
msgstr[1] "następujące pliki mają lokalne zmiany:"
msgstr[2] "następujące pliki mają lokalne zmiany:"
-#: builtin/rm.c:243
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "nie wypisuj usuniętych plików"
-#: builtin/rm.c:244
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "tylko usuń z indeksu"
-#: builtin/rm.c:245
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "wyłącz sprawdzenie aktualności"
-#: builtin/rm.c:246
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "zezwól na usuwanie rekurencyjne"
-#: builtin/rm.c:248
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "zwróć zero, nawet jeśli nic nie dopasowano"
-#: builtin/rm.c:282
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Nie podano żadnych ścieżek. Które pliki usunąć?"
-#: builtin/rm.c:305
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"przygotuj swoje zmiany w .gitmodules lub dodaj do schowka, aby kontynuować"
-#: builtin/rm.c:323
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "nie usuwanie „%s” rekurencyjne bez -r"
-#: builtin/rm.c:362
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: nie można usunąć %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<katalog> "
-"[<referencja>...]\n"
-" --all i podanie konkretnych <referencji> wykluczają się."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<katalog> (--all | <referencja>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "nazwa zdalnego repozytorium"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "użyj bezstanowego protokołu RPC"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "wczytaj referencje ze standardowego wejścia"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "wypisuj stan zdalnego pomocnika"
@@ -21557,21 +22208,22 @@
msgid "group by field"
msgstr "grupuj według pola"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "podano zbyt wiele argumentów poza repozytorium"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rewizja> | <glob>)...]"
+" [--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rewizja> | "
+"<glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21586,91 +22238,91 @@
msgstr[1] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
msgstr[2] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "brak pasujących referencji z %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "pokaż śledzące i lokalne gałęzie"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "wypisz gałęzie śledzące"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "koloruj „*!+-” odpowiednio do gałęzi"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "pokaż <n> dodatkowych zapisów po wspólnym przodku"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "zamiennik na more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "ukryj nazwy"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "uwzględnij bieżącą gałąź"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "nazwij zapisy ich nazwami obiektów"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "pokaż możliwe podstawy scalenia"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "pokaż referencje nieosiągalne z żadnej innej"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "pokaż zapisy w kolejności topologicznej"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "pokaż tylko zapisy spoza pierwszej gałęzi"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "pokaż scalenia osiągalne z tylko jednego czubka"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "posortuj topologicznie, zachowując kolejność dat, gdzie się da"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<podstawa>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"pokaż <n> najświeższych elementów dziennika referencji poczynając od podstawy"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog wyklucza się z --all, --remotes, --independent lub --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "nie podano gałęzi, a HEAD jest nieprawidłowe"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "opcja --reflog potrzebuje nazwy gałęzi"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
@@ -21678,12 +22330,12 @@
msgstr[1] "można pokazać tylko %d elementy na raz."
msgstr[2] "można pokazać tylko %d elementów na raz."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "nie ma takiej referencji %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
@@ -21691,12 +22343,12 @@
msgstr[1] "nie można obsłużyć więcej niż %d rewizji."
msgstr[2] "nie można obsłużyć więcej niż %d rewizji."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s” nie jest prawidłową referencją."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "nie odnaleziono zapisu %s (%s)"
@@ -21756,103 +22408,121 @@
"pokaż referencje ze standardowego wejścia, których nie ma w lokalnym "
"repozytorium"
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcje>"
-#: builtin/sparse-checkout.c:45
+#: builtin/sparse-checkout.c:46
msgid "git sparse-checkout list"
msgstr "git sparse-checkout list"
-#: builtin/sparse-checkout.c:71
+#: builtin/sparse-checkout.c:72
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"to drzewo robocze nie jest rzadkie (plik rzadkiego wybrania może nie istnieć)"
-#: builtin/sparse-checkout.c:223
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalog „%s” zawiera nieśledzone pliki, ale jest poza stożkiem rzadkiego "
+"wybrania"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "nie można usunąć katalogu „%s”"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "nie można utworzyć katalogu dla pliku rzadkiego wybrania"
-#: builtin/sparse-checkout.c:264
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "nie można podnieść formatu repozytorium, aby włączyć worktreeConfig"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "nie można ustawić konfiguracji extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:283
-msgid "git sparse-checkout init [--cone]"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:384
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "zainicjuj rzadkie wybranie w trybie stożka"
-#: builtin/sparse-checkout.c:339
+#: builtin/sparse-checkout.c:406
+msgid "toggle the use of a sparse index"
+msgstr "przełącz użycie rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:434
+msgid "failed to modify sparse-index config"
+msgstr "nie można zmienić ustawień rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "nie można otworzyć „%s”"
-#: builtin/sparse-checkout.c:396
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "nie można unormować ścieżki %s"
-#: builtin/sparse-checkout.c:408
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <wzorce>)"
-#: builtin/sparse-checkout.c:433
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "nie można odcytować łańcucha w stylu C „%s”"
-#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "nie można załadować istniejących wzorców rzadkiego wybrania"
-#: builtin/sparse-checkout.c:556
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "wczytaj wzorce ze standardowego wejścia"
-#: builtin/sparse-checkout.c:571
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:590
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:618
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "błąd podczas odświeżania katalogu roboczego"
-#: builtin/stash.c:22 builtin/stash.c:38
+#: builtin/stash.c:24 builtin/stash.c:40
msgid "git stash list [<options>]"
msgstr "git stash list [<opcje>]"
-#: builtin/stash.c:23 builtin/stash.c:43
+#: builtin/stash.c:25 builtin/stash.c:45
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<opcje>] [<schowek>]"
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:25
+#: builtin/stash.c:27
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:26 builtin/stash.c:63
+#: builtin/stash.c:28 builtin/stash.c:65
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <gałąź> [<schowek>]"
-#: builtin/stash.c:27 builtin/stash.c:68
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28
+#: builtin/stash.c:30
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21864,7 +22534,7 @@
" [--pathspec-from-file=<plik> [--pathspec-file-nul]]\n"
" [--] [<ścieżka>...]]"
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21872,19 +22542,19 @@
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<komunikat>]"
-#: builtin/stash.c:53
+#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:58
+#: builtin/stash.c:60
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<schowek>]"
-#: builtin/stash.c:73
+#: builtin/stash.c:75
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <komunikat>] [-q|--quiet] <zapis>"
-#: builtin/stash.c:78
+#: builtin/stash.c:80
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21894,30 +22564,38 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <komunikat>]\n"
" [--] [<ścieżka>...]]"
-#: builtin/stash.c:128
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<komunikat>]"
+
+#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "„%s” nie jest zapisem ze zmianami ze schowka"
-#: builtin/stash.c:148
+#: builtin/stash.c:150
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Podano za dużo rewizji: %s"
-#: builtin/stash.c:162
+#: builtin/stash.c:164
msgid "No stash entries found."
msgstr "Brak zmian w schowku."
-#: builtin/stash.c:176
+#: builtin/stash.c:178
#, c-format
msgid "%s is not a valid reference"
msgstr "%s nie jest prawidłową referencją."
-#: builtin/stash.c:225
+#: builtin/stash.c:227
msgid "git stash clear with arguments is unimplemented"
msgstr "nie zaimplementowano parametrów w git stash clear"
-#: builtin/stash.c:429
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21928,150 +22606,166 @@
" %s -> %s\n"
" aby zwolnić miejsce.\n"
-#: builtin/stash.c:490
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "nie można zastosować zmian ze schowka podczas scalania"
-#: builtin/stash.c:501
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "nie można wygenerować zmian %s^!."
-#: builtin/stash.c:508
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflikty w indeksie. Spróbuj bez --index."
-#: builtin/stash.c:514
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "nie można zapisać drzewa indeksu"
-#: builtin/stash.c:523
-msgid "could not restore untracked files from stash"
-msgstr "nie można przywrócić nieśledzonych plików ze schowka"
-
-#: builtin/stash.c:537
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Scalanie %s z %s"
-#: builtin/stash.c:547
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indeks nie został wyjęty ze schowka."
-#: builtin/stash.c:589 builtin/stash.c:687
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "nie można przywrócić nieśledzonych plików ze schowka"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "spróbuj odtworzyć indeks"
-#: builtin/stash.c:633
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Porzucono %s (%s)"
-#: builtin/stash.c:636
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Nie można porzucić wpisu ze schowka"
-#: builtin/stash.c:649
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s” nie wskazuje na zmiany ze schowka"
-#: builtin/stash.c:699
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Wpis pozostaje w schowku w razie, gdyby miał być znów potrzebny."
-#: builtin/stash.c:722
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Nie określono nazwy gałęzi"
-#: builtin/stash.c:866 builtin/stash.c:903
+#: builtin/stash.c:824
+msgid "failed to parse tree"
+msgstr "nie można przetworzyć drzewa"
+
+#: builtin/stash.c:835
+msgid "failed to unpack trees"
+msgstr "nie można rozpakować drzew"
+
+#: builtin/stash.c:855
+msgid "include untracked files in the stash"
+msgstr "uwzględnij nieśledzone pliki w schowku"
+
+#: builtin/stash.c:858
+msgid "only show untracked files in the stash"
+msgstr "pokaż tylko nieśledzone pliki w schowku"
+
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Nie można zaktualizować %s o %s"
-#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "komunikat skrytki"
-#: builtin/stash.c:894
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "„git stash store” wymaga jednego argumentu z <zapisem>"
-#: builtin/stash.c:1109
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Nie wybrano zmian"
-#: builtin/stash.c:1209
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Nie masz jeszcze początkowego zapisu"
-#: builtin/stash.c:1236
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Nie można zapisać bieżącego stanu indeksu"
-#: builtin/stash.c:1245
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Nie można zapisać nieśledzonych plików"
-#: builtin/stash.c:1256 builtin/stash.c:1265
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Nie można zapisać bieżącego stanu drzewa roboczego"
-#: builtin/stash.c:1293
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Nie można zapisać stanu drzewa roboczego"
-#: builtin/stash.c:1342
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Nie można jednocześnie użyć --patch i --include-untracked lub --all"
-#: builtin/stash.c:1358
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Czyżby zabrakło „git add”?"
-#: builtin/stash.c:1373
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Brak lokalnych zmian do zapisania"
-#: builtin/stash.c:1380
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Nie można zainicjować schowka"
-#: builtin/stash.c:1395
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Nie można zachować bieżącego stanu"
-#: builtin/stash.c:1400
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Zapisano katalog roboczy i stan indeksu %s"
-#: builtin/stash.c:1490
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Nie można usunąć zmian w drzewie roboczym"
-#: builtin/stash.c:1529 builtin/stash.c:1594
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "zachowaj indeks"
-#: builtin/stash.c:1531 builtin/stash.c:1596
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "dodaj do schowka w trybie łatki"
-#: builtin/stash.c:1532 builtin/stash.c:1597
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "tryb cichy"
-#: builtin/stash.c:1534 builtin/stash.c:1599
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "uwzględnij nieśledzone pliki w schowku"
-#: builtin/stash.c:1536 builtin/stash.c:1601
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "uwzględnij pomijane pliki"
-#: builtin/stash.c:1636
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22095,73 +22789,21 @@
msgid "prepend comment character and space to each line"
msgstr "dodaj znak komentarza i odstęp przed każdym wierszem"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Oczekiwano pełnej nazwy referencji, otrzymano %s"
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote nie przyjmuje argumentów"
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "nie można odciąć jednego komponentu z adresu „%s”"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
-msgid "alternative anchor for relative paths"
-msgstr "alternatywne zakotwiczenie ścieżek względnych"
-
-#: builtin/submodule--helper.c:415
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
-
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Nie znaleziono adresu dla ścieżki pod-modułu „%s” w .gitmodules"
-
-#: builtin/submodule--helper.c:524
-#, c-format
-msgid "Entering '%s'\n"
-msgstr "Otwieranie „%s”\n"
-
-#: builtin/submodule--helper.c:527
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
-msgstr ""
-"run_command zwróciło niezerowy kod wyjścia z %s\n"
-"."
-
-#: builtin/submodule--helper.c:549
-#, c-format
-msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
-"."
-msgstr ""
-"run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
-"zagnieżdżonych pod-modułów %s\n"
-"."
-
-#: builtin/submodule--helper.c:565
-msgid "suppress output of entering each submodule command"
-msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia pod-modułu"
-
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
-msgid "recurse into nested submodules"
-msgstr "schodź do zagnieżdżonych pod-modułów"
-
-#: builtin/submodule--helper.c:572
-msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
-
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:211
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22170,207 +22812,259 @@
"nie odnaleziono konfiguracji „%s”. Zakładam, że to repozytorium jest samo "
"sobie nadrzędnym."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+msgid "alternative anchor for relative paths"
+msgstr "alternatywne zakotwiczenie ścieżek względnych"
+
+#: builtin/submodule--helper.c:410
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nie znaleziono adresu dla ścieżki podmodułu „%s” w .gitmodules"
+
+#: builtin/submodule--helper.c:520
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Otwieranie „%s”\n"
+
+#: builtin/submodule--helper.c:523
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia z %s\n"
+"."
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
+"zagnieżdżonych podmodułów %s\n"
+"."
+
+#: builtin/submodule--helper.c:561
+msgid "suppress output of entering each submodule command"
+msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia podmodułu"
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
+msgid "recurse into nested submodules"
+msgstr "schodź do zagnieżdżonych podmodułów"
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
+
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "Nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+msgstr "Nie można zarejestrować adresu do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "Zarejestrowano pod-moduł „%s” (%s) w „%s”\n"
+msgstr "Zarejestrowano podmoduł „%s” (%s) w „%s”\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w pod-module „%s”\n"
+"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w podmodule „%s”\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki pod-modułu „%s”"
+msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
-msgstr "powstrzymaj wyjście przy inicjalizacji pod-modułu"
+msgstr "powstrzymaj wyjście przy inicjalizacji podmodułu"
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opcje>] [<ścieżka>]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "nie znaleziono w .gitmodules przypisania pod-modułów dla ścieżki „%s”"
+msgstr "nie znaleziono w .gitmodules przypisania podmodułów dla ścieżki „%s”"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "nie można rozwiązać referencji HEAD w pod-module „%s”"
+msgstr "nie można rozwiązać referencji HEAD w podmodule „%s”"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "Nie można zejść do pod-modułu „%s”"
+msgstr "Nie można zejść do podmodułu „%s”"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
-msgstr "powstrzymaj wyjście stanu pod-modułów"
+msgstr "powstrzymaj wyjście stanu podmodułów"
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
-msgstr "użyj zapisu z indeksu zamiast tego z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast tego z HEAD podmodułu"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ścieżka>...]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ścieżka>"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
-msgstr "* %s %s(blob)->%s(pod-moduł)"
+msgstr "* %s %s(blob)->%s(podmoduł)"
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
-msgstr "* %s %s(pod-moduł)->%s(blob)"
+msgstr "* %s %s(podmoduł)->%s(blob)"
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "nie można skrócić obiektu z „%s”"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "nieoczekiwany tryb %o\n"
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr "użyj zapisu z indeksu zamiast z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast z HEAD podmodułu"
-#: builtin/submodule--helper.c:1302
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "aby porównać zapis w indeksie z tym z HEAD pod-modułu"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "porównaj zapis w indeksie z tym z HEAD podmodułu"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr "pomiń pod-moduły z wartością „ignore_config” ustawioną na „all”"
+msgstr "pomiń podmoduły z wartością „ignore_config” ustawioną na „all”"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "ogranicz rozmiar podsumowania"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<opcje>] [<zapis>] [--] [<ścieżka>]"
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "nie można pobrać rewizji dla HEAD"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached i --files się wykluczają"
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
-msgstr "Synchronizowanie adresu URL pod-modułu w „%s”\n"
+msgstr "Synchronizowanie adresu URL podmodułu w „%s”\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+msgstr "nie można zarejestrować adresu do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
-msgstr "nie można uzyskać domyślnego zdalnego repozytorium pod-modułu „%s”"
+msgstr "nie można uzyskać domyślnego zdalnego repozytorium podmodułu „%s”"
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
-msgstr "nie można zaktualizować zdalnego repozytorium pod-modułu „%s”"
+msgstr "nie można zaktualizować zdalnego repozytorium podmodułu „%s”"
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
-msgstr "powstrzymaj wyjście przy synchronizacji adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy synchronizacji adresu podmodułu"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ścieżka>]"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-"Drzewo robocze pod-modułu „%s” zawiera katalog .git (użyj „rm -rf” jeśli na "
+"Drzewo robocze podmodułu „%s” zawiera katalog .git (użyj „rm -rf” jeśli na "
"pewno chcesz je usunąć wraz z całą jego historią)"
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-"Drzewo robocze pod-modułu „%s” zawiera lokalne zmiany; użyj „-f”, aby je "
+"Drzewo robocze podmodułu „%s” zawiera lokalne zmiany; użyj „-f”, aby je "
"odrzucić"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Wyczyszczono katalog „%s”\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
-msgstr "Nie można usunąć drzewa roboczego pod-modułu „%s”\n"
+msgstr "Nie można usunąć drzewa roboczego podmodułu „%s”\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
-msgstr "nie można utworzyć pustego katalogu pod-modułu „%s”"
+msgstr "nie można utworzyć pustego katalogu podmodułu „%s”"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr "Wyrejestrowano pod-moduł „%s” (%s) ze ścieżki „%s”\n"
+msgstr "Wyrejestrowano podmoduł „%s” (%s) ze ścieżki „%s”\n"
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
-msgstr "usuń drzewa robocze pod-modułów, nawet jeśli zawierają lokalne zmiany"
+msgstr "usuń drzewa robocze podmodułów, nawet jeśli zawierają lokalne zmiany"
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
-msgstr "wyrejestruj wszystkie pod-moduły"
+msgstr "wyrejestruj wszystkie podmoduły"
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ścieżka>...]]"
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Użyj „--all” jeśli na pewno chcesz odinicjalizować wszystkie podmoduły."
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22382,47 +23076,68 @@
"submodule.alternateErrorStrategy na „info” lub, równoważnie, sklonuj\n"
"z „--reference-if-able” zamiast „--reference”."
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
-msgstr "pod-moduł „%s” nie może dodać alternatywnego położenia: %s"
+msgstr "podmoduł „%s” nie może dodać alternatywnego położenia: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Wartość „%s” dla submodule.alternateErrorStrategy nie jest rozpoznawana"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wartość „%s” dla submodule.alternateLocation nie jest rozpoznawana"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1771
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "odmawiam utworzenia/użyj „%s” w katalogu gita innego podmodułu"
+
+#: builtin/submodule--helper.c:1812
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "klonowanie „%s” do ścieżki podmodułu „%s” nie powiodło się"
+
+#: builtin/submodule--helper.c:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalog nie jest pusty: „%s”"
+
+#: builtin/submodule--helper.c:1829
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "nie można uzyskać katalogu podmodułu dla „%s”"
+
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
-msgstr "dokąd zostanie sklonowany nowy pod-moduł"
+msgstr "dokąd zostanie sklonowany nowy podmoduł"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
-msgstr "nazwa nowego pod-modułu"
+msgstr "nazwa nowego podmodułu"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
-msgstr "adres, skąd sklonować pod-moduł"
+msgstr "adres, skąd sklonować podmoduł"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "głębokość płytkich klonów"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "wymuś postęp klonowania"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "nie pozwól sklonować do niepustego katalogu"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22432,189 +23147,373 @@
"<repozytorium>] [--name <nazwa>] [--depth <głębokość>] [--single-branch] --"
"url <adres> --path <ścieżka>"
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "odmawiam utworzenia/użyj „%s” w katalogu gita innego pod-modułu"
-
-#: builtin/submodule--helper.c:1884
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "klonowanie „%s” do ścieżki pod-modułu „%s” nie powiodło się"
-
-#: builtin/submodule--helper.c:1888
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "katalog nie jest pusty: „%s”"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "nie można uzyskać katalogu pod-modułu dla „%s”"
-
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Nieprawidłowy tryb aktualizacji „%s” do ścieżki pod-modułu „%s”"
+msgstr "Nieprawidłowy tryb aktualizacji „%s” do ścieżki podmodułu „%s”"
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-"Nieprawidłowy tryb aktualizacji „%s” ustawiony w ścieżce pod-modułu „%s”"
+"Nieprawidłowy tryb aktualizacji „%s” ustawiony w ścieżce podmodułu „%s”"
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "Ścieżka pod-modułu „%s” niezainicjowana"
+msgstr "Ścieżka podmodułu „%s” niezainicjowana"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Może chcesz użyć „update --init”?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
-msgstr "Pomijanie niescalonego pod-modułu %s"
+msgstr "Pomijanie niescalonego podmodułu %s"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
-msgstr "Pomijanie pod-modułu „%s”"
+msgstr "Pomijanie podmodułu „%s”"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Nie można sklonować „%s”. Zaplanowano ponowienie"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Nie można sklonować „%s” drugi raz, przerywanie"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Nie można wybrać „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Nie można przestawić „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Nie można scalić „%s” w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Wykonanie „%s %s” nie powiodło się w ścieżce podmodułu „%s”"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: wybrano „%s”\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: przestawiono na „%s”\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ścieżka podmodułu „%s”: scalono w „%s”\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ścieżka podmodułu „%s”: „%s %s”\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Nie można pobrać w ścieżce podmodułu „%s”; próba bezpośredniego pobrania %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Pobrano w ścieżce podmodułu „%s”, ale nie zawierał on %s. Bezpośrednie "
+"pobieranie tego zapisu nie powiodło się."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "ścieżka w drzewie roboczym"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
-msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych pod-modułów"
+msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych podmodułów"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout lub none"
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "utwórz płytki klon ucięty do podanej liczby rewizji"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "równoległe zadania"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "czy początkowy klon powinien zgadzać się z zaleceniem płytkości"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "nie wypisuj postępu klonowania"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<ścieżka>] [<ścieżka>...]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "zła wartość parametru aktualizacji"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "powstrzymaj wyjście przy aktualizacje przez przestawienie lub scalenie"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "wymuś aktualizacje wybrania"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "nie pobieraj nowych obiektów ze zdalnego miejsca"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "wymusza tryb aktualizacji, jeśli repozytorium jest świeżym klonem"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "głębokość płytkiego pobrania"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 oczekiwane przez projekt nadrzędny"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "pod-sha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 czoła (HEAD) podmodułu"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<opcje>] <ścieżka>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-"Gałąź pod-modułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
+"Gałąź podmodułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
"nad-projekt nie jest na żadnej gałęzi"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
-msgstr "nie można uzyskać uchwytu repozytorium pod-modułu dla „%s”"
+msgstr "nie można uzyskać uchwytu repozytorium podmodułu dla „%s”"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opcje>] [<ścieżka>...]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "sprawdź, czy bezpiecznie jest zapisać plik .gitmodules"
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "usuń konfigurację z pliku .gitmodules"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nazwa> [<wartość>]"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nazwa>"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "upewnij się, że plik .gitmodules jest w drzewie roboczym"
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
-msgstr "powstrzymaj wyjście przy ustawianiu adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy ustawianiu adresu podmodułu"
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <ścieżka> <nowy-adres>"
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "ustaw domyślną gałąź śledzącą na master"
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "ustaw domyślną gałąź śledzącą"
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ścieżka>"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gałąź> <ścieżka>"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "wymagane --branch lub --default"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch i --default się wykluczają"
-#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#: builtin/submodule--helper.c:3037
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Dodawanie istniejącego repozytorium z „%s” do indeksu\n"
+
+#: builtin/submodule--helper.c:3040
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "„%s” już istnieje i nie jest prawidłowym repozytorium gita"
+
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Katalog gita podmodułu „%s” znaleziono lokalnie na zdalnych repozytoriach:\n"
+
+#: builtin/submodule--helper.c:3060
+#, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
+"klonować z\n"
+" %s\n"
+"użyj opcji „--force”. Jeśli lokalny katalog gita nie leży w prawidłowym "
+"repozytorium\n"
+"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
+"name”."
+
+#: builtin/submodule--helper.c:3072
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reaktywacja lokalnego katalogu gita w podmodule „%s”\n"
+
+#: builtin/submodule--helper.c:3109
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "nie można wybrać podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Nie można dodać podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Nie można zarejestrować podmodułu „%s”"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s” już widnieje w indeksie"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "„%s” już widnieje w indeksie i nie jest podmodułem"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "gałąź repozytorium do dodania jako podmoduł"
+
+#: builtin/submodule--helper.c:3254
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "pozwól dodać normalnie ignorowaną ścieżkę podmodułu"
+
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "wypisz tylko komunikaty błędów"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "pożycz obiekty z repozytoriów odniesienia"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"ustawia nazwę podmodułu na podany ciąg zamiast używać domyślnie jego ścieżki"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opcje>] [--] <repozytorium> [<ścieżka>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Ścieżki względnej można użyć tylko ze szczytu drzewa roboczego"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"URL repozytorium: „%s” musi być ścieżką bezwzględną lub zaczynać się "
+"od ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s” nie jest prawidłową nazwą podmodułu"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s nie wspiera --super-prefix"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s” nie jest prawidłowym pod-poleceniem submodule--helper"
@@ -22627,33 +23526,33 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nazwa>"
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "nie wypisuj błędów przy nie-symbolicznych (odłączonych) referencjach"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
msgstr "usuń referencję symboliczną"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
msgstr "skróć wyjściową referencję"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "powód"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "powód aktualizacji"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
-"\t\t<tag> [<czoło>]"
+" <tag> [<czoło>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -22663,29 +23562,29 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <zapis>] [--no-contains <zapis>] [--"
"points-at <obiekt>]\n"
-"\t\t[--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
+" [--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
"[<wzorzec>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nazwa-tagu>..."
-#: builtin/tag.c:89
+#: builtin/tag.c:100
#, c-format
msgid "tag '%s' not found."
msgstr "nie znaleziono tagu „%s”."
-#: builtin/tag.c:124
+#: builtin/tag.c:135
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Usunięto tag „%s” (wskazywał %s)\n"
-#: builtin/tag.c:159
+#: builtin/tag.c:170
#, c-format
msgid ""
"\n"
@@ -22698,7 +23597,7 @@
" %s\n"
"Wiersze zaczynające się od „%c” zostaną zignorowane.\n"
-#: builtin/tag.c:163
+#: builtin/tag.c:174
#, c-format
msgid ""
"\n"
@@ -22713,11 +23612,11 @@
"Wiersze zaczynające się od „%c” będą zachowane; możesz je sam(a) usunąć, "
"jeśli chcesz.\n"
-#: builtin/tag.c:230
+#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr "nie można podpisać tagu"
-#: builtin/tag.c:248
+#: builtin/tag.c:259
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -22730,139 +23629,139 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:264
+#: builtin/tag.c:275
msgid "bad object type."
msgstr "zły rodzaj obiektu."
-#: builtin/tag.c:317
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "brak komunikatu tagu?"
-#: builtin/tag.c:324
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Pozostawiono komunikat tagu w %s\n"
-#: builtin/tag.c:435
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "wypisz nazwy tagów"
-#: builtin/tag.c:437
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "wypisz <n> wierszy każdego komunikatu tagu"
-#: builtin/tag.c:439
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "usuń tagi"
-#: builtin/tag.c:440
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "weryfikuj tagi"
-#: builtin/tag.c:442
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Opcje tworzenia tagów"
-#: builtin/tag.c:444
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "opisz tag, potrzebuje komunikatu"
-#: builtin/tag.c:446
+#: builtin/tag.c:455
msgid "tag message"
msgstr "wiadomość tagu"
-#: builtin/tag.c:448
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "wymuś edycję komunikatu tagu"
-#: builtin/tag.c:449
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "tag opisany i podpisany GPG"
-#: builtin/tag.c:452
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "użyj innego klucza do podpisania tagu"
-#: builtin/tag.c:453
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "zamień tag, jeśli istnieje"
-#: builtin/tag.c:454 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "utwórz dziennik referencji"
-#: builtin/tag.c:456
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Opcje wypisywania tagów"
-#: builtin/tag.c:457
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "pokaż listę tagów w kolumnach"
-#: builtin/tag.c:458 builtin/tag.c:460
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "wypisz tylko tagi zawierające ten zapis"
-#: builtin/tag.c:459 builtin/tag.c:461
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "wypisz tylko tagi nie zawierające tego zapisu"
-#: builtin/tag.c:462
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "wypisz tylko scalone tagi"
-#: builtin/tag.c:463
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "wypisz tylko niescalone tagi"
-#: builtin/tag.c:467
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "wypisz tylko tagi tego obiektu"
-#: builtin/tag.c:515
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column i -n się wykluczają"
-#: builtin/tag.c:537
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
-msgstr "opcja -n może być użyta tylko w trybie wymieniania"
+msgstr "opcji -n można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:539
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
-msgstr "opcja --contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --contains można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:541
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
-msgstr "opcja --no-contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --no-contains można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:543
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
-msgstr "opcja --points-at może być użyta tylko w trybie wymieniania"
+msgstr "opcji --points-at można użyć tylko w trybie wymieniania"
-#: builtin/tag.c:545
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opcje --merged i --no-merged mogą być użyte tylko w trybie wymieniania"
-#: builtin/tag.c:556
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "-F i -m się wykluczają."
-#: builtin/tag.c:581
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s” nie jest prawidłową nazwą tagu."
-#: builtin/tag.c:586
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "tag „%s” już istnieje"
-#: builtin/tag.c:617
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Zaktualizowano tag „%s” (wskazywał %s)\n"
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "Rozpakowywanie obiektów"
@@ -22871,56 +23770,51 @@
msgid "failed to create directory %s"
msgstr "nie można utworzyć katalogu %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "nie można utworzyć pliku %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "nie można usunąć pliku %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "nie można usunąć katalogu %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Sprawdzanie czasu modyfikacji „%s” "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego pliku"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego katalogu"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "informacje stat katalogu zmieniają się po zaktualizowaniu pliku"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"informacje stat katalogu zmieniają się po usunięciu pliku w podkatalogu"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "informacje stat katalogu nie zmieniają się po usunięciu pliku"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "informacje stat katalogu nie zmieniają się po usunięciu katalogu"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcje>] [--] [<plik>...]"
@@ -22930,7 +23824,7 @@
#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
-msgstr "odświeżanie: ignoruj pod-moduły"
+msgstr "odświeżanie: ignoruj podmoduły"
#: builtin/update-index.c:980
msgid "do not ignore new files"
@@ -23135,19 +24029,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcje>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "usuń referencję"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "zaktualizuj <referencję>, a nie tę, na którą wskazuje"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "wejście ma argumenty rozdzielone NULami"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "wczytaj aktualizacje ze standardowego wejścia"
@@ -23163,19 +24057,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcje>] <katalog>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "wyjdź po pojedynczej wymianie żądania/odpowiedzi"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "zaserwuj informacje/referencje do git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "nie sprawdzaj <katalog>/.git/ jeśli <katalog> nie jest katalogiem Gita"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "przerwij przesyłanie po <n> sekundach nieaktywności"
@@ -23211,63 +24105,58 @@
msgid "print tag contents"
msgstr "wypisz zawartość tagu"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcje>] <ścieżka> [<zapis>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcje>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcje>] <ścieżka>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <drzewo-robocze> <nowa-ścieżka>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcje>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opcje>] <drzewo-robocze>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ścieżka>"
-#: builtin/worktree.c:61 builtin/worktree.c:933
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "nie można skasować „%s”"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Usuwanie %s/%s: %s"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "zgłaszaj przycięte drzewa robocze"
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "wygaś drzewa robocze starsze niż <czas>"
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "„%s” już istnieje"
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "cel drzewa roboczego „%s” nie nadaje się do użytku"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23277,7 +24166,7 @@
"użyj „%s -f -f”, aby wymusić, lub „unlock” i „prune” lub „remove”, aby "
"wyczyścić"
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23286,129 +24175,140 @@
"„%s” jest brakującym, ale już zarejestrowanym drzewem roboczym;\n"
"użyj „%s -f”, aby wymusić, bądź „prune” lub „remove”, aby wyczyścić"
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "nie można utworzyć katalogu „%s”"
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "inicjowanie"
+
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Przygotowywanie drzewa roboczego (nowa gałąź „%s”)"
-#: builtin/worktree.c:424
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Przygotowywanie drzewa roboczego (resetowanie gałęzi „%s”; była na %s)"
-#: builtin/worktree.c:433
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Przygotowywanie drzewa roboczego (wybieranie „%s”)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Przygotowywanie drzewa roboczego (oddzielone HEAD %s)"
-#: builtin/worktree.c:480
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "wybierz <gałąź> nawet jeśli już jest wybrana w innym drzewie roboczym"
-#: builtin/worktree.c:483
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "utwórz nową gałąź"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "utwórz lub zresetuj gałąź"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "wypełnij nowe drzewo robocze"
-#: builtin/worktree.c:488
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "pozostaw nowe drzewo robocze zablokowane"
-#: builtin/worktree.c:491
-msgid "set up tracking mode (see git-branch(1))"
-msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
-
-#: builtin/worktree.c:494
-msgid "try to match the new branch name with a remote-tracking branch"
-msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
-
-#: builtin/worktree.c:502
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach się wykluczają"
-
-#: builtin/worktree.c:563
-msgid "--[no-]track can only be used if a new branch is created"
-msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
-
-#: builtin/worktree.c:680
-msgid "show extended annotations and reasons, if available"
-msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
-
-#: builtin/worktree.c:682
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia”"
-
-#: builtin/worktree.c:691
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose i --porcelain się wykluczają"
-
-#: builtin/worktree.c:718
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "powód blokady"
-#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
-#: builtin/worktree.c:961
+#: builtin/worktree.c:496
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
+
+#: builtin/worktree.c:499
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
+
+#: builtin/worktree.c:507
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B i --detach się wykluczają"
+
+#: builtin/worktree.c:509
+msgid "--reason requires --lock"
+msgstr "--reason wymaga --lock"
+
+#: builtin/worktree.c:513
+msgid "added with --lock"
+msgstr "dodane przez --lock"
+
+#: builtin/worktree.c:575
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
+
+#: builtin/worktree.c:692
+msgid "show extended annotations and reasons, if available"
+msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
+
+#: builtin/worktree.c:694
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia”"
+
+#: builtin/worktree.c:703
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose i --porcelain się wykluczają"
+
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s” nie jest drzewem roboczym"
-#: builtin/worktree.c:732 builtin/worktree.c:765
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Główne drzewo robocze nie może być blokowane ani odblokowywane"
-#: builtin/worktree.c:737
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s” już jest zablokowany, powód: %s"
-#: builtin/worktree.c:739
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "„%s” już jest zablokowany"
-#: builtin/worktree.c:767
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "„%s” nie jest zablokowany"
-#: builtin/worktree.c:808
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
-"nie można przenosić ani usuwać drzew roboczych zawierających pod-moduły"
+msgstr "nie można przenosić ani usuwać drzew roboczych zawierających podmoduły"
-#: builtin/worktree.c:816
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr ""
"wymuś przeniesienie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
-#: builtin/worktree.c:839 builtin/worktree.c:963
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s” jest głównym drzewem roboczym"
-#: builtin/worktree.c:844
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "nie można uzyskać nazwy celu z „%s”"
-#: builtin/worktree.c:857
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23417,7 +24317,7 @@
"nie można przenieść zablokowanego drzewa roboczego, powód blokady: %s\n"
"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:859
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23425,38 +24325,38 @@
"nie można przenieść zablokowanego drzewa roboczego;\n"
"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:862
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "sprawdzenie nie powiodło się, nie można przenieść drzewa roboczego: %s"
-#: builtin/worktree.c:867
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "nie można przenieść „%s” do „%s”"
-#: builtin/worktree.c:913
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "nie można wykonać „git status” na „%s”"
-#: builtin/worktree.c:917
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s” zawiera zmienione lub nieśledzone pliki, użyj --force, aby skasować"
-#: builtin/worktree.c:922
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "nie można wykonać „git status” na „%s”, kod %d"
-#: builtin/worktree.c:945
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"wymuś usunięcie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
-#: builtin/worktree.c:968
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23465,7 +24365,7 @@
"nie można usunąć zablokowanego drzewa roboczego, powód blokady: %s\n"
"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:970
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23473,17 +24373,17 @@
"nie można usunąć zablokowanego drzewa roboczego;\n"
"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
-#: builtin/worktree.c:973
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "sprawdzenie nie powiodło się, nie można usunąć drzewa roboczego: %s"
-#: builtin/worktree.c:997
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "naprawa: %s: %s"
-#: builtin/worktree.c:1000
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "błąd: %s: %s"
@@ -23504,40 +24404,6 @@
msgid "only useful for debugging"
msgstr "przydatne tylko do odpluskwiania"
-#: http-fetch.c:114
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s”)"
-
-#: http-fetch.c:122
-msgid "not a git repository"
-msgstr "to nie jest repozytorium gita"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "nieprzetworzone opcje"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "błąd w przygotowywaniu rewizji"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "zapis %s nie jest oznaczony jako osiągalny"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "za dużo zapisów oznaczono jako osiągalne"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opcje>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
-
#: git.c:28
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -23549,12 +24415,12 @@
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <ścieżka>] [-c <nazwa>=<wartość>]\n"
-" [--exec-path[=<ścieżka>]] [--html-path] [--man-path]"
-" [--info-path]\n"
+" [--exec-path[=<ścieżka>]] [--html-path] [--man-path] [--info-"
+"path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
-" [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--namespace=<nazwa"
-">]\n"
+" [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--"
+"namespace=<nazwa>]\n"
" [--super-prefix=<ścieżka>] [--config-env=<nazwa>=<zmśrod>]\n"
" <polecenie> [<argumenty>]"
@@ -23597,22 +24463,27 @@
msgid "-c expects a configuration string\n"
msgstr "-c oczekuje łańcucha konfiguracji\n"
-#: git.c:292
+#: git.c:260
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "nie podano klucza ustawień do --config-env\n"
+
+#: git.c:300
#, c-format
msgid "no directory given for -C\n"
msgstr "nie podano katalogu do -C\n"
-#: git.c:318
+#: git.c:326
#, c-format
msgid "unknown option: %s\n"
msgstr "nieznana opcja: %s\n"
-#: git.c:367
+#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "podczas rozszerzania skrótu „%s”: „%s”"
-#: git.c:376
+#: git.c:384
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -23621,39 +24492,39 @@
"skrót „%s” zmienia zmienne środowiska.\n"
"Aby to zrobić, możesz użyć w skrócie „!git”"
-#: git.c:383
+#: git.c:391
#, c-format
msgid "empty alias for %s"
msgstr "pusty skrót dla %s"
-#: git.c:386
+#: git.c:394
#, c-format
msgid "recursive alias: %s"
msgstr "rekurencyjny skrót: %s"
-#: git.c:468
+#: git.c:476
msgid "write failure on standard output"
msgstr "błąd wypisywania na standardowe wyjście"
-#: git.c:470
+#: git.c:478
msgid "unknown write failure on standard output"
msgstr "nieznany błąd wypisywania na standardowe wyjście"
-#: git.c:472
+#: git.c:480
msgid "close failed on standard output"
msgstr "nie można zamknąć standardowego wyjścia"
-#: git.c:823
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "wykryto pętlę skrótów: rozwijanie „%s” nie kończy się: %s"
-#: git.c:873
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "nie można obsłużyć %s jako polecenia wbudowanego"
-#: git.c:886
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -23662,54 +24533,166 @@
"użycie: %s\n"
"\n"
-#: git.c:906
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"rozwinięcie skrótu „%s” nie powiodło się; „%s” nie jest poleceniem gita\n"
-#: git.c:918
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "nie można wykonać polecenia „%s”: %s\n"
-#: http.c:399
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s”)"
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "to nie jest repozytorium gita"
+
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile wymaga --index-pack-args"
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args można użyć tylko z --packfile"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "nieprzetworzone opcje"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "błąd w przygotowywaniu rewizji"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "zapis %s nie jest oznaczony jako osiągalny"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "za dużo zapisów oznaczono jako osiągalne"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcje>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
+
+#: t/helper/test-simple-ipc.c:581
+msgid "test-helper simple-ipc is-active [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active [<nazwa>] [<opcje>]"
+
+#: t/helper/test-simple-ipc.c:582
+msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon [<nazwa>] [<wątki>]"
+
+#: t/helper/test-simple-ipc.c:583
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<nazwa>] [<wątki>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:584
+msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon [<nazwa>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:585
+msgid "test-helper simple-ipc send [<name>] [<token>]"
+msgstr "test-helper simple-ipc send [<nazwa>] [<polecenie>]"
+
+#: t/helper/test-simple-ipc.c:586
+msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes [<nazwa>] [<liczba-bajtów>] [<bajt>]"
+
+#: t/helper/test-simple-ipc.c:587
+msgid ""
+"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple [<nazwa>] [<wątki>] [<liczba-bajtów>] "
+"[<rozmiar-wsadu>]"
+
+#: t/helper/test-simple-ipc.c:595
+msgid "name or pathname of unix domain socket"
+msgstr "nazwa lub ścieżka do gniazda domeny uniksowej"
+
+#: t/helper/test-simple-ipc.c:597
+msgid "named-pipe name"
+msgstr "nazwa nazwanego potoku"
+
+#: t/helper/test-simple-ipc.c:599
+msgid "number of threads in server thread pool"
+msgstr "liczba wątków w poletku wątków serwera"
+
+#: t/helper/test-simple-ipc.c:600
+msgid "seconds to wait for daemon to start or stop"
+msgstr "sekundy do odczekania przy włączaniu lub wyłączaniu demona"
+
+#: t/helper/test-simple-ipc.c:602
+msgid "number of bytes"
+msgstr "liczba bajtów"
+
+#: t/helper/test-simple-ipc.c:603
+msgid "number of requests per thread"
+msgstr "liczba żądań na wątek"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "byte"
+msgstr "bajt"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "ballast character"
+msgstr "znak balastowy"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "token"
+msgstr "polecenie"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "command token to send to the server"
+msgstr "polecenie do wysłania na serwer"
+
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "ujemna wartość http.postbuffer; użycie domyślnej %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrola powierzania niewspierana z cURLem < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Klucz publiczny niewspierany z cURLem < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Przypinanie kluczy publicznych niewspierane z cURLem < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE niewspierane z cURLem < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Niewspierany silnik SSL „%s”. Wspierane silniki SSL:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "Nie można ustawić silnika SSL na „%s”: cURL zbudowano bez silników SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Nie można ustawić silnika SSL na „%s”: już ustawiono"
-#: http.c:2025
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23725,133 +24708,138 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "nieprawidłowe cytowanie w wartości opcji wypchnięcia: „%s”"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nieprawidłowe: czy to jest repozytorium gita?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"nieprawidłowa odpowiedź serwera; oczekiwano usługi, otrzymano pakiet "
"wypróżnienia"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "nieprawidłowa odpowiedź serwera; otrzymano „%s”"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "nie znaleziono repozytorium „%s”"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Uwierzytelnienie nie powiodło się dla „%s”"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "nie można dostać się do „%s” z ustawieniem http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "brak dostępu do „%s”: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "przekierowanie do %s"
-#: remote-curl.c:642
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
"nie powinno być końca pliku, kiedy koniec pliku nie jest gładko obsługiwany"
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "zdalna maszyna wysłała bezstanowy separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "zdalny serwer wysłał nieoczekiwany pakiet końca odpowiedzi"
-#: remote-curl.c:724
+#: remote-curl.c:726
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"nie można cofnąć danych formularza rpc — spróbuj zwiększyć http.postBuffer"
-#: remote-curl.c:754
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: zły znak długości wiersza: %.4s"
-#: remote-curl.c:756
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: nieoczekiwany pakiet końca odpowiedzi"
-#: remote-curl.c:832
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "wywołanie RPC nie powiodło się; %s"
-#: remote-curl.c:872
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "nie można obsłużyć tak dużych wypchnięć"
-#: remote-curl.c:987
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "nie można skompresować żądania; błąd deflate zlib %d"
-#: remote-curl.c:991
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "nie można skompresować żądania; błąd end zlib %d"
-#: remote-curl.c:1041
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "otrzymano nagłówek długości %d bajtów"
-#: remote-curl.c:1043
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "nadal oczekuję na %d bajtów ciała"
-#: remote-curl.c:1132
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "tępy transport http nie wspiera płytkich możliwości"
-#: remote-curl.c:1147
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "pobieranie nie powiodło się."
-#: remote-curl.c:1193
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "nie można pobrać SHA-1 przez inteligentne http"
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "błąd protokołu: oczekiwano SHA/referencji, otrzymano „%s”"
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "transport http nie wspiera %s"
-#: remote-curl.c:1291
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push nie powiodło się"
-#: remote-curl.c:1479
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: użycie: git remote-curl <zdalne-repozytorium> [<adres>]"
-#: remote-curl.c:1511
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: błąd odczytu strumienia poleceń od gita"
-#: remote-curl.c:1518
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: próba pobrania bez lokalnego repozytorium"
-#: remote-curl.c:1559
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: nieznane polecenie „%s” z gita"
@@ -23864,11 +24852,11 @@
msgid "no libc information available\n"
msgstr "brak dostępnych informacji o bibliotece standardowej\n"
-#: list-objects-filter-options.h:91
+#: list-objects-filter-options.h:94
msgid "args"
msgstr "argumenty"
-#: list-objects-filter-options.h:92
+#: list-objects-filter-options.h:95
msgid "object filtering"
msgstr "filtrowanie obiektów"
@@ -23880,36 +24868,36 @@
msgid "no-op (backward compatibility)"
msgstr "nic nie robi (kompatybilność wsteczna)"
-#: parse-options.h:309
+#: parse-options.h:308
msgid "be more verbose"
msgstr "więcej komunikatów"
-#: parse-options.h:311
+#: parse-options.h:310
msgid "be more quiet"
msgstr "mniej komunikatów"
-#: parse-options.h:317
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "użyj <n> cyfr, aby wyświetlić nazwy obiektów"
-#: parse-options.h:336
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "jak usuwać odstępy i #komentarze z komunikatu"
-#: parse-options.h:337
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "wczytaj ścieżki z pliku"
-#: parse-options.h:338
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "przy --pathspec-from-file ścieżki są rozdzielone znakiem NUL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "klucz"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "nazwa pola, według którego należy posortować"
@@ -24441,7 +25429,7 @@
#: command-list.h:178
msgid "Initialize, update or inspect submodules"
-msgstr "Zainicjuj, zaktualizuj lub zbadaj pod-moduły"
+msgstr "Zainicjuj, zaktualizuj lub zbadaj podmoduły"
#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
@@ -24570,7 +25558,7 @@
#: command-list.h:210
msgid "Defining submodule properties"
-msgstr "Definiowanie właściwości pod-modułów"
+msgstr "Definiowanie właściwości podmodułów"
#: command-list.h:211
msgid "Git namespaces"
@@ -24604,41 +25592,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Przegląd zalecanych przepływów pracy z Gitem"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "przeszukanie nie powiodło się: nie podano polecenia."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "wykonywanie $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"kod wyjścia $res z „$command” jest <0 lub >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "przeszukanie nie może już kontynuować"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"„bisect-state $state” zakończyło się z kodem błędu $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "przeszukanie pomyślne"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24677,98 +25630,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Proste scalenie nie zadziałało, próba automatycznego scalenia."
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "Ścieżka względna może być użyta tylko ze szczytu drzewa roboczego"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"URL repozytorium: „$repo” musi być ścieżką bezwzględną lub zaczynać się "
-"od ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„$sm_path” już widnieje w indeksie"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„$sm_path” już widnieje w indeksie i nie jest pod-modułem"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "„$sm_path” nie ma wybranego zapisu"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Dodawanie istniejącego repozytorium z „$sm_path” do indeksu"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„$sm_path” już istnieje i nie jest prawidłowym repozytorium gita"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Katalog gita podmodułu „$sm_name” znaleziono lokalnie na zdalnych "
-"repozytoriach:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
-"klonować z\n"
-" $realrepo\n"
-"użyj opcji „--force”. Jeśli lokalny katalog gita nie leży w prawidłowym "
-"repozytorium\n"
-"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
-"name”."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reaktywacja lokalnego katalogu gita w podmodule „$sm_name”."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Nie można wybrać podmodułu „$sm_path”"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Nie można dodać podmodułu „$sm_path”"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Nie można zarejestrować podmodułu „$sm_path”"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Nie znaleziono aktualnej rewizji w ścieżce podmodułu „$displaypath”"
-#: git-submodule.sh:578
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Nie można pobrać w ścieżce podmodułu „$sm_path”"
-#: git-submodule.sh:583
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -24777,395 +25649,10 @@
"Nie znaleziono aktualnej rewizji ${remote_name}/${branch} w ścieżce pod-"
"modułu „$sm_path”"
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Nie można pobrać w ścieżce podmodułu „$displaypath”; próba bezpośredniego "
-"pobrania $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Pobrano w ścieżce podmodułu „$displaypath”, ale nie zawierał $sha1. "
-"Bezpośrednie pobieranie tego zapisu nie powiodło się."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można wybrać „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: wybrano „$sha1”"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można przestawić „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: przestawiono na „$sha1”"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można scalić „$sha1” w ścieżce podmodułu „$displaypath”"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: scalono w „$sha1”"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Wykonanie „$command $sha1” nie powiodło się w ścieżce podmodułu "
-"„$displaypath”"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ścieżka podmodułu „$displaypath”: „$command $sha1”"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Nie można zejść do ścieżki pod-modułu „$displaypath”"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Zastosowano zmiany z automatycznego schowka."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Nie można zachować $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
-"Twoje zmiany są bezpieczne w schowku.\n"
-"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Przestawianie ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Polecenia:\n"
-"p, pick <zapis> = dobierz zapis\n"
-"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
-"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
-"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
-"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
-"d, drop <zapis> = usuń zapis\n"
-"l, label <etykietka> = nazwij bieżące HEAD\n"
-"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
-"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
-"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Możesz teraz poprawić zapis przez\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: nie jest to zapis, który można dobrać"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nieprawidłowa nazwa zapisu: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Przewinięcie do $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Nie można przewinąć do $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Nie można przesunąć HEAD na $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Odmawiam spłaszczenia scalenia: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Błąd ponowienia scalenia $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Nie można dobrać $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "To jest komunikat zapisu nr ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "To jest połączenie $count zapisu."
-msgstr[1] "To jest połączenie $count zapisów."
-msgstr[2] "To jest połączenie $count zapisów."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Nie można zapisać $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "To jest połączenie dwóch zapisów."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Nie można zastosować $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
-"Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
-"niepowodzeniem\n"
-"skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
-"problem zanim\n"
-"uda się przeredagować zapis."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Zatrzymano na $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Nie można użyć „$squash_style” bez poprzedniego zapisu"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Wykonywanie: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Wykonywanie nie powiodło się: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Możesz naprawić problem i uruchomić\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Wykonanie powiodło się: $rest\n"
-"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
-"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Nieznane polecenie: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Napraw to używając „git rebase --edit-todo”."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Nie można usunąć CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"W drzewie roboczym są przygotowane zmiany.\n"
-"Jeśli mają być one spłaszczone\n"
-"z poprzednim zapisem, wykonaj:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"W obu przypadkach po zakończeniu, kontynuuj przez:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
-"i wtedy ponownie wykonaj „git rebase --continue”."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Nie udało się złożyć zmian ze schowka."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Nie można uruchomić edytora"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Nie można wybrać $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Brak HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Nie można utworzyć tymczasowego $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Nie można oznaczyć jako interaktywne"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
-msgstr[1] "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
-msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Zważ, że puste zapisy są wykomentowane"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Nie można zainicjować przerobionych zapisów"
+msgstr "Nie można zejść do ścieżki podmodułu „$displaypath”"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
@@ -25180,48 +25667,31 @@
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "krytyczny błąd: nie można użyć $program_name bez drzewa roboczego."
+msgstr "błąd krytyczny: nie można użyć $program_name bez drzewa roboczego."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Nie można przerobić gałęzi: Masz nieprzygotowane zmiany."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Nie można wykonać $action: Masz nieprzygotowane zmiany."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "Nie można wykonać $action: Twój indeks zawiera niezłożone zmiany."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dodatkowo, twój indeks zawiera niezłożone zmiany."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Musisz uruchomić to polecenie ze szczytu drzewa roboczego."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Nie można określić bezwzględnej ścieżki katalogu gita"
@@ -25561,34 +26031,39 @@
msgid "invalid argument %s, expecting --"
msgstr "nieprawidłowy argument %s, oczekiwano --"
-#: git-send-email.perl:138
+#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokalna strefa różni się od GMT o odstęp niepodzielny przez minutę\n"
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "przesunięcie czasu lokalnego większe lub równe 24 godzin\n"
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "błąd krytyczny: polecenie „%s” zakończyło się z kodem wyjścia %d"
+
+#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
msgstr "edytor nie wyszedł gładko, przerywanie wszystkiego"
-#: git-send-email.perl:312
+#: git-send-email.perl:316
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s” zawiera pośrednią wersję listu e-mail, który pisałeś/-aś.\n"
-#: git-send-email.perl:317
+#: git-send-email.perl:321
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final” zawiera napisany list e-mail.\n"
-#: git-send-email.perl:410
+#: git-send-email.perl:450
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases i inne opcje się wykluczają\n"
-#: git-send-email.perl:484
+#: git-send-email.perl:525
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25599,11 +26074,11 @@
"Ustaw sendemail.forbidSendmailVariables na false, aby wyłączyć to "
"sprawdzenie.\n"
-#: git-send-email.perl:489 git-send-email.perl:691
+#: git-send-email.perl:530 git-send-email.perl:746
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Nie można wykonać git format-patch poza repozytorium\n"
-#: git-send-email.perl:492
+#: git-send-email.perl:533
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -25611,37 +26086,37 @@
"„batch-size” i „relogin” muszą być podane razem (z wiersza poleceń lub opcji "
"konfiguracji)\n"
-#: git-send-email.perl:505
+#: git-send-email.perl:546
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Nieznane pole --suppress-cc: „%s”\n"
-#: git-send-email.perl:536
+#: git-send-email.perl:577
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Nieznane ustawienie --confirm: „%s”\n"
-#: git-send-email.perl:564
+#: git-send-email.perl:617
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "ostrzeżenie: skrót sendmaila z cudzysłowami niewspierany: %s\n"
-#: git-send-email.perl:566
+#: git-send-email.perl:619
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ostrzeżenie: „:include:” niewspierane: %s\n"
-#: git-send-email.perl:568
+#: git-send-email.perl:621
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "ostrzeżenie: przekierowania „/plik” i „|potok” niewspierane: %s\n"
-#: git-send-email.perl:573
+#: git-send-email.perl:626
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ostrzeżenie: nie rozpoznano wiersza sendmaila: %s\n"
-#: git-send-email.perl:657
+#: git-send-email.perl:711
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -25656,21 +26131,12 @@
" * mówiąc „./%s” jeśli masz na myśli plik; lub\n"
" * podając opcję --format-patch jeśli masz na myśli zakres.\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:732
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Nie można wykonać opendir na %s: %s"
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"błąd krytyczny: %s: %s\n"
-"ostrzeżenie: nie wysłano żadnych łatek\n"
-
-#: git-send-email.perl:713
+#: git-send-email.perl:767
msgid ""
"\n"
"No patch files specified!\n"
@@ -25680,17 +26146,17 @@
"Nie podano plików łatek!\n"
"\n"
-#: git-send-email.perl:726
+#: git-send-email.perl:780
#, perl-format
msgid "No subject line in %s?"
msgstr "Brak wiersza tematu w %s?"
-#: git-send-email.perl:736
+#: git-send-email.perl:791
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Nie można otworzyć %s do zapisu: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:802
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -25704,27 +26170,27 @@
"\n"
"Wyczyść zawartość treści, jeśli chcesz wysłać podsumowanie.\n"
-#: git-send-email.perl:771
+#: git-send-email.perl:826
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Nie można otworzyć %s: %s"
-#: git-send-email.perl:788
+#: git-send-email.perl:843
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Nie można otworzyć %s.final: %s"
-#: git-send-email.perl:831
+#: git-send-email.perl:886
msgid "Summary email is empty, skipping it\n"
msgstr "Podsumowanie listu e-mail jest puste, pomijanie\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
+#: git-send-email.perl:935
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Czy na pewno użyć <%s> [y/N]? "
-#: git-send-email.perl:921
+#: git-send-email.perl:990
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -25732,11 +26198,11 @@
"Następujące pliki są ośmiobitowe, ale nie deklarują kodowania Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:926
+#: git-send-email.perl:995
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Jakie ośmiobitowe kodowanie zadeklarować [UTF-8]? "
-#: git-send-email.perl:934
+#: git-send-email.perl:1003
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -25749,22 +26215,22 @@
"ma temat z szablonu „*** SUBJECT HERE ***”. Przekaż --force, jeśli naprawdę "
"chcesz to wysłać.\n"
-#: git-send-email.perl:953
+#: git-send-email.perl:1022
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Do kogo mają być wysłane listy e-mail (jeśli w ogóle)?"
-#: git-send-email.perl:971
+#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "błąd krytyczny: skrót „%s” rozwija się do siebie samego\n"
-#: git-send-email.perl:983
+#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID do użycia w In-Reply-To w pierwszym liście e-mail (jeśli w "
"ogóle)? "
-#: git-send-email.perl:1041 git-send-email.perl:1049
+#: git-send-email.perl:1114 git-send-email.perl:1122
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "błąd: nie można wydobyć prawidłowego adresu z: %s\n"
@@ -25772,16 +26238,16 @@
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1053
+#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Co zrobić z tym adresem? (wyjdź [q] | porzuć [d] | [e]dytuj): "
-#: git-send-email.perl:1370
+#: git-send-email.perl:1446
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "ścieżka CA „%s” nie istnieje"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1529
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -25808,135 +26274,773 @@
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1468
+#: git-send-email.perl:1544
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Wysłać ten list e-mail? (tak [y]|[n]ie|[e]dytuj|wyjdź [q]|wszystkie [a]):"
-#: git-send-email.perl:1471
+#: git-send-email.perl:1547
msgid "Send this email reply required"
msgstr "Wyślij ten list e-mail z wymaganą odpowiedzią"
-#: git-send-email.perl:1499
+#: git-send-email.perl:1581
msgid "The required SMTP server is not properly defined."
msgstr "Wymagany serwer SMTP nie jest prawidłowo zdefiniowany."
-#: git-send-email.perl:1546
+#: git-send-email.perl:1628
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Serwer nie wspiera STARTTLS! %s"
-#: git-send-email.perl:1551 git-send-email.perl:1555
+#: git-send-email.perl:1633 git-send-email.perl:1637
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "nie można wykonać STARTTLS! %s"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Nie można prawidłowo zainicjować SMTP. Sprawdź konfigurację i użyj --smtp-"
"debug."
-#: git-send-email.perl:1582
+#: git-send-email.perl:1664
#, perl-format
msgid "Failed to send %s\n"
msgstr "Nie można wysłać %s\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Wysłano na sucho %s\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
#, perl-format
msgid "Sent %s\n"
msgstr "Wysłano %s\n"
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
msgid "Dry-OK. Log says:\n"
msgstr "OK na sucho. Dziennik mówi:\n"
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
msgid "OK. Log says:\n"
msgstr "OK. Dziennik mówi:\n"
-#: git-send-email.perl:1599
+#: git-send-email.perl:1688
msgid "Result: "
msgstr "Wynik:"
-#: git-send-email.perl:1602
+#: git-send-email.perl:1691
msgid "Result: OK\n"
msgstr "Wynik: OK\n"
-#: git-send-email.perl:1620
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "nie można otworzyć pliku %s"
-#: git-send-email.perl:1667 git-send-email.perl:1687
+#: git-send-email.perl:1756 git-send-email.perl:1776
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1673
+#: git-send-email.perl:1762
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Dodawanie Do: %s z wiersza „%s”\n"
-#: git-send-email.perl:1730
+#: git-send-email.perl:1819
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(nie mbox) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1765
+#: git-send-email.perl:1854
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(treść) Dodawanie DW: %s z wiersza „%s”\n"
-#: git-send-email.perl:1876
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Nie można wykonać „%s”"
-#: git-send-email.perl:1883
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Dodawanie %s: %s z: „%s”\n"
-#: git-send-email.perl:1887
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) nie można zamknąć potoku do „%s”"
-#: git-send-email.perl:1917
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "nie można wysłać wiadomości jako siedmiobitowej"
-#: git-send-email.perl:1925
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "nieprawidłowe kodowanie przesyłu"
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#: git-send-email.perl:2059
+#, perl-format
+msgid ""
+"fatal: %s: rejected by sendemail-validate hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s: odrzucone przez skrypt sendemail-validate\n"
+"%s\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
+
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "nie można otworzyć %s: %s\n"
-#: git-send-email.perl:1969
+#: git-send-email.perl:2072
#, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s:%d ma więcej niż 998 znaków\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
-#: git-send-email.perl:1986
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Pomijanie %s z zapasowym sufiksem „%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1990
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Czy na pewno wysłać %s? [y | N]: "
+#, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Następujące ścieżki nie pasują do żadnej nadającej się ścieżki, ale "
+#~ "pasują do elementów\n"
+#~ "indeksu spoza bieżącego rzadkiego wybrania:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Wyłącz lub zmień zasady rzadkości jeśli zamierzasz zmieniać takie "
+#~ "elementy."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "nie można ustawić GIT_DIR na „%s”"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "otwarcie /dev/null nie powiodło się"
+
+#~ 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 ""
+#~ "po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+#~ "z „git add <ścieżki>” lub „git rm <ścieżki>”\n"
+#~ "i złóż wynik za pomocą „git commit”"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "otwarcie /dev/null lub dup() nie powiodło się"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "próba użycia rzadkiego indeksu bez trybu stożka"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "nie można zaktualizować drzewa pamięci podręcznej, pozostaje pełne"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Nie można otworzyć „%s” do zapisywania."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "nie można utworzyć pliku archiwum „%s”"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <dobre_określenie> "
+#~ "<złe_określenie> [<określenie>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "nie można utworzyć nowego pliku w „%s”"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: nie można otworzyć „%s”"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "nie można otworzyć pliku paczki „%s”"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "nie można zapisać pliku paczki"
+
+#~ msgid "cannot store index file"
+#~ msgstr "nie można zapisać pliku indeksu"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "wzorce wyłączające czytane są z <pliku>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Nieznana opcja merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista zadań do zrobienia się nie nadaje: „%s”"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opcje>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "przestawiaj zapisy scaleń"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "podpisuj zapisy"
+
+#~ msgid "continue rebase"
+#~ msgstr "kontynuuj przestawianie"
+
+#~ msgid "skip commit"
+#~ msgstr "pomiń zapis"
+
+#~ msgid "edit the todo list"
+#~ msgstr "edytuj listę zadań do zrobienia"
+
+#~ msgid "show the current patch"
+#~ msgstr "pokaż bieżącą łatkę"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "check the todo list"
+#~ msgstr "sprawdź listę zadań do zrobienia"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "zmień kolejność wierszy fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "wstaw polecenia exec na listę zadań do zrobienia"
+
+#~ msgid "onto"
+#~ msgstr "na"
+
+#~ msgid "restrict-revision"
+#~ msgstr "ogranicz-rewizję"
+
+#~ msgid "restrict revision"
+#~ msgstr "ogranicz rewizję"
+
+#~ msgid "squash-onto"
+#~ msgstr "spłaszcz-na"
+
+#~ msgid "squash onto"
+#~ msgstr "spłaszcz na"
+
+#~ msgid "the upstream commit"
+#~ msgstr "zapis głównego nurtu"
+
+#~ msgid "head-name"
+#~ msgstr "nazwa-czoła"
+
+#~ msgid "head name"
+#~ msgstr "nazwa czoła"
+
+#~ msgid "rebase strategy"
+#~ msgstr "strategia przestawiania"
+
+#~ msgid "strategy-opts"
+#~ msgstr "opcje-strategii"
+
+#~ msgid "strategy options"
+#~ msgstr "opcje strategii"
+
+#~ msgid "switch-to"
+#~ msgstr "przełącz-na"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gałąź lub zapis do wybrania"
+
+#~ msgid "onto-name"
+#~ msgstr "nazwa-na"
+
+#~ msgid "onto name"
+#~ msgstr "nazwa rewizji „na”"
+
+#~ msgid "cmd"
+#~ msgstr "polecenie"
+
+#~ msgid "the command to run"
+#~ msgstr "polecenie do wykonania"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "„--preserve-merges” i „--rebase-merges” się wykluczają"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "błąd: „--preserve-merges” i „--reschedule-failed-exec” się wykluczają"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<opcje>...] --url <url> --path <ścieżka> "
+#~ "--name <nazwa>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "nie można utworzyć pliku %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "gniazdo/potok już w użyciu: „%s”"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "nie można włączyć serwera na: „%s”"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "nie można uruchomić demona w tle"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid nie powiodło się"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "demon jeszcze nie odpowiada"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "demon się nie włączył"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid jest w szoku"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demon jeszcze się nie wyłączył"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "wykonywanie $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "„$sm_path” nie ma wybranego zapisu"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ścieżka podmodułu „$displaypath”: „$command $sha1”"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Zastosowano zmiany z automatycznego schowka."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Nie można zachować $stash_sha1"
+
+#~ 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 ""
+#~ "Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
+#~ "Twoje zmiany są bezpieczne w schowku.\n"
+#~ "Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Przestawianie ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Polecenia:\n"
+#~ "p, pick <zapis> = dobierz zapis\n"
+#~ "r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
+#~ "e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
+#~ "s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
+#~ "f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+#~ "x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
+#~ "d, drop <zapis> = usuń zapis\n"
+#~ "l, label <etykietka> = nazwij bieżące HEAD\n"
+#~ "t, reset <etykietka> = zresetuj HEAD do etykietki\n"
+#~ "m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
+#~ ". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
+#~ ". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
+#~ ". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+#~ "Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Możesz teraz poprawić zapis przez\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: nie jest to zapis, który można dobrać"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nieprawidłowa nazwa zapisu: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Przewinięcie do $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Nie można przewinąć do $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Nie można przesunąć HEAD na $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Odmawiam spłaszczenia scalenia: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Błąd ponowienia scalenia $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Nie można dobrać $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "To jest komunikat zapisu nr ${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "To jest połączenie $count zapisu."
+#~ msgstr[1] "To jest połączenie $count zapisów."
+#~ msgstr[2] "To jest połączenie $count zapisów."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Nie można zapisać $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "To jest połączenie dwóch zapisów."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Nie można zastosować $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
+#~ "Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
+#~ "niepowodzeniem\n"
+#~ "skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
+#~ "problem zanim\n"
+#~ "uda się przeredagować zapis."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Zatrzymano na $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Nie można użyć „$squash_style” bez poprzedniego zapisu"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Wykonywanie: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Wykonywanie nie powiodło się: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Możesz naprawić problem i uruchomić\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Wykonanie powiodło się: $rest\n"
+#~ "ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+#~ "Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Nieznane polecenie: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Napraw to używając „git rebase --edit-todo”."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Nie można usunąć CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "W drzewie roboczym są przygotowane zmiany.\n"
+#~ "Jeśli mają być one spłaszczone\n"
+#~ "z poprzednim zapisem, wykonaj:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "W obu przypadkach po zakończeniu, kontynuuj przez:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
+#~ "i wtedy ponownie wykonaj „git rebase --continue”."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Nie udało się złożyć zmian ze schowka."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Nie można uruchomić edytora"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Nie można wybrać $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Brak HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Nie można utworzyć tymczasowego $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Nie można oznaczyć jako interaktywne"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
+#~ msgstr[1] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
+#~ msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Zważ, że puste zapisy są wykomentowane"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Nie można zainicjować przerobionych zapisów"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone "
+#~ "zmiany."
+
+#~ msgid "--cached and --3way cannot be used together."
+#~ msgstr "--cached i --3way wykluczają się."
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
+
+#, c-format
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
+
+#~ msgid "both"
+#~ msgstr "obu"
+
+#~ msgid "one"
+#~ msgstr "jednej"
+
+#, c-format
+#~ msgid "Already up to date!"
+#~ msgstr "Już aktualne!"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "nie można zapisać bezstanowego pakietu separatora"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "Already up to date. Yeeah!"
+#~ msgstr "Już aktualne. Hurra!"
+
+#~ msgid "--batch-size option is only for 'repack' subcommand"
+#~ msgstr "opcja --batch-size jest tylko do pod-polecenia „repack”"
+
+#~ msgid "Percentage by which creation is weighted"
+#~ msgstr "Procent, według jakiego ważone jest tworzenie"
+
+#~ msgid ""
+#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "wsparcie rebase.useBuiltin zostało usunięte!\n"
+#~ "Zobacz szczegóły pod jego opisem w „git help config”."
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
+
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "zdalna maszyna wysłała bezstanowy separator"
+
+#, perl-format
+#~ msgid "%s: patch contains a line longer than 998 characters"
+#~ msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+
#~ msgid "rev-list died"
#~ msgstr "rev-list padło"
@@ -25999,7 +27103,7 @@
#~ msgstr "zbyt mało argumentów"
#~ msgid "Recurse into nested submodules"
-#~ msgstr "Schodź do zagnieżdżonych pod-modułów"
+#~ msgstr "Schodź do zagnieżdżonych podmodułów"
#~ msgid "too many params"
#~ msgstr "zbyt wiele parametrów"
@@ -26153,13 +27257,13 @@
#~ "the following submodules (or one of their nested submodules)\n"
#~ "use a .git directory:"
#~ msgstr[0] ""
-#~ "następujący pod-moduł (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujący podmoduł (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używa katalogu .git:"
#~ msgstr[1] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używają katalogu .git:"
#~ msgstr[2] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
#~ "używają katalogu .git:"
#~ msgid "push|fetch"
@@ -26171,9 +27275,6 @@
#~ msgid "print only names (no SHA-1)"
#~ msgstr "wypisz same nazwy (bez SHA-1)"
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcje>] <komunikat> HEAD <zapis>"
-
#~ msgid "standard output, or directory, which one?"
#~ msgstr "standardowe wyjście, lub katalog — które?"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b09f162..70e5c6d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,8 +1,8 @@
# Portugal's Portuguese translations for Git package.
-# Copyright (C) 2021 Daniel Santos <hello@brighterdan.com>
+# Copyright (C) 2021 Daniel Santos <daniel@brilhante.top>
# This file is distributed under the same license as the Git package.
# Contributors:
-# - Daniel Santos <hello@brighterdan.com>
+# - Daniel Santos <daniel@brilhante.top>
# Past Contributors:
# - Marco Sousa <marcomsousa AT gmail.com>
# - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
@@ -56,7 +56,7 @@
# fetch | buscar
# file system | sistema de ficheiro
# fixup | consertar
-# fork | ramificar
+# fork | fork
# Git archive | repositório
# gitfile | ficheiro-git
# grafts | enxertos
@@ -69,6 +69,7 @@
# index | cenário
# index entry | entrada do cenário
# init | inicializar
+# label | rótulo
# loose object | objeto solto
# loose refs | refs soltas
# mark | marca
@@ -98,7 +99,7 @@
# pull | agarrar
# push | atirar
# range | intervalo
-# reachable | acessível
+# reachable | alcançável
# rebase | rebasear
# record | registo
# ref | ref
@@ -144,7 +145,7 @@
# tree-ish (also treeish) | arvoredo
# unmerged | por juntar
# unpack | desempacotar
-# unreachable object | objeto inacessível
+# unreachable object | objeto inalcançável
# unstage | desencenar
# upstream | upstream
# upstream branch | ramo-upstream
@@ -195,6 +196,7 @@
# register | registar
# regular expression | expressão comum
# repack | reempacotar
+# require | exige
# save | guardar
# set | definir
# shell | shell
@@ -226,7 +228,7 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: add-interactive.c:376
-#, fuzzy, c-format
+#, c-format
msgid "Huh (%s)?"
msgstr "O quê (%s)?"
@@ -256,12 +258,11 @@
msgstr "Atualizar"
#: add-interactive.c:697 add-interactive.c:885
-#, fuzzy, c-format
+#, c-format
msgid "could not stage '%s'"
msgstr "incapaz de stage '%s'"
#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
-#, fuzzy
msgid "could not write index"
msgstr "incapaz de escrever index"
@@ -288,7 +289,6 @@
msgstr "Reverter"
#: add-interactive.c:775
-#, fuzzy
msgid "Could not parse HEAD^{tree}"
msgstr "Incapaz de parse HEAD^{tree}"
@@ -316,7 +316,7 @@
msgstr[1] "adicionei %d paths\n"
#: add-interactive.c:925
-#, fuzzy, c-format
+#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorando unmerged: %s"
@@ -339,7 +339,6 @@
msgstr "Rever diff"
#: add-interactive.c:1010
-#, fuzzy
msgid "show paths with changes"
msgstr "mostrar paths modificados"
@@ -352,12 +351,10 @@
msgstr "reverter conjunto das modificações staged de volta para a versão HEAD"
#: add-interactive.c:1016
-#, fuzzy
msgid "pick hunks and update selectively"
msgstr "apanha os pedaços e atualiza seletivamente"
#: add-interactive.c:1018
-#, fuzzy
msgid "view diff between HEAD and index"
msgstr "ver diff entre HEAD e índex"
@@ -372,17 +369,14 @@
msgstr "Prompt ajuda:"
#: add-interactive.c:1030
-#, fuzzy
msgid "select a single item"
msgstr "seleciona um único item"
#: add-interactive.c:1032
-#, fuzzy
msgid "select a range of items"
msgstr "seleciona um conjunto de items"
#: add-interactive.c:1034
-#, fuzzy
msgid "select multiple ranges"
msgstr "seleciona múltiplos conjuntos"
@@ -391,7 +385,6 @@
msgstr "seleciona item tendo base o prefixo único"
#: add-interactive.c:1038
-#, fuzzy
msgid "unselect specified items"
msgstr "tira a seleção de items especificados"
@@ -436,10 +429,9 @@
#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
#: git-add--interactive.perl:213
msgid "path"
-msgstr "path"
+msgstr "caminho"
#: add-interactive.c:1151
-#, fuzzy
msgid "could not refresh index"
msgstr "incapaz de reactualizar o index"
@@ -449,27 +441,26 @@
msgstr "Adeus.\n"
#: add-patch.c:34 git-add--interactive.perl:1431
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Stage modo de modificação [y,n,q,a,d%s,?]? "
#: add-patch.c:35 git-add--interactive.perl:1432
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Eliminação stage [y,n,q,a,d%s,?]? "
#: add-patch.c:36 git-add--interactive.perl:1433
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "Adição stage [y,n,q,a,d%s,?]? "
#: add-patch.c:37 git-add--interactive.perl:1434
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Stage este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:39
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -478,7 +469,6 @@
"imediatamente."
#: add-patch.c:42
-#, fuzzy
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -493,27 +483,26 @@
"d - retirar o stage deste pedaço e qualquer próximo pedaço neste ficheiro\n"
#: add-patch.c:56 git-add--interactive.perl:1437
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Esconder modo de modificação [y,n,q,a,d%s,?]? "
#: add-patch.c:57 git-add--interactive.perl:1438
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Eliminação da arrumação [y,n,q,a,d%s,?]? "
#: add-patch.c:58 git-add--interactive.perl:1439
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "Adição da arrumação [y,n,q,a,d%s,?]? "
#: add-patch.c:59 git-add--interactive.perl:1440
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Esconde este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:61
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -522,7 +511,6 @@
"arrumação imediatamente."
#: add-patch.c:64
-#, fuzzy
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -537,27 +525,26 @@
"d - mostrar este pedaço e qualquer próximo deste ficheiro\n"
#: add-patch.c:80 git-add--interactive.perl:1443
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Unstage modo de modificação [y,n,q,a,d%s,?]? "
#: add-patch.c:81 git-add--interactive.perl:1444
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Eliminação do unstage [y,n,q,a,d%s,?]? "
#: add-patch.c:82 git-add--interactive.perl:1445
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "Adição do unstage [y,n,q,a,d%s,?]? "
#: add-patch.c:83 git-add--interactive.perl:1446
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Unstage este pedaço [y,n,q,a,d%s,?]? "
#: add-patch.c:85
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -566,7 +553,6 @@
"marcado para unstage."
#: add-patch.c:88
-#, fuzzy
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -582,27 +568,26 @@
"ficheiro\n"
#: add-patch.c:103 git-add--interactive.perl:1449
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Submeter modo de modificação para index [y,n,q,a,d%s,?]? "
#: add-patch.c:104 git-add--interactive.perl:1450
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Submeter eliminação para index [y,n,q,a,d%s,?]? "
#: add-patch.c:105 git-add--interactive.perl:1451
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "Submeter adição para index [y,n,q,a,d%s,?]? "
#: add-patch.c:106 git-add--interactive.perl:1452
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Submeter este pedaço para index [y,n,q,a,d%s,?]? "
#: add-patch.c:108 add-patch.c:176 add-patch.c:221
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -611,7 +596,6 @@
"submissão imediatamente."
#: add-patch.c:111
-#, fuzzy
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -627,30 +611,29 @@
#: add-patch.c:126 git-add--interactive.perl:1455
#: git-add--interactive.perl:1473
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar modo de modificação da worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:127 git-add--interactive.perl:1456
#: git-add--interactive.perl:1474
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar eliminação da worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:128 git-add--interactive.perl:1457
#: git-add--interactive.perl:1475
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar adição da worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:129 git-add--interactive.perl:1458
#: git-add--interactive.perl:1476
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este pedaço da worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:131 add-patch.c:154 add-patch.c:199
-#, fuzzy
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -659,7 +642,6 @@
"descartado imediatamente."
#: add-patch.c:134 add-patch.c:202
-#, fuzzy
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -674,27 +656,26 @@
"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar modo de modificação de index e worktree [y,n,q,a,d%s,?]?"
#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar eliminação de index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar adição de index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este pedaço de index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:157
-#, fuzzy
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -709,27 +690,26 @@
"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Submeter modo de modificação para index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Submeter eliminação para index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Submeter adição para index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Submeter este pedaço para index e worktree [y,n,q,a,d%s,?]? "
#: add-patch.c:179
-#, fuzzy
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -744,7 +724,6 @@
"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
#: add-patch.c:224
-#, fuzzy
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -759,27 +738,25 @@
"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
#: add-patch.c:343
-#, fuzzy, c-format
+#, c-format
msgid "could not parse hunk header '%.*s'"
-msgstr "incapaz de analisar início de pedaço '%s'"
+msgstr "incapaz de processar início de pedaço '%.*s'"
#: add-patch.c:362 add-patch.c:366
-#, fuzzy, c-format
+#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "incapaz de analisar início de pedaço colorido '%.*s'"
#: add-patch.c:420
-#, fuzzy
msgid "could not parse diff"
msgstr "incapaz de analisar diff"
#: add-patch.c:439
-#, fuzzy
msgid "could not parse colored diff"
msgstr "incapaz de analisar diff colorido"
#: add-patch.c:453
-#, fuzzy, c-format
+#, c-format
msgid "failed to run '%s'"
msgstr "falhou executar '%s'"
@@ -796,7 +773,7 @@
"entre seu input e linhas output."
#: add-patch.c:791
-#, fuzzy, c-format
+#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
@@ -822,7 +799,7 @@
msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"
#: add-patch.c:1086
-#, fuzzy, c-format
+#, c-format
msgid ""
"---\n"
"To remove '%c' lines, make them ' ' lines (context).\n"
@@ -846,7 +823,6 @@
"é abortada e este pedaço é deixado inalterado.\n"
#: add-patch.c:1133
-#, fuzzy
msgid "could not parse hunk header"
msgstr "incapaz interpretar início de pedaço"
@@ -874,7 +850,6 @@
"para \"não\" descarta!) [y/n]? "
#: add-patch.c:1290
-#, fuzzy
msgid "The selected hunks do not apply to the index!"
msgstr "Submissão incorreta de pedaços selecionados para index!"
@@ -887,7 +862,6 @@
msgstr "Nada foi submetido.\n"
#: add-patch.c:1355
-#, fuzzy
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -910,12 +884,10 @@
"? - mostrar ajuda\n"
#: add-patch.c:1517 add-patch.c:1527
-#, fuzzy
msgid "No previous hunk"
msgstr "Sem pedaço anterior"
#: add-patch.c:1522 add-patch.c:1532
-#, fuzzy
msgid "No next hunk"
msgstr "Sem próximo pedaço"
@@ -932,12 +904,12 @@
msgstr "ir para qual pedaço? "
#: add-patch.c:1561
-#, fuzzy, c-format
+#, c-format
msgid "Invalid number: '%s'"
msgstr "Número inválido: '%s'"
#: add-patch.c:1566
-#, fuzzy, c-format
+#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Lamento, apenas %d pedaço disponível."
@@ -952,12 +924,11 @@
msgstr "procurar por regex? "
#: add-patch.c:1596
-#, fuzzy, c-format
+#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Pesquisa regexp deformada %s: %s"
#: add-patch.c:1613
-#, fuzzy
msgid "No hunk matches the given pattern"
msgstr "Sem pedaço correspondente ao padrão fornecido"
@@ -966,7 +937,7 @@
msgstr "Lamento, incapaz de dividir este pedaço"
#: add-patch.c:1624
-#, fuzzy, c-format
+#, c-format
msgid "Split into %d hunks."
msgstr "Dividir em %d pedaços."
@@ -975,7 +946,6 @@
msgstr "Lamento, incapaz de editar este pedaço"
#: add-patch.c:1680
-#, fuzzy
msgid "'git apply' failed"
msgstr "'git apply' falhou"
@@ -989,7 +959,7 @@
"Desative este mensagem com \"git config advice.%s false\""
#: advice.c:161
-#, fuzzy, c-format
+#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sdica: %.*s%s\n"
@@ -1056,7 +1026,7 @@
msgstr ""
#: advice.c:310
-#, fuzzy, c-format
+#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
@@ -1097,7 +1067,6 @@
"\n"
#: alias.c:50
-#, fuzzy
msgid "cmdline ends with \\"
msgstr "cmdline termina com \\"
@@ -1149,8 +1118,7 @@
#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
-"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
+msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
#: apply.c:927
#, c-format
@@ -1172,7 +1140,7 @@
msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"
#: apply.c:962
-#, fuzzy, c-format
+#, c-format
msgid "invalid mode on line %d: %s"
msgstr "modo inválido na linha %d: %s"
@@ -1370,14 +1338,13 @@
msgstr "%s: no index há correspondência nenhuma"
#: apply.c:3571
-#, fuzzy
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "repositório falta o blob necessário para recorrer à tri-junção."
#: apply.c:3574
-#, fuzzy, c-format
+#, c-format
msgid "Performing three-way merge...\n"
-msgstr "A recorrer a integração com 3 pontos...\n"
+msgstr "Realizando tri-junção...\n"
#: apply.c:3590 apply.c:3594
#, c-format
@@ -1385,7 +1352,7 @@
msgstr "incapaz ler conteúdo atual de '%s'"
#: apply.c:3606
-#, fuzzy, c-format
+#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Falha a recorrer a integração com 3 pontos...\n"
@@ -1400,9 +1367,9 @@
msgstr "Patch aplicado a '%s' com sucesso.\n"
#: apply.c:3642
-#, fuzzy, c-format
+#, c-format
msgid "Falling back to direct application...\n"
-msgstr "A recorrer a integração com 3 pontos...\n"
+msgstr "Recorrendo a aplicação direta...\n"
#: apply.c:3654
msgid "removal patch leaves file contents"
@@ -1427,12 +1394,12 @@
#: apply.c:3952
#, c-format
msgid "%s: already exists in index"
-msgstr "%s: já existe no índice"
+msgstr "%s: já existe no cenário"
#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
-msgstr "%s: já existe no diretório de trabalho"
+msgstr "%s: já existe na pasta-trabalho"
#: apply.c:3976
#, c-format
@@ -1658,10 +1625,9 @@
#: apply.c:5025
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplicar o patch também (use com --stat/--summary/--check)"
+msgstr "submeter o remendo também (usa com --stat/--summary/--check)"
#: apply.c:5027
-#, fuzzy
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma"
@@ -1672,11 +1638,11 @@
#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
msgid "paths are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr "caminhos estão separados por caractere NUL"
#: apply.c:5034
msgid "ensure at least <n> lines of context match"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "garantir que pelo menos <n> linhas de contexto correspondam"
#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
@@ -1733,22 +1699,21 @@
msgstr "preceder <root> a todos os nomes de ficheiro"
#: archive-tar.c:125 archive-zip.c:345
-#, fuzzy, c-format
+#, c-format
msgid "cannot stream blob %s"
msgstr "incapaz streamar blob %s"
#: archive-tar.c:265 archive-zip.c:358
-#, fuzzy, c-format
+#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "modo de ficheiro fora de suporte: 0%o (SHA1: %s)"
#: archive-tar.c:450
-#, fuzzy, c-format
+#, c-format
msgid "unable to start '%s' filter"
msgstr "incapaz iniciar filtro '%s'"
#: archive-tar.c:453
-#, fuzzy
msgid "unable to redirect descriptor"
msgstr "incapaz redirecionar descritor"
@@ -1779,7 +1744,7 @@
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
+msgstr "git archive [<opções>] <arvoredo> [<caminho>...]"
#: archive.c:15
msgid "git archive --list"
@@ -1797,7 +1762,7 @@
msgstr "git archive --remote <repo> [--exec <cmd>] --list"
#: archive.c:188
-#, fuzzy, c-format
+#, c-format
msgid "cannot read %s"
msgstr "incapaz ler %s"
@@ -1814,32 +1779,31 @@
msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
#: archive.c:451
-#, fuzzy, c-format
+#, c-format
msgid "no such ref: %.*s"
msgstr "ref inexistente: %.*s"
#: archive.c:457
-#, fuzzy, c-format
+#, c-format
msgid "not a valid object name: %s"
msgstr "nome de objeto inválido: %s"
#: archive.c:470
-#, fuzzy, c-format
+#, c-format
msgid "not a tree object: %s"
msgstr "é objeto árvore nenhum: %s"
#: archive.c:482
-#, fuzzy
msgid "current working directory is untracked"
msgstr "pasta de trabalho atual está por seguir"
#: archive.c:523
-#, fuzzy, c-format
+#, c-format
msgid "File not found: %s"
msgstr "ficheiro por encontrar: %s"
#: archive.c:525
-#, fuzzy, c-format
+#, c-format
msgid "Not a regular file: %s"
msgstr "É ficheiro normal nenhum: %s"
@@ -1869,7 +1833,6 @@
msgstr "ficheiro"
#: archive.c:556
-#, fuzzy
msgid "add untracked file to archive"
msgstr "adiciona ficheiro por seguir a arquivo"
@@ -1879,16 +1842,15 @@
#: archive.c:561
msgid "read .gitattributes in working directory"
-msgstr "ler .gitattributes do diretório de trabalho"
+msgstr "ler .gitattributes da pasta-trabalho"
#: archive.c:562
msgid "report archived files on stderr"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "reportar, na saída de erro padrão, ficheiro arquivados"
#: archive.c:564
-#, fuzzy
msgid "set compression level"
-msgstr "nível de compactação do pacote"
+msgstr "definir nível de compressão"
#: archive.c:567
msgid "list supported archive formats"
@@ -1926,7 +1888,6 @@
msgstr "Opção inesperada --output"
#: archive.c:585
-#, fuzzy
msgid "Options --add-file and --remote cannot be used together"
msgstr "Opções --add-file e --remote podem nada ser usadas juntas"
@@ -1946,9 +1907,9 @@
msgstr "%.*s é nome de atributo inválido"
#: attr.c:363
-#, fuzzy, c-format
+#, c-format
msgid "%s not allowed: %s:%d"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgstr "%s proibido: %s:%d"
#: attr.c:403
msgid ""
@@ -2044,7 +2005,7 @@
#: bisect.c:1027
msgid "reading bisect refs failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou ler refs de bisseção"
#: bisect.c:1057
#, c-format
@@ -2052,7 +2013,7 @@
msgstr "%s era %s e %s em simultâneo\n"
#: bisect.c:1066
-#, fuzzy, c-format
+#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path arguments?\n"
@@ -2087,8 +2048,7 @@
#: blame.c:2811
msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse e --first-parent juntos requer que se especifique o último commit"
+msgstr "--reverse e --first-parent juntos exige que se especifique a última memória"
#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
@@ -2133,42 +2093,42 @@
msgstr "Indefinindo ramo %s como seu próprio upstream."
#: branch.c:93
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase."
#: branch.c:94
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgstr "Ramo '%s' definido para monitorizar ramo remoto '%s' de '%s'."
#: branch.c:98
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Ramo %s configurado para seguir o ramo local %s por rebase."
#: branch.c:99
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Ramo %s configurado para seguir o ramo local %s."
#: branch.c:104
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Ramo %s configurado para seguir a referência remota %s por rebase."
#: branch.c:105
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Ramo %s configurado para seguir a referência remota %s."
#: branch.c:109
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Ramo %s configurado para seguir a referência local %s por rebase."
#: branch.c:110
-#, fuzzy, c-format
+#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Ramo %s configurado para seguir a referência local %s."
@@ -2253,17 +2213,17 @@
msgstr "HEAD da working tree %s está desatualizada"
#: bundle.c:44
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "algoritmo hash de bundle irreconhecível: %s"
#: bundle.c:48
-#, fuzzy, c-format
+#, c-format
msgid "unknown capability '%s'"
msgstr "capacidade desconhecida '%s'"
#: bundle.c:74
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"
@@ -2283,7 +2243,6 @@
msgstr "Falta ao repositório estes pré-requisitos de commits:"
#: bundle.c:201
-#, fuzzy
msgid "need a repository to verify a bundle"
msgstr "é preciso repositório para verificar um bundle."
@@ -2306,7 +2265,6 @@
msgstr[1] "O bundle requer estas %d referências:"
#: bundle.c:333
-#, fuzzy
msgid "unable to dup bundle descriptor"
msgstr "incapaz de dup descritor de bundle"
@@ -2324,7 +2282,7 @@
msgstr "a referência '%s' é excluída pelas opções de rev-list"
#: bundle.c:504
-#, fuzzy, c-format
+#, c-format
msgid "unsupported bundle version %d"
msgstr "fora de suporte versão bundle %d"
@@ -2376,21 +2334,20 @@
msgstr "valor de cor inválido: %.*s"
#: commit-graph.c:204 midx.c:47
-#, fuzzy
msgid "invalid hash version"
-msgstr "especificação de caminho inválida"
+msgstr "versão de hash inválida"
#: commit-graph.c:262
msgid "commit-graph file is too small"
msgstr ""
#: commit-graph.c:355
-#, fuzzy, c-format
+#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma"
#: commit-graph.c:362
-#, fuzzy, c-format
+#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "commit-graph versão %X corresponde a versão %X nenhuma"
@@ -2418,7 +2375,6 @@
msgstr ""
#: commit-graph.c:564
-#, fuzzy
msgid "unable to find all commit-graph files"
msgstr "incapaz de encontrar todos ficheiros commit-graph"
@@ -2427,9 +2383,9 @@
msgstr ""
#: commit-graph.c:766
-#, fuzzy, c-format
+#, c-format
msgid "could not find commit %s"
-msgstr "incapaz encontrar commit %s"
+msgstr "incapaz encontrar memória %s"
#: commit-graph.c:799
msgid "commit-graph requires overflow generation data but has none"
@@ -2441,7 +2397,7 @@
msgstr "incapaz analisar commit %s"
#: commit-graph.c:1337 builtin/pack-objects.c:3057
-#, fuzzy, c-format
+#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz obter tipo de objeto %s"
@@ -2470,7 +2426,6 @@
msgstr ""
#: commit-graph.c:1635
-#, fuzzy
msgid "Collecting referenced commits"
msgstr "Recolhendo commits referênciados"
@@ -2482,7 +2437,7 @@
msgstr[1] ""
#: commit-graph.c:1673
-#, fuzzy, c-format
+#, c-format
msgid "error adding pack %s"
msgstr "error adicionando pacote %s"
@@ -2504,17 +2459,16 @@
msgstr ""
#: commit-graph.c:1812 midx.c:911
-#, fuzzy, c-format
+#, c-format
msgid "unable to create leading directories of %s"
msgstr "incapaz criar as pastas superiores a %s"
#: commit-graph.c:1825
-#, fuzzy
msgid "unable to create temporary graph layer"
msgstr "incapaz criar camada de grafo temporária"
#: commit-graph.c:1830
-#, fuzzy, c-format
+#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "incapaz de ajustar permissão partilhada para '%s'"
@@ -2526,7 +2480,6 @@
msgstr[1] ""
#: commit-graph.c:1923
-#, fuzzy
msgid "unable to open commit-graph chain file"
msgstr "incapaz abrir ficheiro commit-graph chain"
@@ -2535,12 +2488,10 @@
msgstr ""
#: commit-graph.c:1959
-#, fuzzy
msgid "failed to rename temporary commit-graph file"
msgstr "falha a renomear ficheiro commit-graph temporário"
#: commit-graph.c:2092
-#, fuzzy
msgid "Scanning merged commits"
msgstr "A adicionar %s integrado"
@@ -2553,7 +2504,6 @@
msgstr ""
#: commit-graph.c:2351
-#, fuzzy
msgid "too many commits to write graph"
msgstr "demasiados commits para escrever grafo"
@@ -2572,7 +2522,7 @@
msgstr ""
#: commit-graph.c:2476
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "incapaz analisar commit %s de commit-graph"
@@ -2696,12 +2646,11 @@
msgstr ""
#: config.c:142
-#, fuzzy, c-format
+#, c-format
msgid "could not expand include path '%s'"
msgstr "incapaz de expandir include path '%s'"
#: config.c:153
-#, fuzzy
msgid "relative config includes must come from files"
msgstr ""
"configuração relativa com inclusão condicional deve provir de ficheiros"
@@ -2712,9 +2661,9 @@
"configuração relativa com inclusão condicional deve provir de ficheiros"
#: config.c:396
-#, fuzzy, c-format
+#, c-format
msgid "invalid config format: %s"
-msgstr "formato de ref inválido: %s"
+msgstr "formato de config inválido: %s"
#: config.c:400
#, c-format
@@ -2727,7 +2676,7 @@
msgstr ""
#: config.c:442
-#, fuzzy, c-format
+#, c-format
msgid "key does not contain a section: %s"
msgstr "chave contém secção nenhuma: %s"
@@ -2751,34 +2700,34 @@
msgstr ""
#: config.c:529 config.c:541
-#, fuzzy, c-format
+#, c-format
msgid "bogus config parameter: %s"
-msgstr "parâmetros insuficientes"
+msgstr "parâmetro config falso: %s"
#: config.c:555 config.c:572 config.c:579 config.c:588
-#, fuzzy, c-format
+#, c-format
msgid "bogus format in %s"
msgstr "formato falso em %s"
#: config.c:622
-#, fuzzy, c-format
+#, c-format
msgid "bogus count in %s"
msgstr "contagem falsa em %s"
#: config.c:626
#, c-format
msgid "too many entries in %s"
-msgstr ""
+msgstr "demasiadas entradas em %s"
#: config.c:636
-#, fuzzy, c-format
+#, c-format
msgid "missing config key %s"
-msgstr "ficheiro config inválido %s"
+msgstr "faltando chave config %s"
#: config.c:644
#, c-format
msgid "missing config value %s"
-msgstr ""
+msgstr "faltando valor config %s"
#: config.c:995
#, c-format
@@ -2821,7 +2770,7 @@
#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+msgstr "valor numérico de config '%s' inválido para '%s': %s"
#: config.c:1163
#, c-format
@@ -2858,9 +2807,9 @@
msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
#: config.c:1257
-#, fuzzy, c-format
+#, c-format
msgid "bad boolean config value '%s' for '%s'"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+msgstr "valor booleano de config '%s' inválido para '%s'"
#: config.c:1275
#, c-format
@@ -2892,14 +2841,14 @@
msgstr "modo inválido para criação de objeto: %s"
#: config.c:1599
-#, fuzzy, c-format
+#, c-format
msgid "malformed value for %s"
-msgstr "valor desformado para %s"
+msgstr "valor malformado para %s"
#: config.c:1625
-#, fuzzy, c-format
+#, c-format
msgid "malformed value for %s: %s"
-msgstr ": %s"
+msgstr "valor malformado para %s: %s"
#: config.c:1626
msgid "must be one of nothing, matching, simple, upstream or current"
@@ -2911,24 +2860,24 @@
msgstr "nível de compactação do pacote %d incorreto"
#: config.c:1809
-#, fuzzy, c-format
+#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz carregar objeto blob config '%s'"
#: config.c:1812
-#, fuzzy, c-format
+#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referência '%s' aponta para blob nenhum"
#: config.c:1829
-#, fuzzy, c-format
+#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "incapaz resolver blog config '%s'"
#: config.c:1874
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse %s"
-msgstr "falha a analisar %s"
+msgstr "falhou processar %s"
#: config.c:1930
msgid "unable to parse command-line config"
@@ -2960,9 +2909,9 @@
msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
#: config.c:2645
-#, fuzzy, c-format
+#, c-format
msgid "invalid section name '%s'"
-msgstr "conteúdo inválido: '%s'"
+msgstr "nome de seção '%s' inválido"
#: config.c:2677
#, c-format
@@ -2970,27 +2919,27 @@
msgstr "%s tem múltiplos valores"
#: config.c:2706
-#, fuzzy, c-format
+#, c-format
msgid "failed to write new configuration file %s"
msgstr "falha a escrever novo ficheiro configuração %s"
#: config.c:2958 config.c:3285
-#, fuzzy, c-format
+#, c-format
msgid "could not lock config file %s"
msgstr "incapaz trancar ficheiro config %s"
#: config.c:2969
-#, fuzzy, c-format
+#, c-format
msgid "opening %s"
msgstr "abrindo %s"
#: config.c:3006 builtin/config.c:361
-#, fuzzy, c-format
+#, c-format
msgid "invalid pattern: %s"
msgstr "padrão inválido: %s"
#: config.c:3031
-#, fuzzy, c-format
+#, c-format
msgid "invalid config file %s"
msgstr "ficheiro config inválido %s"
@@ -3000,17 +2949,17 @@
msgstr "fstat em %s falhou"
#: config.c:3055
-#, fuzzy, c-format
+#, c-format
msgid "unable to mmap '%s'%s"
msgstr "incapaz mmap '%s'%s"
#: config.c:3065 config.c:3303
-#, fuzzy, c-format
+#, c-format
msgid "chmod on %s failed"
msgstr "chmod em %s falhou"
#: config.c:3150 config.c:3400
-#, fuzzy, c-format
+#, c-format
msgid "could not write config file %s"
msgstr "incapaz escrever ficheiro config %s"
@@ -3035,9 +2984,8 @@
msgstr ""
#: connect.c:61
-#, fuzzy
msgid "the remote end hung up upon initial contact"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou após contacto inicial"
#: connect.c:63
msgid ""
@@ -3052,12 +3000,12 @@
"e que o repositório existe."
#: connect.c:81
-#, fuzzy, c-format
+#, c-format
msgid "server doesn't support '%s'"
msgstr "servidor tem fora de suporte '%s'"
#: connect.c:118
-#, fuzzy, c-format
+#, c-format
msgid "server doesn't support feature '%s'"
msgstr "servidor tem fora suporte a característica '%s'"
@@ -3111,7 +3059,7 @@
msgstr ""
#: connect.c:666
-#, fuzzy, c-format
+#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' é insustentado"
@@ -3125,7 +3073,7 @@
msgstr ""
#: connect.c:761
-#, fuzzy, c-format
+#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "incapaz procurar %s (porta %s) (%s)"
@@ -3138,7 +3086,7 @@
msgstr ""
#: connect.c:787 connect.c:864
-#, fuzzy, c-format
+#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
@@ -3148,12 +3096,11 @@
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
#: connect.c:793 connect.c:870
-#, fuzzy
msgid "done."
msgstr "concluído."
#: connect.c:824
-#, fuzzy, c-format
+#, c-format
msgid "unable to look up %s (%s)"
msgstr "incapaz procurar %s (%s)"
@@ -3173,17 +3120,17 @@
msgstr ""
#: connect.c:979
-#, fuzzy, c-format
+#, c-format
msgid "cannot start proxy %s"
msgstr "incapaz começar proxy %s"
#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
+msgstr "caminho nenhum especificado; vê 'git help pull' para sintaxe de url válida"
#: connect.c:1190
msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr ""
+msgstr "parágrafo é proibido em hosts git:// e caminhos repo"
#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
@@ -3194,7 +3141,6 @@
msgstr ""
#: connect.c:1276
-#, fuzzy
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh variant 'simple' insustenta definir porta"
@@ -3204,7 +3150,6 @@
msgstr ""
#: connect.c:1436
-#, fuzzy
msgid "unable to fork"
msgstr "incapaz de aforquilhar"
@@ -3230,12 +3175,12 @@
msgstr ""
#: convert.c:196
-#, fuzzy, c-format
+#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF será substituído por LF em %s."
#: convert.c:198
-#, fuzzy, c-format
+#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
@@ -3249,7 +3194,7 @@
msgstr "LF será substituído por CRLF em %s."
#: convert.c:208
-#, fuzzy, c-format
+#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
@@ -3282,9 +3227,9 @@
msgstr ""
#: convert.c:408 convert.c:479
-#, fuzzy, c-format
+#, c-format
msgid "failed to encode '%s' from %s to %s"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou codificar '%s' de %s para %s"
#: convert.c:451
#, c-format
@@ -3292,17 +3237,17 @@
msgstr ""
#: convert.c:654
-#, fuzzy, c-format
+#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "incapaz aforquilhar para correr filtro externo '%s'"
#: convert.c:674
-#, fuzzy, c-format
+#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "incapaz introduzir input para filtro externo '%s'"
#: convert.c:681
-#, fuzzy, c-format
+#, c-format
msgid "external filter '%s' failed %d"
msgstr "filtro externo '%s' falhou %d"
@@ -3312,7 +3257,7 @@
msgstr ""
#: convert.c:722 convert.c:777
-#, fuzzy, c-format
+#, c-format
msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falhou"
@@ -3341,9 +3286,9 @@
msgstr ""
#: convert.c:1492
-#, fuzzy, c-format
+#, c-format
msgid "%s: smudge filter %s failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "%s: filtro mancha %s falhou"
#: credential.c:96
#, c-format
@@ -3364,12 +3309,12 @@
msgstr ""
#: credential.c:438
-#, fuzzy, c-format
+#, c-format
msgid "url has no scheme: %s"
msgstr "Remoto inexistente: %s"
#: credential.c:511
-#, fuzzy, c-format
+#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "incapaz analisar url credencial: %s"
@@ -3378,77 +3323,77 @@
msgstr "no futuro"
#: date.c:144
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "há %lu segundo"
-msgstr[1] "há %lu segundos"
+msgstr[0] "à %<PRIuMAX> segundo"
+msgstr[1] "à %<PRIuMAX> segundos"
#: date.c:151
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "há %lu minuto"
-msgstr[1] "há %lu minutos"
+msgstr[0] "à %<PRIuMAX> minuto"
+msgstr[1] "à %<PRIuMAX> minutos"
#: date.c:158
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "há %lu hora"
-msgstr[1] "há %lu horas"
+msgstr[0] "à %<PRIuMAX> hora"
+msgstr[1] "à %<PRIuMAX> horas"
#: date.c:165
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "há %lu dia"
-msgstr[1] "há %lu dias"
+msgstr[0] "à %<PRIuMAX> dia"
+msgstr[1] "à %<PRIuMAX> dias"
#: date.c:171
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "há %lu semana"
-msgstr[1] "há %lu semanas"
+msgstr[0] "à %<PRIuMAX> semana"
+msgstr[1] "à %<PRIuMAX> semanas"
#: date.c:178
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "há %lu mês"
-msgstr[1] "há %lu meses"
+msgstr[0] "à %<PRIuMAX> mês"
+msgstr[1] "à %<PRIuMAX> meses"
#: date.c:189
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%lu ano"
-msgstr[1] "%lu anos"
+msgstr[0] "%<PRIuMAX> ano"
+msgstr[1] "%<PRIuMAX> anos"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:192
-#, fuzzy, c-format
+#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "há %s e %lu mês"
-msgstr[1] "há %s e %lu meses"
+msgstr[0] "à %s, %<PRIuMAX> mês"
+msgstr[1] "à %s, %<PRIuMAX> meses"
#: date.c:197 date.c:202
-#, fuzzy, c-format
+#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "há %lu ano"
-msgstr[1] "há %lu anos"
+msgstr[0] "à %<PRIuMAX> ano"
+msgstr[1] "à %<PRIuMAX> anos"
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr ""
#: delta-islands.c:290
-#, fuzzy, c-format
+#, c-format
msgid "bad tree object %s"
-msgstr "objeto árvore"
+msgstr "objeto de árvore %s inválido"
#: delta-islands.c:334
#, c-format
@@ -3466,20 +3411,19 @@
msgstr ""
#: diff-merges.c:70
-#, fuzzy, c-format
+#, c-format
msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconhecido '%s' da chave '%s'"
+msgstr "valor desconhecido para --diff-merges: %s"
#: diff-lib.c:557
msgid "--merge-base does not work with ranges"
-msgstr ""
+msgstr "--merge-base é incompatível com intervalos"
#: diff-lib.c:559
msgid "--merge-base only works with commits"
-msgstr ""
+msgstr "--merge-base apenas trabalho com memórias"
#: diff-lib.c:576
-#, fuzzy
msgid "unable to get HEAD"
msgstr "incapaz obter HEAD"
@@ -3492,9 +3436,8 @@
msgstr ""
#: diff-no-index.c:237
-#, fuzzy
msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+msgstr "git diff --no-index [<opções>] <caminho> <caminho>"
#: diff-no-index.c:262
msgid ""
@@ -3556,7 +3499,7 @@
#: diff.c:4637
msgid "-G, -S and --find-object are mutually exclusive"
-msgstr ""
+msgstr "-G, -S e --find-object são mutuamente exclusivos"
#: diff.c:4640
msgid ""
@@ -3571,12 +3514,12 @@
#: diff.c:4722
msgid "--follow requires exactly one pathspec"
-msgstr "--follow requer exatamente um único especificador de caminho"
+msgstr "--follow exige exatamente um espetro-caminho"
#: diff.c:4770
-#, fuzzy, c-format
+#, c-format
msgid "invalid --stat value: %s"
-msgstr "valor de cor inválido: %.*s"
+msgstr "valor --stat inválido: %s"
#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
@@ -3596,7 +3539,7 @@
#: diff.c:4892
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
+msgstr "classe de mudança '%c' desconhecida em --diff-filter=%s"
#: diff.c:4916
#, c-format
@@ -3604,7 +3547,7 @@
msgstr ""
#: diff.c:4930
-#, fuzzy, c-format
+#, c-format
msgid "unable to resolve '%s'"
msgstr "incapaz resolver '%s'"
@@ -3619,14 +3562,14 @@
msgstr ""
#: diff.c:5019
-#, fuzzy, c-format
+#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumento incorreto --color-moved: %s"
#: diff.c:5038
-#, fuzzy, c-format
+#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "objeto inválido '%s' fornecido."
+msgstr "modo inválido '%s' em --color-moved-ws"
#: diff.c:5078
msgid ""
@@ -3645,36 +3588,34 @@
msgstr ""
#: diff.c:5287
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr "Falha a processar parâmetro da opção --submodule: '%s'"
#: diff.c:5343
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr ""
+msgstr "argumento --word-diff incorrecto: %s"
#: diff.c:5379
msgid "Diff output format options"
msgstr ""
#: diff.c:5381 diff.c:5387
-#, fuzzy
msgid "generate patch"
-msgstr "incorporar o patch"
+msgstr "gerar remendo"
#: diff.c:5384 builtin/log.c:179
msgid "suppress diff output"
-msgstr "suprimir saída do diff"
+msgstr "suprimir saída de diff"
#: diff.c:5389 diff.c:5503 diff.c:5510
msgid "<n>"
-msgstr ""
+msgstr "<n>"
#: diff.c:5390 diff.c:5393
-#, fuzzy
msgid "generate diffs with <n> lines context"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "gerar diffs com <n> linhas de contexto"
#: diff.c:5395
msgid "generate the diff in raw format"
@@ -3682,16 +3623,15 @@
#: diff.c:5398
msgid "synonym for '-p --raw'"
-msgstr ""
+msgstr "sinónimo de '-p --raw'"
#: diff.c:5402
msgid "synonym for '-p --stat'"
-msgstr ""
+msgstr "sinónimo de '-p --stat'"
#: diff.c:5406
-#, fuzzy
msgid "machine friendly --stat"
-msgstr "saída inteligível por máquina"
+msgstr "--stat amigável à máquina"
#: diff.c:5409
msgid "output only the last line of --stat"
@@ -3707,7 +3647,6 @@
msgstr ""
#: diff.c:5416
-#, fuzzy
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo de --dirstat=cumulative"
@@ -3736,9 +3675,8 @@
msgstr ""
#: diff.c:5436
-#, fuzzy
msgid "generate diffstat"
-msgstr "diff status inesperado %c"
+msgstr "gerar diffstat"
#: diff.c:5438 diff.c:5441 diff.c:5444
msgid "<width>"
@@ -3777,9 +3715,8 @@
msgstr ""
#: diff.c:5459
-#, fuzzy
msgid "show colored diff"
-msgstr "mostrar ficheiros ignorados"
+msgstr "mostrar diff colorida"
#: diff.c:5460
msgid "<kind>"
@@ -3798,9 +3735,8 @@
msgstr ""
#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
-#, fuzzy
msgid "<prefix>"
-msgstr "<prefixo>/"
+msgstr "<prefixo>"
#: diff.c:5468
msgid "show the given source prefix instead of \"a/\""
@@ -3811,7 +3747,6 @@
msgstr ""
#: diff.c:5474
-#, fuzzy
msgid "prepend an additional prefix to every line of output"
msgstr "preceder o nomebase do projeto pai na saída"
@@ -3820,13 +3755,12 @@
msgstr ""
#: diff.c:5480
-#, fuzzy
msgid "show context between diff hunks up to the specified number of lines"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
+msgstr "mostrar contexto entre diff de pedaços até ao número de linhas especificado"
#: diff.c:5484 diff.c:5489 diff.c:5494
msgid "<char>"
-msgstr ""
+msgstr "<caractere>"
#: diff.c:5485
msgid "specify the character to indicate a new line instead of '+'"
@@ -3845,16 +3779,14 @@
msgstr ""
#: diff.c:5499
-#, fuzzy
msgid "<n>[/<m>]"
-msgstr "<n>[,<base>]"
+msgstr "<n>[/<m>]"
#: diff.c:5500
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
#: diff.c:5504
-#, fuzzy
msgid "detect renames"
msgstr "detetar renomeações"
@@ -3871,9 +3803,8 @@
msgstr ""
#: diff.c:5517
-#, fuzzy
msgid "disable rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "desativar detecção de renomeação"
#: diff.c:5520
msgid "use empty blobs as rename source"
@@ -3946,18 +3877,16 @@
msgstr ""
#: diff.c:5562
-#, fuzzy
msgid "<text>"
-msgstr "texto"
+msgstr "<texto>"
#: diff.c:5563
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
#: diff.c:5565 diff.c:5574 diff.c:5577
-#, fuzzy
msgid "<mode>"
-msgstr "modo"
+msgstr "<modo>"
#: diff.c:5566
msgid "show word diff, using <mode> to delimit changed words"
@@ -3988,9 +3917,8 @@
msgstr ""
#: diff.c:5587
-#, fuzzy
msgid "treat all files as text"
-msgstr "processar ficheiros binários como texto"
+msgstr "tratar todos ficheiros como texto"
#: diff.c:5589
msgid "swap two inputs, reverse the diff"
@@ -4013,21 +3941,18 @@
msgstr ""
#: diff.c:5599
-#, fuzzy
msgid "<when>"
-msgstr "quando"
+msgstr "<quando>"
#: diff.c:5600
-#, fuzzy
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
#: diff.c:5603
-#, fuzzy
msgid "<format>"
-msgstr "formato"
+msgstr "<formato>"
#: diff.c:5604
msgid "specify how differences in submodules are shown"
@@ -4042,9 +3967,8 @@
msgstr ""
#: diff.c:5613
-#, fuzzy
msgid "<string>"
-msgstr "cadeia"
+msgstr "<string>"
#: diff.c:5614
msgid ""
@@ -4059,40 +3983,33 @@
msgstr ""
#: diff.c:5620
-#, fuzzy
msgid "show all changes in the changeset with -S or -G"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar todos as alterações em memória com -S ou -G"
#: diff.c:5623
-#, fuzzy
msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "tratar <string> em -S como expressão comum estendida de POSIX"
#: diff.c:5626
-#, fuzzy
msgid "control the order in which files appear in the output"
-msgstr "mostrar outros ficheiros na saída"
+msgstr "controlar a ordem em que os ficheiro aparecem na saída"
#: diff.c:5627 diff.c:5630
-#, fuzzy
msgid "<path>"
-msgstr "path"
+msgstr "<caminho>"
#: diff.c:5628
-#, fuzzy
msgid "show the change in the specified path first"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
#: diff.c:5631
-#, fuzzy
msgid "skip the output to the specified path"
-msgstr "Repor a HEAD atual no estado especificado"
+msgstr "ignorar saída para caminho especificado"
#: diff.c:5633
-#, fuzzy
msgid "<object-id>"
-msgstr "objeto"
+msgstr "<id-objeto>"
#: diff.c:5634
msgid ""
@@ -4109,17 +4026,14 @@
msgstr ""
#: diff.c:5639
-#, fuzzy
msgid "<file>"
-msgstr "ficheiro"
+msgstr "<ficheiro>"
#: diff.c:5640
-#, fuzzy
msgid "Output to a specific file"
-msgstr "submeter somente os ficheiros especificados"
+msgstr "Sair para ficheiro específico"
#: diff.c:6298
-#, fuzzy
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
@@ -4144,26 +4058,25 @@
#: diffcore-rename.c:1514
msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "Realizando detecção de renomeação inexata"
#: diffcore-rotate.c:29
-#, fuzzy, c-format
+#, c-format
msgid "No such path '%s' in the diff"
-msgstr "path %s inexistente em %s"
+msgstr "path %s inexistente em diff"
#: dir.c:593
-#, fuzzy, c-format
+#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git"
+msgstr "espetro-caminho '%s' correspondeu a ficheiro(s) nenhum(s) conhecido pelo git"
#: dir.c:733 dir.c:762 dir.c:775
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "padrão irreconhecível: '%s'"
#: dir.c:790 dir.c:804
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "por reconhecer padrão negativo: '%s'"
@@ -4174,15 +4087,15 @@
#: dir.c:830
msgid "disabling cone pattern matching"
-msgstr ""
+msgstr "desativando correspondência de padrão em cone"
#: dir.c:1214
-#, fuzzy, c-format
+#, c-format
msgid "cannot use %s as an exclude file"
msgstr "incapaz usar %s como ficheiro de exclusão"
#: dir.c:2351
-#, fuzzy, c-format
+#, c-format
msgid "could not open directory '%s'"
msgstr "incapaz abrir pasta '%s'"
@@ -4191,7 +4104,6 @@
msgstr "falha ao obter nome e informação do kernel"
#: dir.c:2777
-#, fuzzy
msgid "untracked cache is disabled on this system or location"
msgstr "cache untracked está desativada neste sistema ou localização."
@@ -4216,9 +4128,8 @@
msgstr ""
#: entry.c:176
-#, fuzzy
msgid "Filtering content"
-msgstr "imprimir conteúdo da tag"
+msgstr "Filtrando conteúdo"
#: entry.c:497
#, c-format
@@ -4231,7 +4142,7 @@
msgstr ""
#: environment.c:334
-#, fuzzy, c-format
+#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "incapaz definir GIT_DIR para '%s'"
@@ -4242,25 +4153,22 @@
#: fetch-pack.c:182
msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: esperado lista rasa"
+msgstr "git fetch-pack: esperado lista superficial"
#: fetch-pack.c:185
-#, fuzzy
msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: esperado pacote flush após lista rasa"
+msgstr "git fetch-pack: esperado pacote flush após lista superficial"
#: fetch-pack.c:196
-#, fuzzy
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive um pacote flush"
#: fetch-pack.c:216
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive '%s'"
#: fetch-pack.c:227
-#, fuzzy
msgid "unable to write to remote"
msgstr "incapaz escrever para remoto"
@@ -4271,7 +4179,7 @@
#: fetch-pack.c:383 fetch-pack.c:1423
#, c-format
msgid "invalid shallow line: %s"
-msgstr "linha rasa inválida: %s"
+msgstr "linha superficial inválida: %s"
#: fetch-pack.c:389 fetch-pack.c:1429
#, c-format
@@ -4306,7 +4214,7 @@
#: fetch-pack.c:456
#, c-format
msgid "invalid commit %s"
-msgstr "commit inválido %s"
+msgstr "memória inválida %s"
#: fetch-pack.c:487
msgid "giving up"
@@ -4342,7 +4250,7 @@
#: fetch-pack.c:951
#, c-format
msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: incapaz de aforquilhar %s"
+msgstr "fetch-pack: incapaz de fazer fork a %s"
#: fetch-pack.c:957
msgid "fetch-pack: invalid index-pack output"
@@ -4366,9 +4274,9 @@
#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
-#, fuzzy, c-format
+#, c-format
msgid "Server supports %s"
-msgstr "O servidor suporta side-band"
+msgstr "Servidor sustenta %s"
#: fetch-pack.c:1029
msgid "Server does not support shallow clients"
@@ -4387,7 +4295,6 @@
msgstr "Servidor insustenta --deepen"
#: fetch-pack.c:1100
-#, fuzzy
msgid "Server does not support this repository's object format"
msgstr "Servidor insustenta formato de objeto deste repositório"
@@ -4396,13 +4303,12 @@
msgstr "commits comuns nenhuns"
#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
-#, fuzzy
msgid "source repository is shallow, reject to clone."
-msgstr "o repositório de origem é raso, --local ignorado"
+msgstr "repositório de origem é raso, rejeita para clonar."
#: fetch-pack.c:1128 fetch-pack.c:1660
msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: falha ao obter."
+msgstr "git fetch-pack: buscar falhou."
#: fetch-pack.c:1242
#, c-format
@@ -4410,22 +4316,19 @@
msgstr ""
#: fetch-pack.c:1246
-#, fuzzy, c-format
+#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "o servidor insustenta algoritmo '%s'"
#: fetch-pack.c:1279
-#, fuzzy
msgid "Server does not support shallow requests"
msgstr "Servidor insustenta pedidos shallow"
#: fetch-pack.c:1286
-#, fuzzy
msgid "Server supports filter"
msgstr "Servidor sustenta filtro"
#: fetch-pack.c:1329 fetch-pack.c:2043
-#, fuzzy
msgid "unable to write request to remote"
msgstr "incapaz escrever pedidos para remoto"
@@ -4478,7 +4381,6 @@
msgstr ""
#: fetch-pack.c:1534
-#, fuzzy
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: esperado pacote fim de resposta"
@@ -4518,7 +4420,7 @@
msgstr "gpg falhou assinar os dados"
#: graph.c:98
-#, fuzzy, c-format
+#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
@@ -4546,15 +4448,15 @@
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
-msgstr "iniciar uma área de trabalho (consulte também: git help tutorial)"
+msgstr "iniciar uma área de trabalho (vê também: git help tutorial)"
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
-msgstr "trabalhar na alteração atual (consulte também: git help everyday)"
+msgstr "trabalhar na alteração atual (vê também: git help everyday)"
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
-msgstr "examinar o histórico e estado (consulte também: git help revisions)"
+msgstr "examinar o histórico e estado (vê também: git help revisions)"
#: help.c:26
msgid "grow, mark and tweak your common history"
@@ -4562,7 +4464,7 @@
#: help.c:27
msgid "collaborate (see also: git help workflows)"
-msgstr "colaborar (consulte também: git help workflows)"
+msgstr "colaborar (vê também: git help workflows)"
#: help.c:31
msgid "Main Porcelain Commands"
@@ -4599,7 +4501,7 @@
#: help.c:300
#, c-format
msgid "available git commands in '%s'"
-msgstr "comandos do git disponível em '%s'"
+msgstr "comandos de git disponíveis em '%s'"
#: help.c:307
msgid "git commands available from elsewhere on your $PATH"
@@ -4610,12 +4512,11 @@
msgstr "Estes são comandos do Git comuns usados em diversas situações:"
#: help.c:365 git.c:100
-#, fuzzy, c-format
+#, c-format
msgid "unsupported command listing type '%s'"
msgstr "insustento para listagem tipo comandos '%s'"
#: help.c:405
-#, fuzzy
msgid "The Git concept guides are:"
msgstr "Os guias comuns do Git:"
@@ -4624,13 +4525,12 @@
msgstr ""
#: help.c:434
-#, fuzzy
msgid "External commands"
-msgstr "a executar $command"
+msgstr "Comandos externos"
#: help.c:449
msgid "Command aliases"
-msgstr ""
+msgstr "Aliases de comando"
#: help.c:527
#, c-format
@@ -4651,7 +4551,7 @@
msgstr "Carago. Teu sistema reporta comandos Git nenhuns."
#: help.c:613
-#, fuzzy, c-format
+#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "AVISO: Chamou comando Git designado '%s', que é inexistente."
@@ -4676,9 +4576,8 @@
msgstr[1] ""
#: help.c:675
-#, fuzzy
msgid "git version [<options>]"
-msgstr "git column [<opções>]"
+msgstr "git version [<opções>]"
#: help.c:730
#, c-format
@@ -4775,7 +4674,7 @@
msgstr ""
#: list-objects-filter-options.c:105
-#, fuzzy, c-format
+#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"
@@ -4802,12 +4701,12 @@
msgstr ""
#: list-objects-filter.c:532
-#, fuzzy, c-format
+#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr "incapaz acessar blob sparse em '%s'"
#: list-objects-filter.c:535
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr "incapaz analisar dados de filtro sparse em %s"
@@ -4822,7 +4721,7 @@
msgstr ""
#: list-objects.c:398
-#, fuzzy, c-format
+#, c-format
msgid "unable to load root tree for commit %s"
msgstr "incapaz carregar raiz de árvore para commit %s"
@@ -4864,7 +4763,7 @@
msgstr ""
#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
-#, fuzzy, c-format
+#, c-format
msgid "bad action '%s' for '%s'"
msgstr "ação inválida '%s' para '%s'"
@@ -4889,9 +4788,9 @@
msgstr ""
#: merge-ort.c:1625
-#, fuzzy, c-format
+#, c-format
msgid "Failed to merge submodule %s"
-msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+msgstr "Juntar submódulo %s falhou"
#: merge-ort.c:1632
#, c-format
@@ -4990,11 +4889,9 @@
msgstr ""
#: merge-ort.c:2569
-#, fuzzy, c-format
+#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr ""
-"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
-"%s->%s em %s"
+msgstr "CONFLITO (renomear/renomear): %s renomeado para %s em %s e para %s em %s."
#: merge-ort.c:2664
#, c-format
@@ -5005,11 +4902,9 @@
msgstr ""
#: merge-ort.c:2683 merge-ort.c:2707
-#, fuzzy, c-format
+#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
-msgstr ""
-"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
-"%s"
+msgstr "CONFLITO (renomear/apagar): %s renomeado para %s em %s, mas apagado em %s."
#: merge-ort.c:3182 merge-recursive.c:3008
#, c-format
@@ -5057,15 +4952,15 @@
#: merge-ort.c:3802 merge-recursive.c:3137
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgstr "CONFLITO (%s): Conflito de junção em %s"
#: merge-ort.c:3833
-#, fuzzy, c-format
+#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"of %s left in tree."
msgstr ""
-"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
+"CONFLITO (modificar/apagar): %s apagado em %s e modificado em %s. Versão %s de %s "
"deixada na árvore."
#: merge-ort.c:4120
@@ -5084,17 +4979,16 @@
msgstr ""
#: merge-ort-wrappers.c:13 merge-recursive.c:3702
-#, fuzzy, c-format
+#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%s"
+"Tuas alterações locais para os seguintes ficheiros seriam sobrescritas ao "
+"juntar:\n"
+" %s"
#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
-#, fuzzy
msgid "Already up to date."
msgstr "Já está atualizado."
@@ -5103,19 +4997,19 @@
msgstr "(commit incorreto)\n"
#: merge-recursive.c:375
-#, fuzzy, c-format
+#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou para caminho '%s'; abortando junção."
#: merge-recursive.c:384
-#, fuzzy, c-format
+#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou no refrescar para o caminho '%s'; abortando junção."
#: merge-recursive.c:872
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "falha ao criar o caminho '%s'%s"
+msgstr "falhou criar caminho '%s'%s"
#: merge-recursive.c:883
#, c-format
@@ -5162,7 +5056,7 @@
msgstr ""
#: merge-recursive.c:1226 merge-recursive.c:1238
-#, fuzzy, c-format
+#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançando submódulo %s"
@@ -5186,7 +5080,7 @@
msgstr ""
#: merge-recursive.c:1420
-#, fuzzy, c-format
+#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"
@@ -5229,25 +5123,25 @@
#: merge-recursive.c:1544
msgid "rename"
-msgstr "mudar nome"
+msgstr "renomear"
#: merge-recursive.c:1544
msgid "renamed"
msgstr "nome mudado"
#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
-#, fuzzy, c-format
+#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Recusando perder ficheiro sujo de %s"
#: merge-recursive.c:1605
-#, fuzzy, c-format
+#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."
#: merge-recursive.c:1663
-#, fuzzy, c-format
+#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
@@ -5259,7 +5153,7 @@
msgstr "%s é um diretório em %s adicionando %s no seu lugar"
#: merge-recursive.c:1699
-#, fuzzy, c-format
+#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"
@@ -5292,7 +5186,7 @@
msgstr ""
#: merge-recursive.c:2220
-#, fuzzy, c-format
+#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
@@ -5321,7 +5215,7 @@
#: merge-recursive.c:3371
#, c-format
msgid "Removing %s"
-msgstr "A remover %s"
+msgstr "Removendo %s"
#: merge-recursive.c:3394
msgid "file/directory"
@@ -5343,9 +5237,9 @@
msgstr "A adicionar %s"
#: merge-recursive.c:3424
-#, fuzzy, c-format
+#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgstr "CONFLITO (add/add): Conflito de junção em %s"
#: merge-recursive.c:3477
#, c-format
@@ -5388,9 +5282,8 @@
msgstr "incapaz escrever novo ficheiro index"
#: midx.c:74
-#, fuzzy
msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "versão %d de multi-pack-index é irreconhecível"
+msgstr ""
#: midx.c:105
#, c-format
@@ -5405,7 +5298,7 @@
#: midx.c:126
#, c-format
msgid "multi-pack-index version %d not recognized"
-msgstr "versão %d de multi-pack-index é irreconhecível"
+msgstr "versão %d de multi-pack-index irreconhecível"
#: midx.c:131
#, c-format
@@ -5458,9 +5351,8 @@
msgstr ""
#: midx.c:880 builtin/index-pack.c:1533
-#, fuzzy
msgid "cannot store reverse index file"
-msgstr "incapaz guardar ficheiro index"
+msgstr "incapaz guardar ficheiro de cenário reverso"
#: midx.c:920
msgid "ignoring existing multi-pack-index; checksum mismatch"
@@ -5481,12 +5373,11 @@
msgstr ""
#: midx.c:1039
-#, fuzzy, c-format
+#, c-format
msgid "preferred pack '%s' is expired"
-msgstr "o repositório de referência '%s' está enxertado"
+msgstr "pacote preferencial '%s' expirou"
#: midx.c:1055
-#, fuzzy
msgid "no pack files to index."
msgstr "pack files nenhuns para index."
@@ -5540,7 +5431,7 @@
msgstr ""
#: midx.c:1317
-#, fuzzy, c-format
+#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "falhou carregar entrada pack para oid[%d] = %s"
@@ -5555,7 +5446,6 @@
msgstr ""
#: midx.c:1357
-#, fuzzy
msgid "Counting referenced objects"
msgstr "Contando objetos referenciados"
@@ -5564,27 +5454,25 @@
msgstr ""
#: midx.c:1558
-#, fuzzy
msgid "could not start pack-objects"
msgstr "incapaz de começar pack-objects"
#: midx.c:1578
-#, fuzzy
msgid "could not finish pack-objects"
msgstr "incapaz de terminar pack-objects"
#: name-hash.c:542
-#, fuzzy, c-format
+#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "incapaz criar thread lazy_dir: %s"
#: name-hash.c:564
-#, fuzzy, c-format
+#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "incapaz criar thread lazy_name: %s"
#: name-hash.c:570
-#, fuzzy, c-format
+#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "incapaz juntar a thread lazy_name: %s"
@@ -5635,7 +5523,7 @@
msgstr ""
#: object-file.c:584
-#, fuzzy, c-format
+#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz normalizar path de objeto alternativo: %s"
@@ -5645,22 +5533,19 @@
msgstr ""
#: object-file.c:665
-#, fuzzy, c-format
+#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz normalizar pasta de objeto: %s"
#: object-file.c:708
-#, fuzzy
msgid "unable to fdopen alternates lockfile"
msgstr "incapaz de fdopen lockfile alternativo"
#: object-file.c:726
-#, fuzzy
msgid "unable to read alternates file"
msgstr "incapaz ler ficheiro alternativo"
#: object-file.c:733
-#, fuzzy
msgid "unable to move new alternates file into place"
msgstr "incapaz mover novo ficheiro alternativo para o sítio"
@@ -5688,7 +5573,7 @@
#: object-file.c:809
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
+msgstr "repositório de referência '%s' está enxertado"
#: object-file.c:869
#, c-format
@@ -5701,7 +5586,7 @@
msgstr ""
#: object-file.c:1054
-#, fuzzy, c-format
+#, c-format
msgid "mmap failed%s"
msgstr "mmap falhou%s"
@@ -5711,19 +5596,18 @@
msgstr ""
#: object-file.c:1353 object-file.c:2548
-#, fuzzy, c-format
+#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto solto '%s' corrupto"
#: object-file.c:1355 object-file.c:2552
-#, fuzzy, c-format
+#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "lixo no fim de objeto solto '%s'"
#: object-file.c:1397
-#, fuzzy
msgid "invalid object type"
-msgstr "tipo de objeto incorreto."
+msgstr "tipo de objeto inválido"
#: object-file.c:1481
#, c-format
@@ -5731,7 +5615,7 @@
msgstr ""
#: object-file.c:1484
-#, fuzzy, c-format
+#, c-format
msgid "unable to unpack %s header"
msgstr "incapaz desempacotar cabeçalho %s"
@@ -5741,17 +5625,17 @@
msgstr ""
#: object-file.c:1493
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse %s header"
msgstr "incapaz processar cabeçalho %s"
#: object-file.c:1717
-#, fuzzy, c-format
+#, c-format
msgid "failed to read object %s"
-msgstr "falha ao ler o objeto '%s'."
+msgstr "falhou ler objeto %s"
#: object-file.c:1721
-#, fuzzy, c-format
+#, c-format
msgid "replacement %s not found for %s"
msgstr "%s substituto, por encontrar para %s"
@@ -5766,12 +5650,12 @@
msgstr ""
#: object-file.c:1834
-#, fuzzy, c-format
+#, c-format
msgid "unable to write file %s"
msgstr "incapaz escrever ficheiro %s"
#: object-file.c:1841
-#, fuzzy, c-format
+#, c-format
msgid "unable to set permission to '%s'"
msgstr "incapaz definir permissão para '%s'"
@@ -5789,22 +5673,20 @@
msgstr ""
#: object-file.c:1935
-#, fuzzy
msgid "unable to create temporary file"
msgstr "incapaz criar ficheiro temporário"
#: object-file.c:1959
-#, fuzzy
msgid "unable to write loose object file"
msgstr "incapaz escrever ficheiro objeto solto"
#: object-file.c:1965
-#, fuzzy, c-format
+#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "incapaz esvaziar objeto novo %s (%d)"
#: object-file.c:1969
-#, fuzzy, c-format
+#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd em objeto %s falhou (%d)"
@@ -5819,19 +5701,17 @@
msgstr ""
#: object-file.c:2060
-#, fuzzy, c-format
+#, c-format
msgid "cannot read object for %s"
msgstr "incapaz ler objeto para %s"
#: object-file.c:2111
-#, fuzzy
msgid "corrupt commit"
-msgstr "substituir autor do commit"
+msgstr "memória de Git rota"
#: object-file.c:2119
-#, fuzzy
msgid "corrupt tag"
-msgstr "mostrar tags"
+msgstr "etiqueta rota"
#: object-file.c:2219
#, c-format
@@ -5839,22 +5719,22 @@
msgstr ""
#: object-file.c:2222
-#, fuzzy, c-format
+#, c-format
msgid "short read while indexing %s"
msgstr "leitura curta enquanto indexando %s"
#: object-file.c:2295 object-file.c:2305
-#, fuzzy, c-format
+#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falhou inserir na base de dados"
#: object-file.c:2311
-#, fuzzy, c-format
+#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo ficheiro insustentado"
#: object-file.c:2335
-#, fuzzy, c-format
+#, c-format
msgid "%s is not a valid object"
msgstr "%s é objeto inválido"
@@ -5874,27 +5754,27 @@
msgstr ""
#: object-file.c:2583
-#, fuzzy, c-format
+#, c-format
msgid "unable to mmap %s"
msgstr "incapaz mmap %s"
#: object-file.c:2588
-#, fuzzy, c-format
+#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz desempacotar cabeçalho de %s"
#: object-file.c:2594
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz processar cabeçalho de %s"
#: object-file.c:2605
-#, fuzzy, c-format
+#, c-format
msgid "unable to unpack contents of %s"
msgstr "incapaz desempacotar conteúdo de %s"
#: object-name.c:480
-#, fuzzy, c-format
+#, c-format
msgid "short object ID %s is ambiguous"
msgstr "SHA1 curto %s é ambíguo"
@@ -5903,7 +5783,6 @@
msgstr "Os candidatos são:"
#: object-name.c:790
-#, fuzzy
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"
@@ -5936,9 +5815,9 @@
msgstr ""
#: object-name.c:1696
-#, fuzzy, c-format
+#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+msgstr "caminho '%s' existe em disco, mas é inexistente em '%.*s'"
#: object-name.c:1702
#, c-format
@@ -5948,7 +5827,7 @@
msgstr ""
#: object-name.c:1711
-#, fuzzy, c-format
+#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "caminho '%s' é inexistente em '%.*s'"
@@ -5972,29 +5851,28 @@
msgstr ""
#: object-name.c:1765
-#, fuzzy, c-format
+#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "caminho '%s' é inexistente (quer no disco quer no index)"
#: object-name.c:1778
-#, fuzzy
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
"trabalho"
#: object-name.c:1916
-#, fuzzy, c-format
+#, c-format
msgid "invalid object name '%.*s'."
-msgstr "Nome de objeto inválido: '%s'."
+msgstr "nome de objeto inválido: '%.*s'."
#: object.c:53
-#, fuzzy, c-format
+#, c-format
msgid "invalid object type \"%s\""
-msgstr "objeto blob inválido %s"
+msgstr "tipo de objeto inválido \"%s\""
#: object.c:173
-#, fuzzy, c-format
+#, c-format
msgid "object %s is a %s, not a %s"
msgstr "objeto %s é %s, é %s nenhum(a)"
@@ -6014,14 +5892,14 @@
msgstr ""
#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
-#, fuzzy, c-format
+#, c-format
msgid "unable to get size of %s"
msgstr "incapaz obter tamanho de %s"
#: pack-bitmap.c:1571 builtin/rev-list.c:92
-#, fuzzy, c-format
+#, c-format
msgid "unable to get disk usage of %s"
-msgstr "incapaz obter tamanho de %s"
+msgstr "incapaz obter utilização em disco de %s"
#: pack-revindex.c:221
#, c-format
@@ -6049,22 +5927,21 @@
msgstr ""
#: pack-write.c:250
-#, fuzzy
msgid "cannot both write and verify reverse index"
-msgstr "incapaz ler o index"
+msgstr "incapaz escrever e também verificar cenário reverso"
#: pack-write.c:271
-#, fuzzy, c-format
+#, c-format
msgid "could not stat: %s"
-msgstr "incapaz obter estatutário %s"
+msgstr "incapaz stat: %s"
#: pack-write.c:283
-#, fuzzy, c-format
+#, c-format
msgid "failed to make %s readable"
-msgstr "falha a analisar %s"
+msgstr "falhou fazer %s legível"
#: pack-write.c:522
-#, fuzzy, c-format
+#, c-format
msgid "could not write '%s' promisor file"
msgstr "incapaz escrever ficheiro promissor '%s'"
@@ -6073,7 +5950,7 @@
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
#: packfile.c:655
-#, fuzzy, c-format
+#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "ficheiro-pacote %s incapaz ser mapeado%s"
@@ -6093,7 +5970,7 @@
msgstr ""
#: parse-options-cb.c:41
-#, fuzzy, c-format
+#, c-format
msgid "malformed expiration date '%s'"
msgstr "data de prazo de validade malformada '%s'"
@@ -6108,12 +5985,12 @@
msgstr "nome do objeto malformado '%s'"
#: parse-options.c:38
-#, fuzzy, c-format
+#, c-format
msgid "%s requires a value"
-msgstr "a opção '%s' requer um valor"
+msgstr "%s exige um valor"
#: parse-options.c:73
-#, fuzzy, c-format
+#, c-format
msgid "%s is incompatible with %s"
msgstr "%s é incompatível com %s"
@@ -6123,12 +6000,12 @@
msgstr ""
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
-#, fuzzy, c-format
+#, c-format
msgid "%s takes no value"
-msgstr "%s tem múltiplos valores"
+msgstr "%s leva valor nenhum"
#: parse-options.c:94
-#, fuzzy, c-format
+#, c-format
msgid "%s isn't available"
msgstr "%s está indisponível"
@@ -6163,9 +6040,9 @@
msgstr ""
#: parse-options.c:883
-#, fuzzy, c-format
+#, c-format
msgid "unknown non-ascii option in string: `%s'"
-msgstr "Definidição --confirm desconhecida: '%s'"
+msgstr "opção não-ascii desconhecida em string: `%s'"
#: parse-options.c:907
msgid "..."
@@ -6231,7 +6108,7 @@
#: pathspec.c:327
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido para magia de espetro-caminho 'prefix'"
#: pathspec.c:348
#, c-format
@@ -6254,7 +6131,7 @@
msgstr "%s: 'literal' e 'glob' são incompatíveis"
#: pathspec.c:466
-#, fuzzy, c-format
+#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' está fora do repositório em '%s'"
@@ -6279,22 +6156,18 @@
msgstr ""
#: pkt-line.c:92
-#, fuzzy
msgid "unable to write flush packet"
msgstr "incapaz escrever pacote flush"
#: pkt-line.c:99
-#, fuzzy
msgid "unable to write delim packet"
msgstr "incapaz escrever pacote delim"
#: pkt-line.c:106
-#, fuzzy
msgid "unable to write response end packet"
msgstr "incapaz escrever pacote fim de resposta"
#: pkt-line.c:113
-#, fuzzy
msgid "flush packet write failed"
msgstr "escrita de pacote flush falhou"
@@ -6303,7 +6176,6 @@
msgstr ""
#: pkt-line.c:169 pkt-line.c:171
-#, fuzzy
msgid "packet write with format failed"
msgstr "escrita de pacote com formato falhou"
@@ -6312,19 +6184,17 @@
msgstr ""
#: pkt-line.c:222
-#, fuzzy, c-format
+#, c-format
msgid "packet write failed: %s"
-msgstr "escrita de pacote falhou"
+msgstr "escrita de pacote falhou: %s"
#: pkt-line.c:328 pkt-line.c:329
-#, fuzzy
msgid "read error"
-msgstr "erro do programa"
+msgstr "erro de leitura"
#: pkt-line.c:339 pkt-line.c:340
-#, fuzzy
msgid "the remote end hung up unexpectedly"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou inesperadamente"
#: pkt-line.c:369 pkt-line.c:371
#, c-format
@@ -6342,18 +6212,17 @@
msgstr "erro remoto: %s"
#: preload-index.c:125
-#, fuzzy
msgid "Refreshing index"
msgstr "Refrescando index"
#: preload-index.c:144
-#, fuzzy, c-format
+#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "incapaz criar thread de lstat: %s"
#: pretty.c:988
msgid "unable to parse --pretty format"
-msgstr "incapaz analisar formato de --pretty"
+msgstr "incapaz processar formato de --pretty"
#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
@@ -6373,26 +6242,23 @@
msgstr ""
#: protocol-caps.c:103
-#, fuzzy
msgid "object-info: expected flush after arguments"
-msgstr "--continue supõe argumento nenhum"
+msgstr ""
#: prune-packed.c:35
msgid "Removing duplicate objects"
msgstr "A remover objetos duplicados"
#: range-diff.c:78
-#, fuzzy
msgid "could not start `log`"
msgstr "incapaz começar `log`"
#: range-diff.c:80
-#, fuzzy
msgid "could not read `log` output"
msgstr "incapaz ler output de `log`"
#: range-diff.c:101 sequencer.c:5550
-#, fuzzy, c-format
+#, c-format
msgid "could not parse commit '%s'"
msgstr "incapaz analisar commit '%s'"
@@ -6404,9 +6270,9 @@
msgstr ""
#: range-diff.c:140
-#, fuzzy, c-format
+#, c-format
msgid "could not parse git header '%.*s'"
-msgstr "incapaz analisar cabeçalho git '%.*s'"
+msgstr "incapaz processar cabeçalho git '%.*s'"
#: range-diff.c:307
msgid "failed to generate diff"
@@ -6417,14 +6283,14 @@
msgstr ""
#: range-diff.c:562 range-diff.c:564
-#, fuzzy, c-format
+#, c-format
msgid "could not parse log for '%s'"
-msgstr "incapaz analisar log para '%s'"
+msgstr "incapaz processar registo para '%s'"
#: read-cache.c:710
-#, fuzzy, c-format
+#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "%s: já existe no índice"
+msgstr "Adicionarei nenhuma alias de ficheiro '%s' ('%s' já existe em cenário)"
#: read-cache.c:726
msgid "cannot create an empty blob in the object database"
@@ -6436,32 +6302,31 @@
msgstr ""
#: read-cache.c:753
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not have a commit checked out"
-msgstr "'%s' tem commit checked out nenhum"
+msgstr "'%s' tem memória nenhuma em observação"
#: read-cache.c:805
-#, fuzzy, c-format
+#, c-format
msgid "unable to index file '%s'"
msgstr "incapaz indexar ficheiro '%s'"
#: read-cache.c:824
-#, fuzzy, c-format
+#, c-format
msgid "unable to add '%s' to index"
msgstr "incapaz adicionar %s a index"
#: read-cache.c:835
-#, fuzzy, c-format
+#, c-format
msgid "unable to stat '%s'"
msgstr "incapaz obter estatutário de '%s'"
#: read-cache.c:1358
-#, fuzzy, c-format
+#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' aparece ambo como ficheiro e como pasta"
#: read-cache.c:1573
-#, fuzzy
msgid "Refresh index"
msgstr "Refresca index"
@@ -6489,9 +6354,9 @@
msgstr ""
#: read-cache.c:1774
-#, fuzzy, c-format
+#, c-format
msgid "bad index version %d"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário %d inválida"
#: read-cache.c:1783
msgid "bad index file sha1 signature"
@@ -6503,14 +6368,14 @@
msgstr ""
#: read-cache.c:1819
-#, fuzzy, c-format
+#, c-format
msgid "ignoring %.4s extension"
-msgstr "modelo %s ignorado"
+msgstr "ignorando extensão %.4s"
#: read-cache.c:1856
-#, fuzzy, c-format
+#, c-format
msgid "unknown index entry format 0x%08x"
-msgstr "formato de %.*s desconhecido %s"
+msgstr "formato de entrada de cenário desconhecido 0x%08x"
#: read-cache.c:1872
#, c-format
@@ -6522,12 +6387,12 @@
msgstr ""
#: read-cache.c:1932
-#, fuzzy, c-format
+#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"
#: read-cache.c:1935
-#, fuzzy, c-format
+#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entradas de estágio desordenadas para '%s'"
@@ -6541,22 +6406,22 @@
msgstr ""
#: read-cache.c:2185
-#, fuzzy, c-format
+#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "incapaz criar thread load_cache_entries: %s"
#: read-cache.c:2198
-#, fuzzy, c-format
+#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "incapaz juntar a thread load_cache_entries: %s"
#: read-cache.c:2231
-#, fuzzy, c-format
+#, c-format
msgid "%s: index file open failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "%s: abertura de ficheiro de cenário falhou"
#: read-cache.c:2235
-#, fuzzy, c-format
+#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: incapaz obter estatutário de index aberto"
@@ -6566,22 +6431,22 @@
msgstr ""
#: read-cache.c:2243
-#, fuzzy, c-format
+#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: incapaz mapear ficheiro index%s"
#: read-cache.c:2286
-#, fuzzy, c-format
+#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "incapaz criar thread load_index_extensions: %s"
#: read-cache.c:2313
-#, fuzzy, c-format
+#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "incapaz juntar a thread load_index_extensions: %s"
#: read-cache.c:2351
-#, fuzzy, c-format
+#, c-format
msgid "could not freshen shared index '%s'"
msgstr "incapaz refrescar index partilhado '%s'"
@@ -6600,7 +6465,7 @@
msgstr ""
#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
-#, fuzzy, c-format
+#, c-format
msgid "could not stat '%s'"
msgstr "incapaz obter estatutário '%s'"
@@ -6615,35 +6480,33 @@
msgstr "incapaz deslinkar: %s"
#: read-cache.c:3200
-#, fuzzy, c-format
+#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "incapaz arranjar bits de permissão em '%s'"
#: read-cache.c:3349
-#, fuzzy, c-format
+#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: incapaz baixar para estágio #0"
#: rebase-interactive.c:11
-#, fuzzy
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
-"continue'.\n"
+"Podes consertar isto com 'git rebase --edit-todo' e depois executar 'git "
+"rebase --continue'.\n"
+"Ou podes abortar o rebase com 'git rebase --abort'.\n"
#: rebase-interactive.c:33
-#, fuzzy, c-format
+#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
-"Ignorado."
+"definição %s desconhecida da opção rebase.missingCommitsCheck. Ignorando."
#: rebase-interactive.c:42
-#, fuzzy
msgid ""
"\n"
"Commands:\n"
@@ -6669,22 +6532,33 @@
msgstr ""
"\n"
"Comandos:\n"
-" p, pick = usar commit\n"
-" r, reword = usar commit, mas editar a mensagem de commit\n"
-" e, edit = usar commit, mas parar para emendar\n"
-" s, squash = usar commit, mas fundir com o commit anterior\n"
-" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n"
-" x, exec = executar o comando (o resto da linha) usando a shell\n"
-" d, drop = remover commit\n"
+"p, pick <memória> = usar memória\n"
+"r, reword <memória> = usar memória, mas editar a mensagem de memória\n"
+"e, edit <memória> = usar memória, mas parar para emendar\n"
+"s, squash <memória> = usar memória, mas fundir com a memória anterior\n"
+"f, fixup [-C | -c] <memória> = como \"squash\", mas mantém apenas the\n"
+" mensagem anterior de registo da memória, a menos que\n"
+" -C seja usada, em que neste caso mantém apenas a mensagem\n"
+" desta memória; -c é o mesmo que -C mas abre o editor\n"
+"x, exec <comando> = executar o comando (o resto da linha) usando a shell\n"
+"b, break = para aqui (continuar rebase mais tarde com 'git rebase --continue')"
+"d, drop <memória> = remover memória\n"
+"l, label <etiqueta> = etiquetar HEAD atual com um nome\n"
+"t, reset <etiqueta> = restabelecer HEAD a uma etiqueta\n"
+"n, merge [-C <memória> | -c <memória>] <etiqueta> [# <oneline>]\n"
+". criar uma memória de junção usando a mensagem de memória\n"
+". original (ou oneline, se nenhuma memória de junção foi\n"
+". especificada); usa -c <memória> para refrasear a mensagem\n"
+". de memória\n"
"\n"
"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
#: rebase-interactive.c:66
-#, fuzzy, c-format
+#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+msgstr[0] "Rebasear %s sobre %s (%d comando)"
+msgstr[1] "Rebasear %s sobre %s (%d comandos)"
#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
msgid ""
@@ -6728,18 +6602,18 @@
#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
-#, fuzzy, c-format
+#, c-format
msgid "could not write '%s'"
msgstr "incapaz escrever '%s'"
#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
#: builtin/rebase.c:253
-#, fuzzy, c-format
+#, c-format
msgid "could not write '%s'."
msgstr "incapaz escrever '%s'."
#: rebase-interactive.c:196
-#, fuzzy, c-format
+#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
@@ -6748,7 +6622,7 @@
"Commits descartados (mais novo para o mais velho):\n"
#: rebase-interactive.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
@@ -6816,17 +6690,17 @@
msgstr "argumento %%(%s) desconhecido: %s"
#: ref-filter.c:315
-#, fuzzy, c-format
+#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) leva argumentos nenhuns"
#: ref-filter.c:339
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argumento %%(objectsize) desconhecido: %s"
#: ref-filter.c:347
-#, fuzzy, c-format
+#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) leva argumentos nenhuns"
@@ -6836,7 +6710,7 @@
msgstr "%%(body) leva argumentos nenhuns"
#: ref-filter.c:372
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argumento %%(subject) desconhecido: %s"
@@ -6846,7 +6720,7 @@
msgstr ""
#: ref-filter.c:393
-#, fuzzy, c-format
+#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconhecido: %s"
@@ -6861,17 +6735,17 @@
msgstr "argumento %%(contents) desconhecido: %s"
#: ref-filter.c:441
-#, fuzzy, c-format
+#, c-format
msgid "positive value expected '%s' in %%(%s)"
-msgstr "valor positivo esperado contents:lines=%s"
+msgstr "valor positivo esperado '%s' em %%(%s)"
#: ref-filter.c:445
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argumento '%s' desconhecido em %%(%s)"
#: ref-filter.c:459
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized email option: %s"
msgstr "opção de email desconhecida: %s"
@@ -6898,7 +6772,7 @@
#: ref-filter.c:525
#, c-format
msgid "positive width expected with the %%(align) atom"
-msgstr "largura positiva esperada com o átomo %%(algn)"
+msgstr "largura positiva esperada com o átomo %%(align)"
#: ref-filter.c:543
#, c-format
@@ -6908,7 +6782,7 @@
#: ref-filter.c:645
#, c-format
msgid "malformed field name: %.*s"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome em campo malformado: %.*s"
#: ref-filter.c:672
#, c-format
@@ -6967,17 +6841,17 @@
msgstr "formato de string %s malformado"
#: ref-filter.c:1621
-#, fuzzy, c-format
+#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ramo nenhum, rebaseando %s)"
#: ref-filter.c:1624
-#, fuzzy, c-format
+#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
#: ref-filter.c:1627
-#, fuzzy, c-format
+#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ramo nenhum, bisseção iniciada em %s)"
@@ -6992,7 +6866,6 @@
msgstr "(HEAD destacada de %s)"
#: ref-filter.c:1637
-#, fuzzy
msgid "(no branch)"
msgstr "(ramo nenhum)"
@@ -7019,7 +6892,7 @@
#: ref-filter.c:2158 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ref quebrada %s está a ser ignorada"
#: ref-filter.c:2502
#, c-format
@@ -7032,14 +6905,14 @@
msgstr "nome de objeto malformado %s"
#: ref-filter.c:2601
-#, fuzzy, c-format
+#, c-format
msgid "option `%s' must point to a commit"
msgstr "opção '%s' tem apontar para um commit"
#: refs.c:264
-#, fuzzy, c-format
+#, c-format
msgid "%s does not point to a valid object!"
-msgstr "'%s' aponta para objeto válido nenhum!"
+msgstr "%s aponta para objeto inválido!"
#: refs.c:566
#, c-format
@@ -7057,19 +6930,19 @@
msgstr ""
#: refs.c:588
-#, fuzzy, c-format
+#, c-format
msgid "could not retrieve `%s`"
-msgstr "incapaz recuperar '%s'"
+msgstr "incapaz resgatar `%s`"
#: refs.c:598
-#, fuzzy, c-format
+#, c-format
msgid "invalid branch name: %s = %s"
msgstr "Nome de ramo inválido: %s = %s"
#: refs.c:674
-#, fuzzy, c-format
+#, c-format
msgid "ignoring dangling symref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ref-simbólica perdida %s está a ser ignorada"
#: refs.c:922
#, c-format
@@ -7087,7 +6960,7 @@
msgstr ""
#: refs.c:1086
-#, fuzzy, c-format
+#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "recusando atualizar ref com nome inválido '%s'"
@@ -7097,7 +6970,7 @@
msgstr ""
#: refs.c:2051
-#, fuzzy, c-format
+#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "atualizações múltiplas para ref '%s' proíbidas"
@@ -7110,12 +6983,12 @@
msgstr ""
#: refs.c:2242 refs.c:2272
-#, fuzzy, c-format
+#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; incapaz criar '%s'"
#: refs.c:2248 refs.c:2283
-#, fuzzy, c-format
+#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "incapaz processar '%s' e '%s' ao mesmo tempo"
@@ -7179,7 +7052,7 @@
msgstr ""
#: remote.c:1083
-#, fuzzy, c-format
+#, c-format
msgid "src refspec %s does not match any"
msgstr "src refspec %s corresponde a nenhum"
@@ -7239,12 +7112,12 @@
msgstr ""
#: remote.c:1174
-#, fuzzy, c-format
+#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s incapaz ser resolvido para ramo"
#: remote.c:1185
-#, fuzzy, c-format
+#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "incapaz apagar '%s': ref remoto é inexistente"
@@ -7302,7 +7175,7 @@
msgstr "incapaz resolver atiro 'simple' para destino único"
#: remote.c:1943
-#, fuzzy, c-format
+#, c-format
msgid "couldn't find remote ref %s"
msgstr "incapaz encontrar ref remoto %s"
@@ -7318,17 +7191,17 @@
#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
+msgstr " (usa \"git branch --unset-upstream\" para corrigir)\n"
#: remote.c:2126
-#, fuzzy, c-format
+#, c-format
msgid "Your branch is up to date with '%s'.\n"
-msgstr "O seu ramo está atualizado com '%s'.\n"
+msgstr "Teu ramo está atualizado com '%s'.\n"
#: remote.c:2130
-#, fuzzy, c-format
+#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "O seu ramo está à frente de '%s' por %d commit.\n"
+msgstr "Teu ramo e '%s' referem-se a memórias diferentes.\n"
#: remote.c:2133
#, c-format
@@ -7344,7 +7217,7 @@
#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (use \"git push\" para publicar os commits locais)\n"
+msgstr " (usa \"git push\" para publicar os commits locais)\n"
#: remote.c:2146
#, c-format
@@ -7360,7 +7233,7 @@
#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
+msgstr " (usa \"git pull\" para atualizar teu ramo local)\n"
#: remote.c:2157
#, c-format
@@ -7379,34 +7252,33 @@
#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
+msgstr " (usa \"git pull\" para juntar o ramo remoto no teu ramo)\n"
#: remote.c:2359
-#, fuzzy, c-format
+#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "incapaz analisar nome de objeto esperado '%s'"
#: replace-object.c:21
-#, fuzzy, c-format
+#, c-format
msgid "bad replace ref name: %s"
msgstr "substituição de nome de ref inválida: %s"
#: replace-object.c:30
-#, fuzzy, c-format
+#, c-format
msgid "duplicate replace ref: %s"
msgstr "substituição duplicada de ref: %s"
#: replace-object.c:82
-#, fuzzy, c-format
+#, c-format
msgid "replace depth too high for object %s"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir profundidade demasiado funda para objeto %s"
#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr ""
#: rerere.c:248 rerere.c:253
-#, fuzzy
msgid "unable to write rerere record"
msgstr "incapaz escrever registro rerere"
@@ -7421,7 +7293,7 @@
msgstr ""
#: rerere.c:487 rerere.c:1023
-#, fuzzy, c-format
+#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "incapaz analisar pedaços conflituosos em '%s'"
@@ -7451,7 +7323,7 @@
msgstr ""
#: rerere.c:787
-#, fuzzy, c-format
+#, c-format
msgid "cannot unlink stray '%s'"
msgstr "incapaz deslinkar o perdido '%s'"
@@ -7467,17 +7339,17 @@
msgstr "incapaz criar pasta '%s'"
#: rerere.c:1041
-#, fuzzy, c-format
+#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou atualizar estado conflituoso em '%s'"
#: rerere.c:1052 rerere.c:1059
-#, fuzzy, c-format
+#, c-format
msgid "no remembered resolution for '%s'"
msgstr "a faltar a lembrança da solução para '%s'"
#: rerere.c:1061
-#, fuzzy, c-format
+#, c-format
msgid "cannot unlink '%s'"
msgstr "incapaz de deslinkar '%s'"
@@ -7487,24 +7359,22 @@
msgstr ""
#: rerere.c:1080
-#, fuzzy, c-format
+#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Está esquecida resolução para '%s'\n"
#: rerere.c:1191
-#, fuzzy
msgid "unable to open rr-cache directory"
msgstr "incapaz abrir pasta rr-cache"
#: reset.c:42
-#, fuzzy
msgid "could not determine HEAD revision"
msgstr "incapaz determinar revisão de HEAD"
#: reset.c:69 reset.c:75 sequencer.c:3689
-#, fuzzy, c-format
+#, c-format
msgid "failed to find tree of %s"
-msgstr "Falha ao procurar árvore de %s."
+msgstr "falhou encontrar árvore de %s"
#: revision.c:2344
msgid "--unpacked=<packfile> no longer supported"
@@ -7525,10 +7395,10 @@
#: run-command.c:766
msgid "open /dev/null failed"
-msgstr "falha ao abrir /dev/null"
+msgstr "abrir /dev/null falhou"
#: run-command.c:1274
-#, fuzzy, c-format
+#, c-format
msgid "cannot create async thread: %s"
msgstr "incapaz criar thread assíncrona: %s"
@@ -7540,7 +7410,6 @@
msgstr ""
#: send-pack.c:150
-#, fuzzy
msgid "unexpected flush packet while reading remote unpack status"
msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto"
@@ -7559,22 +7428,20 @@
msgstr "falha ao assinar o certificado de publicação"
#: send-pack.c:433
-#, fuzzy
msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "fetch-pack: incapaz de aforquilhar %s"
+msgstr "send-pack: incapaz de fazer fork a subprocesso buscar"
#: send-pack.c:455
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
#: send-pack.c:526
-#, fuzzy
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "o recetor insustenta algoritmo hash deste repositório"
#: send-pack.c:535
msgid "the receiving end does not support --signed push"
-msgstr "o recetor insustenta atiro --signed"
+msgstr "o lado receptor insustenta atiro com --signed"
#: send-pack.c:537
msgid ""
@@ -7586,19 +7453,19 @@
#: send-pack.c:544
msgid "the receiving end does not support --atomic push"
-msgstr "o recetor insustenta atiro com --atomic"
+msgstr "o lado receptor insustenta atiro com --atomic"
#: send-pack.c:549
msgid "the receiving end does not support push options"
msgstr "o recetor insustenta opções de atiro"
#: sequencer.c:196
-#, fuzzy, c-format
+#, c-format
msgid "invalid commit message cleanup mode '%s'"
-msgstr "Modo de limpeza inválido %s"
+msgstr "mensagem de memória de modo de limpeza inválida '%s'"
#: sequencer.c:324
-#, fuzzy, c-format
+#, c-format
msgid "could not delete '%s'"
msgstr "incapaz de apagar '%s'"
@@ -7616,12 +7483,11 @@
msgstr "cherry-pick"
#: sequencer.c:358
-#, fuzzy
msgid "rebase"
msgstr "rebase -i"
#: sequencer.c:360
-#, fuzzy, c-format
+#, c-format
msgid "unknown action: %d"
msgstr "Ação desconhecida: %d"
@@ -7661,7 +7527,7 @@
#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
#: sequencer.c:3555
-#, fuzzy, c-format
+#, c-format
msgid "failed to finalize '%s'"
msgstr "falha ao finalizar '%s'."
@@ -7693,12 +7559,10 @@
msgstr "%s: Incapaz de escrever novo ficheiro index"
#: sequencer.c:685
-#, fuzzy
msgid "unable to update cache tree"
-msgstr "incapaz atualizar árvore de cache"
+msgstr "incapaz atualizar árvore de cenário"
#: sequencer.c:699
-#, fuzzy
msgid "could not resolve HEAD commit"
msgstr "incapaz resolver memória HEAD"
@@ -7708,7 +7572,7 @@
msgstr ""
#: sequencer.c:790
-#, fuzzy, c-format
+#, c-format
msgid "unable to dequote value of '%s'"
msgstr "incapaz retirar valor, da citação '%s'"
@@ -7839,7 +7703,6 @@
msgstr "incapaz analisar memória recém-criada"
#: sequencer.c:1321
-#, fuzzy
msgid "unable to resolve HEAD after creating commit"
msgstr "incapaz resolver HEAD após criar memória"
@@ -7852,12 +7715,11 @@
msgstr " (commit-raiz)"
#: sequencer.c:1348
-#, fuzzy
msgid "could not parse HEAD"
msgstr "incapaz processar HEAD"
#: sequencer.c:1350
-#, fuzzy, c-format
+#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s é commit nenhum!"
@@ -7866,7 +7728,6 @@
msgstr "incapaz analisar commit HEAD"
#: sequencer.c:1410 sequencer.c:2295
-#, fuzzy
msgid "unable to parse commit author"
msgstr "incapaz processar autor de commit"
@@ -7875,7 +7736,7 @@
msgstr ""
#: sequencer.c:1454 sequencer.c:1574
-#, fuzzy, c-format
+#, c-format
msgid "unable to read commit message from '%s'"
msgstr "incapaz ler mensagem de commit de '%s'"
@@ -7900,12 +7761,12 @@
msgstr "incapaz atualizar %s"
#: sequencer.c:1606
-#, fuzzy, c-format
+#, c-format
msgid "could not parse commit %s"
msgstr "incapaz processar commit %s"
#: sequencer.c:1611
-#, fuzzy, c-format
+#, c-format
msgid "could not parse parent commit %s"
msgstr "incapaz processar commit parente %s"
@@ -7964,7 +7825,6 @@
msgstr "teu ficheiro índex está por juntar."
#: sequencer.c:2079
-#, fuzzy
msgid "cannot fixup root commit"
msgstr "incapaz consertar commit raíz"
@@ -8018,10 +7878,10 @@
#: sequencer.c:2352
#, c-format
msgid "git %s: failed to refresh the index"
-msgstr "git %s: falha ao atualizar o índice"
+msgstr "git %s: falha ao atualizar o cenário"
#: sequencer.c:2425
-#, fuzzy, c-format
+#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s rejeita argumentos: '%s'"
@@ -8031,7 +7891,7 @@
msgstr ""
#: sequencer.c:2477
-#, fuzzy, c-format
+#, c-format
msgid "could not parse '%s'"
msgstr "incapaz processar '%s'"
@@ -8046,12 +7906,10 @@
msgstr "incapaz '%s' sem um commit anterior"
#: sequencer.c:2635
-#, fuzzy
msgid "cancelling a cherry picking in progress"
msgstr "cancelando um cherry picking em curso"
#: sequencer.c:2644
-#, fuzzy
msgid "cancelling a revert in progress"
msgstr "cancelando uma reversão em curso"
@@ -8095,24 +7953,22 @@
msgstr "o conjunto de commits especificado está vazio"
#: sequencer.c:3029
-#, fuzzy
msgid "revert is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "reversão já está em curso"
#: sequencer.c:3031
-#, fuzzy, c-format
+#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git revert (--continue | %s--abort | --quit)\""
#: sequencer.c:3034
-#, fuzzy
msgid "cherry-pick is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "a apanha já está em curso"
#: sequencer.c:3036
-#, fuzzy, c-format
+#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git cherry-pick (--continue | %s--abort | --quit)\""
#: sequencer.c:3050
#, c-format
@@ -8159,12 +8015,10 @@
msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!"
#: sequencer.c:3220
-#, fuzzy
msgid "no revert in progress"
msgstr "em curso reversão nenhuma"
#: sequencer.c:3229
-#, fuzzy
msgid "no cherry-pick in progress"
msgstr "cherry-pick nenhum em curso"
@@ -8188,12 +8042,12 @@
msgstr "incapaz ler HEAD"
#: sequencer.c:3428
-#, fuzzy, c-format
+#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
#: sequencer.c:3436
-#, fuzzy, c-format
+#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
@@ -8212,12 +8066,12 @@
" git rebase --continue\n"
#: sequencer.c:3446
-#, fuzzy, c-format
+#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Incapaz aplicar %s... %.*s"
#: sequencer.c:3453
-#, fuzzy, c-format
+#, c-format
msgid "Could not merge %.*s"
msgstr "Incapaz juntar %.*s"
@@ -8227,7 +8081,7 @@
msgstr "incapaz copiar '%s' para '%s'"
#: sequencer.c:3483
-#, fuzzy, c-format
+#, c-format
msgid "Executing: %s\n"
msgstr "A executar: %s\n"
@@ -8248,7 +8102,7 @@
#: sequencer.c:3504
msgid "and made changes to the index and/or the working tree\n"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n"
+msgstr "e fiz alterações ao cenário e/ou à árvore-trabalho\n"
#: sequencer.c:3510
#, c-format
@@ -8268,12 +8122,11 @@
"\n"
#: sequencer.c:3572
-#, fuzzy, c-format
+#, c-format
msgid "illegal label name: '%.*s'"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome de rótulo ilegal: '%.*s'"
#: sequencer.c:3645
-#, fuzzy
msgid "writing fake root commit"
msgstr "escrevendo commit de raíz falso"
@@ -8282,22 +8135,21 @@
msgstr ""
#: sequencer.c:3734
-#, fuzzy, c-format
+#, c-format
msgid "could not resolve '%s'"
msgstr "incapaz resolver '%s'"
#: sequencer.c:3767
-#, fuzzy
msgid "cannot merge without a current revision"
msgstr "incapaz juntar sem uma revisão currente"
#: sequencer.c:3789
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse '%.*s'"
msgstr "incapaz processar '%.*s'"
#: sequencer.c:3798
-#, fuzzy, c-format
+#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada a juntar: '%.*s'"
@@ -8306,17 +8158,16 @@
msgstr ""
#: sequencer.c:3826
-#, fuzzy, c-format
+#, c-format
msgid "could not get commit message of '%s'"
msgstr "incapaz obter mensagem de commit de '%s'"
#: sequencer.c:4009
-#, fuzzy, c-format
+#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "incapaz de tentar juntar '%.*s'"
#: sequencer.c:4025
-#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "merge: Incapaz de escrever novo ficheiro index"
@@ -8325,27 +8176,26 @@
msgstr "Incapaz de arrumar automaticamente (autostash)"
#: sequencer.c:4102
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Resposta de squash inexperada: '%s'"
#: sequencer.c:4108
-#, fuzzy, c-format
+#, c-format
msgid "Could not create directory for '%s'"
msgstr "Incapaz de criar a pasta para '%s'"
#: sequencer.c:4111
-#, fuzzy, c-format
+#, c-format
msgid "Created autostash: %s\n"
msgstr "Criado autostash: %s\n"
#: sequencer.c:4115
-#, fuzzy
msgid "could not reset --hard"
-msgstr "incapaz repor --hard"
+msgstr "incapaz restabelecer com --hard"
#: sequencer.c:4140
-#, fuzzy, c-format
+#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
@@ -8355,7 +8205,7 @@
msgstr "incapaz guardar %s"
#: sequencer.c:4155
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s\n"
"Your changes are safe in the stash.\n"
@@ -8366,7 +8216,6 @@
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
#: sequencer.c:4160
-#, fuzzy
msgid "Applying autostash resulted in conflicts."
msgstr "Patch aplicado a '%s' com conflitos."
@@ -8376,17 +8225,17 @@
#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
-msgstr "incapaz soltar HEAD"
+msgstr "incapaz desanexar HEAD"
#: sequencer.c:4248
-#, fuzzy, c-format
+#, c-format
msgid "Stopped at HEAD\n"
msgstr "Parou no HEAD\n"
#: sequencer.c:4250
-#, fuzzy, c-format
+#, c-format
msgid "Stopped at %s\n"
-msgstr "Parou a %s... %.*s\n"
+msgstr "Parou em %s\n"
#: sequencer.c:4258
#, c-format
@@ -8430,7 +8279,7 @@
msgstr "incapaz atualizar HEAD para %s"
#: sequencer.c:4559
-#, fuzzy, c-format
+#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
@@ -8463,7 +8312,7 @@
"e execute 'git rebase --continue' de novo."
#: sequencer.c:4663 sequencer.c:4702
-#, fuzzy, c-format
+#, c-format
msgid "could not write file: '%s'"
msgstr "incapaz escrever ficheiro: '%s'"
@@ -8498,12 +8347,10 @@
msgstr ""
#: sequencer.c:5614 sequencer.c:5631
-#, fuzzy
msgid "nothing to do"
msgstr "nada a fazer"
#: sequencer.c:5650
-#, fuzzy
msgid "could not skip unnecessary pick commands"
msgstr "incapaz de saltar comandos pick desnecessários"
@@ -8512,7 +8359,7 @@
msgstr ""
#: setup.c:133
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "%s está fora do repositório em '%s'"
@@ -8538,7 +8385,7 @@
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
#: setup.c:264
-#, fuzzy, c-format
+#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "opção '%s' tem de vir antes argumentos diferentes de opção"
@@ -8554,7 +8401,6 @@
"'git <comando> [<revisão>...] -- [<ficheiro>...]'"
#: setup.c:419
-#, fuzzy
msgid "unable to set up work tree using invalid config"
msgstr "incapaz preparar work tree usando config inválido"
@@ -8565,17 +8411,15 @@
#: setup.c:658
#, c-format
msgid "Expected git repo version <= %d, found %d"
-msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
+msgstr "Esperava versão do repositório git <= %d, encontrei %d"
#: setup.c:666
-#, fuzzy
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "extensão de repositório desconhecida encontrada:"
msgstr[1] "extensões de repositório desconhecidas encontradas:"
#: setup.c:680
-#, fuzzy
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:"
@@ -8587,27 +8431,27 @@
msgstr ""
#: setup.c:703
-#, fuzzy, c-format
+#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "demasiado grande para ser um ficheiro .git: '%s'"
#: setup.c:705
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
msgstr "erro lendo %s"
#: setup.c:707
-#, fuzzy, c-format
+#, c-format
msgid "invalid gitfile format: %s"
-msgstr "formato de data inválido: %s"
+msgstr "formato de ficheiro-git inválido: %s"
#: setup.c:709
-#, fuzzy, c-format
+#, c-format
msgid "no path in gitfile: %s"
-msgstr "gitfile sem path: %s"
+msgstr "ficheiro-git sem caminho: %s"
#: setup.c:711
-#, fuzzy, c-format
+#, c-format
msgid "not a git repository: %s"
msgstr "é repositório git nenhum: %s"
@@ -8617,17 +8461,16 @@
msgstr ""
#: setup.c:827
-#, fuzzy, c-format
+#, c-format
msgid "not a git repository: '%s'"
msgstr "é repositório git nenhum: '%s'"
#: setup.c:856 setup.c:858 setup.c:889
-#, fuzzy, c-format
+#, c-format
msgid "cannot chdir to '%s'"
msgstr "incapaz chdir para '%s'"
#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
-#, fuzzy
msgid "cannot come back to cwd"
msgstr "incapaz de voltar para cwd"
@@ -8641,17 +8484,17 @@
msgstr "Incapaz de ler pasta atual de trabalho"
#: setup.c:1240 setup.c:1246
-#, fuzzy, c-format
+#, c-format
msgid "cannot change to '%s'"
msgstr "incapaz mudar para '%s'"
#: setup.c:1251
-#, fuzzy, c-format
+#, c-format
msgid "not a git repository (or any of the parent directories): %s"
-msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s"
+msgstr "é repositório git nenhum (ou qualquer pastas parente): %s"
#: setup.c:1257
-#, fuzzy, c-format
+#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
@@ -8661,7 +8504,7 @@
"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."
#: setup.c:1381
-#, fuzzy, c-format
+#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
@@ -8670,12 +8513,10 @@
"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
#: setup.c:1430
-#, fuzzy
msgid "open /dev/null or dup failed"
-msgstr "falha ao abrir /dev/null"
+msgstr "abrir /dev/null ou dup falhou"
#: setup.c:1445
-#, fuzzy
msgid "fork failed"
msgstr "falha ao invocar fseek"
@@ -8688,9 +8529,8 @@
msgstr ""
#: sparse-index.c:176
-#, fuzzy
msgid "unable to update cache-tree, staying full"
-msgstr "incapaz atualizar árvore de cache"
+msgstr "incapaz atualizar árvore-cenário, mantendo-a cheia"
#: sparse-index.c:263
#, c-format
@@ -8735,19 +8575,19 @@
#. TRANSLATORS: IEC 80000-13:2008 byte
#: strbuf.c:877
-#, fuzzy, c-format
+#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
#: strbuf.c:879
-#, fuzzy, c-format
+#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
#: builtin/rebase.c:866
@@ -8756,17 +8596,16 @@
msgstr "incapaz abrir '%s' para escrita"
#: strbuf.c:1177
-#, fuzzy, c-format
+#, c-format
msgid "could not edit '%s'"
msgstr "incapaz editar '%s'"
#: submodule-config.c:237
-#, fuzzy, c-format
+#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "ignorando nome suspeito de submódulo: %s"
#: submodule-config.c:304
-#, fuzzy
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "é proíbido valores negativos para submodule.fetchjobs"
@@ -8783,13 +8622,12 @@
#: submodule-config.c:766
#, c-format
msgid "Could not update .gitmodules entry %s"
-msgstr "Incapaz de atualizar entrada de .gitmodules %s"
+msgstr "Incapaz de atualizar entrada %s de .gitmodules"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"Incapaz de alterar .gitmodules por juntar, resolve os conflitos de junção "
-"primeiro"
+"Incapaz de alterar .gitmodules por juntar, resolve primeiro os conflitos de junção"
#: submodule.c:118 submodule.c:147
#, c-format
@@ -8799,26 +8637,26 @@
#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
-msgstr "Incapaz de remover a entrada de .gitmodules para %s"
+msgstr "Incapaz de remover a entrada %s de .gitmodules"
#: submodule.c:165
msgid "staging updated .gitmodules failed"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "encenação atualizada .gitmodules falhou"
#: submodule.c:328
-#, fuzzy, c-format
+#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "em submódulo despopulado '%s'"
#: submodule.c:359
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+msgstr "Espetro-caminho '%s' está no submódulo '%.*s'"
#: submodule.c:436
-#, fuzzy, c-format
+#, c-format
msgid "bad --ignore-submodules argument: %s"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr ""
#: submodule.c:805
#, c-format
@@ -8828,12 +8666,12 @@
msgstr ""
#: submodule.c:908
-#, fuzzy, c-format
+#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"
#: submodule.c:993
-#, fuzzy, c-format
+#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
@@ -8842,36 +8680,36 @@
"emsubmódulo %s"
#: submodule.c:1116
-#, fuzzy, c-format
+#, c-format
msgid "process for submodule '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+msgstr "processo para submódulo '%s' falhou"
#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
#: submodule.c:1156
-#, fuzzy, c-format
+#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Atirando submódulo '%s'\n"
#: submodule.c:1159
-#, fuzzy, c-format
+#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossível enviar submódulo '%s'\n"
#: submodule.c:1451
-#, fuzzy, c-format
+#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Buscando submódulo %s%s\n"
#: submodule.c:1485
-#, fuzzy, c-format
+#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Submódulo '%s' inacessível\n"
#: submodule.c:1640
-#, fuzzy, c-format
+#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
@@ -8885,14 +8723,14 @@
msgstr "'%s' é irreconhecível como um repositório git"
#: submodule.c:1682
-#, fuzzy, c-format
+#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "Incapaz executar 'git status' no submódulo '%s'"
+msgstr "Incapaz executar 'git status --porcelain=2' no submódulo %s"
#: submodule.c:1723
-#, fuzzy, c-format
+#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "'git status --porcelain=2' falhou no submódulo '%s'"
+msgstr "'git status --porcelain=2' falhou no submódulo %s"
#: submodule.c:1798
#, c-format
@@ -8905,7 +8743,7 @@
msgstr "incapaz executar 'git status' no submódulo '%s'"
#: submodule.c:1826
-#, fuzzy, c-format
+#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'"
@@ -8915,7 +8753,6 @@
msgstr "incapaz percorrer recursivamente o submódulo '%s'"
#: submodule.c:1874
-#, fuzzy
msgid "could not reset submodule index"
msgstr "incapaz repor index de submódulo"
@@ -8925,7 +8762,7 @@
msgstr "o submódulo '%s' tem índice sujo"
#: submodule.c:1968
-#, fuzzy, c-format
+#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' incapaz de ser atualizado."
@@ -9010,7 +8847,7 @@
#: trailer.c:1024 wrapper.c:676
#, c-format
msgid "could not stat %s"
-msgstr "incapaz obter estatutário %s"
+msgstr "incapaz stat %s"
#: trailer.c:1026
#, c-format
@@ -9032,12 +8869,11 @@
msgstr "incapaz renomear ficheiro temporário para %s"
#: transport-helper.c:62 transport-helper.c:91
-#, fuzzy
msgid "full write to remote helper failed"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "escrita completa para ajudante remoto falhou"
#: transport-helper.c:145
-#, fuzzy, c-format
+#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "incapaz de encontrar helper remoto para '%s'"
@@ -9062,12 +8898,11 @@
msgstr ""
#: transport-helper.c:417
-#, fuzzy, c-format
+#, c-format
msgid "%s also locked %s"
msgstr "%s também trancou %s"
#: transport-helper.c:497
-#, fuzzy
msgid "couldn't run fast-import"
msgstr "incapaz executar fast-import"
@@ -9076,12 +8911,12 @@
msgstr ""
#: transport-helper.c:549 transport-helper.c:1247
-#, fuzzy, c-format
+#, c-format
msgid "could not read ref %s"
msgstr "incapaz de ler ref %s"
#: transport-helper.c:594
-#, fuzzy, c-format
+#, c-format
msgid "unknown response to connect: %s"
msgstr "resposta de conexão desconhecida: %s"
@@ -9094,7 +8929,6 @@
msgstr ""
#: transport-helper.c:661 transport.c:1477
-#, fuzzy
msgid "operation not supported by protocol"
msgstr "opção insustentado pelo protocolo"
@@ -9117,37 +8951,37 @@
msgstr ""
#: transport-helper.c:855
-#, fuzzy, c-format
+#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportou código de status inesperado de %s"
#: transport-helper.c:938
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s insustenta dry-run"
#: transport-helper.c:941
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s insustenta --signed"
#: transport-helper.c:944
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s insustenta --signed=if-asked"
#: transport-helper.c:949
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s insustenta --atomic"
#: transport-helper.c:953
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s insustenta --%s"
#: transport-helper.c:960
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s insustenta 'push-option'"
@@ -9156,12 +8990,11 @@
msgstr ""
#: transport-helper.c:1065
-#, fuzzy, c-format
+#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s insustenta 'force'"
#: transport-helper.c:1112
-#, fuzzy
msgid "couldn't run fast-export"
msgstr "incapaz executar fast-export"
@@ -9177,12 +9010,12 @@
msgstr ""
#: transport-helper.c:1224
-#, fuzzy, c-format
+#, c-format
msgid "unsupported object format '%s'"
-msgstr "objeto malformado em '%s'"
+msgstr "formato de objeto '%s' insustentado"
#: transport-helper.c:1233
-#, fuzzy, c-format
+#, c-format
msgid "malformed response in ref list: %s"
msgstr "resposta em lista de ref malformada: %s"
@@ -9231,7 +9064,7 @@
msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
#: transport.c:145
-#, fuzzy, c-format
+#, c-format
msgid "could not read bundle '%s'"
msgstr "incapaz ler conjunto '%s'"
@@ -9249,12 +9082,10 @@
msgstr ""
#: transport.c:403
-#, fuzzy
msgid "server does not support wait-for-done"
-msgstr "Servidor insustenta --deepen"
+msgstr "Servidor insustenta wait-for-done"
#: transport.c:755
-#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "incapaz processar config transport.color.*"
@@ -9263,12 +9094,12 @@
msgstr ""
#: transport.c:965
-#, fuzzy, c-format
+#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor para config '%s' desconhecido: %s"
#: transport.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' proibido"
@@ -9317,9 +9148,8 @@
msgstr "Abortado."
#: transport.c:1346
-#, fuzzy
msgid "failed to push all needed submodules"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+msgstr "falhou ao atirar todos os submódulos necessários"
#: tree-walk.c:33
msgid "too-short tree object"
@@ -9545,7 +9375,7 @@
msgstr ""
#: unpack-trees.c:182
-#, fuzzy, c-format
+#, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
@@ -9575,7 +9405,6 @@
msgstr ""
#: unpack-trees.c:352
-#, fuzzy
msgid "Updating files"
msgstr "Atualizando ficheiros"
@@ -9587,7 +9416,6 @@
msgstr ""
#: unpack-trees.c:1618
-#, fuzzy
msgid "Updating index flags"
msgstr "Atualizando flags de cenário"
@@ -9630,7 +9458,6 @@
msgstr "segmento de caminho '..' inválido"
#: walker.c:170
-#, fuzzy
msgid "Fetching objects"
msgstr "Buscando objetos"
@@ -9650,29 +9477,27 @@
msgstr ""
#: worktree.c:326
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not exist"
msgstr "'%s' é inexistente"
#: worktree.c:332
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' é ficheiro .git nenhum, código de erro %d"
#: worktree.c:341
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' aponta para algo diferente de '%s'"
#: worktree.c:603
-#, fuzzy
msgid "not a directory"
msgstr "é pasta nenhuma"
#: worktree.c:612
-#, fuzzy
msgid ".git is not a file"
-msgstr "git show %s: ficheiro incorreto"
+msgstr ".git é ficheiro nenhum"
#: worktree.c:614
msgid ".git file broken"
@@ -9687,19 +9512,16 @@
msgstr ""
#: worktree.c:728
-#, fuzzy
msgid "unable to locate repository; .git is not a file"
-msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+msgstr "incapaz localizar repositório; .git é ficheiro nenhum"
#: worktree.c:732
-#, fuzzy
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+msgstr "incapaz localizar repositório; ficheiro .git referência repositório nenhum"
#: worktree.c:736
-#, fuzzy
msgid "unable to locate repository; .git file broken"
-msgstr "incapaz localizar repositório; .git está quebrado"
+msgstr "incapaz localizar repositório; ficheiro .git está quebrado"
#: worktree.c:742
msgid "gitdir unreadable"
@@ -9714,12 +9536,11 @@
msgstr ""
#: worktree.c:777
-#, fuzzy
msgid "gitdir file does not exist"
msgstr "ficheiro gitdir é inexistente"
#: worktree.c:782 worktree.c:791
-#, fuzzy, c-format
+#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "incapaz ler ficheiro gitdir (%s)"
@@ -9729,16 +9550,12 @@
msgstr ""
#: worktree.c:809
-#, fuzzy
msgid "invalid gitdir file"
-msgstr "linha de Data inválida"
+msgstr "ficheiro gitdir inválido"
#: worktree.c:817
-#, fuzzy
msgid "gitdir file points to non-existent location"
-msgstr ""
-"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
-"inexistente"
+msgstr "ficheiro gitdir aponta para localização inexistente"
#: wrapper.c:197 wrapper.c:367
#, c-format
@@ -9759,32 +9576,31 @@
msgstr "Paths por juntar:"
#: wt-status.c:187 wt-status.c:219
-#, fuzzy
msgid " (use \"git restore --staged <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr " (usa \"git restore --staged <ficheiro>...\" para desencenar)"
#: wt-status.c:190 wt-status.c:222
-#, fuzzy, c-format
+#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr " (usa \"git restore --source=%s --staged <ficheiro>...\" para desencenar)"
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)"
+msgstr " (usa \"git rm --cached <ficheiro>...\" para desencenar)"
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)"
+msgstr " (usa \"git add <ficheiro>...\" para marcar como resolvido)"
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-" (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
+" (usa \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
"resolvido)"
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
+msgstr " (usa \"git rm <ficheiro>...\" para marcar como resolvido)"
#: wt-status.c:211 wt-status.c:1125
msgid "Changes to be committed:"
@@ -9796,30 +9612,27 @@
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
+msgstr " (usa \"git add <ficheiro>...\" para atualizar o que será memorizado)"
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
+msgstr " (usa \"git add/rm <ficheiro>...\" para atualizar o que será memorizado)"
#: wt-status.c:241
-#, fuzzy
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
-"diretório de trabalho)"
+" (usa \"git restore <ficheiro>...\" para descartar alterações da pasta-trabalho)"
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (faz commit ou descarta o conteúdo por seguir ou modificado nos submódulos)"
+" (memoriza ou descarta os desmonitorizados ou o conteúdo modificado de submódulos)"
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
+msgstr " (usa \"git %s <ficheiro>...\" para incluir o que será memorizado)"
#: wt-status.c:266
msgid "both deleted:"
@@ -9894,11 +9707,11 @@
msgstr "conteúdo por seguir, "
#: wt-status.c:958
-#, fuzzy, c-format
+#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Está a rebasear neste momento."
-msgstr[1] "Está a rebasear neste momento."
+msgstr[0] "Teu esconderijo neste momento tem %d entrada"
+msgstr[1] "Teu esconderijo neste momento tem %d entradas"
#: wt-status.c:989
msgid "Submodules changed but not updated:"
@@ -9909,7 +9722,6 @@
msgstr "Alterações em submódulos para serem submetidas:"
#: wt-status.c:1073
-#, fuzzy
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9935,7 +9747,7 @@
#: wt-status.c:1200
msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (use \"git am --abort\" para abortar a integração)"
+msgstr " (usa \"git merge --abort\" para abortar a junção)"
#: wt-status.c:1204
msgid "All conflicts fixed but you are still merging."
@@ -9943,7 +9755,7 @@
#: wt-status.c:1207
msgid " (use \"git commit\" to conclude merge)"
-msgstr " (use \"git commit\" para concluir a integração)"
+msgstr " (usa \"git commit\" para concluir a junção)"
#: wt-status.c:1216
msgid "You are in the middle of an am session."
@@ -9951,19 +9763,19 @@
#: wt-status.c:1219
msgid "The current patch is empty."
-msgstr "O patch atual está vazio."
+msgstr "O remendo atual está vazio."
#: wt-status.c:1223
msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (corrija os conflitos e execute \"git am --continue\")"
+msgstr " (corrige os conflitos e executa \"git am --continue\")"
#: wt-status.c:1225
msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (use \"git am --skip\" para ignorar este patch)"
+msgstr " (usa \"git am --skip\" para ignorar este remendo)"
#: wt-status.c:1227
msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (use \"git am --abort\" para restaurar o ramo original)"
+msgstr " (usa \"git am --abort\" para restaurar o ramo original)"
#: wt-status.c:1360
msgid "git-rebase-todo is missing."
@@ -9998,7 +9810,7 @@
#: wt-status.c:1392
msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
+msgstr " (usa \"git rebase --edit-todo\" para visualizar e editar)"
#: wt-status.c:1404
#, c-format
@@ -10011,20 +9823,19 @@
#: wt-status.c:1422
msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
+msgstr " (corrige os conflitos e executa \"git rebase --continue\")"
#: wt-status.c:1424
msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (use \"git rebase --skip\" para ignorar este patch)"
+msgstr " (usa \"git rebase --skip\" para ignorar este remendo)"
#: wt-status.c:1426
msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr " (usa \"git rebase --abort\" para observar o ramo original)"
#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
+msgstr " (todos os conflitos corrigidos: executa \"git rebase --continue\")"
#: wt-status.c:1437
#, c-format
@@ -10041,8 +9852,7 @@
#: wt-status.c:1445
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
-"continue\")"
+" (Assim que a pasta-trabalho estiver limpa, executa \"git rebase --continue\")"
#: wt-status.c:1449
#, c-format
@@ -10057,7 +9867,7 @@
#: wt-status.c:1457
msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (use \"git commit --amend\" para emendar o commit atual)"
+msgstr " (usa \"git commit --amend\" para emendar a memória atual)"
#: wt-status.c:1459
msgid ""
@@ -10067,7 +9877,6 @@
"alterações)"
#: wt-status.c:1470
-#, fuzzy
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick atualmente em curso"
@@ -10078,33 +9887,29 @@
#: wt-status.c:1480
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr " (corrige conflitos e executa \"git cherry-pick --continue\")"
#: wt-status.c:1483
-#, fuzzy
msgid " (run \"git cherry-pick --continue\" to continue)"
-msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr " (executa \"git cherry-pick --continue\" para continuar)"
#: wt-status.c:1486
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
-"\")"
+" (todos conflitos corrigidos: executa \"git cherry-pick --continue\")"
#: wt-status.c:1488
-#, fuzzy
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr " (use \"git am --skip\" para ignorar este patch)"
+msgstr " (usa \"git cherry-pick --skip\" para ignorar este remendo)"
#: wt-status.c:1490
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
+" (usa \"git cherry-pick --abort\" para cancelar a operação cherry-pick)"
#: wt-status.c:1500
-#, fuzzy
msgid "Revert currently in progress."
-msgstr "abortar integração em curso"
+msgstr "Reversão atualmente em curso."
#: wt-status.c:1503
#, c-format
@@ -10113,26 +9918,23 @@
#: wt-status.c:1509
msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
+msgstr " (corrige os conflitos e executa \"git revert --continue\")"
#: wt-status.c:1512
-#, fuzzy
msgid " (run \"git revert --continue\" to continue)"
-msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
+msgstr " (executa \"git revert --continue\" para continuar)"
#: wt-status.c:1515
msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
+msgstr " (todos conflitos corrigidos: executa \"git revert --continue\")"
#: wt-status.c:1517
-#, fuzzy
msgid " (use \"git revert --skip\" to skip this patch)"
-msgstr " (use \"git rebase --skip\" para ignorar este patch)"
+msgstr " (usa \"git revert --skip\" para ignorar este remendo)"
#: wt-status.c:1519
msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
+msgstr " (usa \"git revert --abort\" para cancelar a operação de reversão)"
#: wt-status.c:1529
#, c-format
@@ -10141,16 +9943,15 @@
#: wt-status.c:1533
msgid "You are currently bisecting."
-msgstr "Está a bissetar neste momento."
+msgstr "Estás a bissetar neste momento."
#: wt-status.c:1536
msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
+msgstr " (usa \"git bisect reset\" para voltar ao ramo original)"
#: wt-status.c:1547
-#, fuzzy
msgid "You are in a sparse checkout."
-msgstr "Estás num checkout disperso."
+msgstr "Estás numa observação dispersa."
#: wt-status.c:1550
#, c-format
@@ -10159,7 +9960,7 @@
#: wt-status.c:1794
msgid "On branch "
-msgstr "No ramo "
+msgstr "Em ramo "
#: wt-status.c:1801
msgid "interactive rebase in progress; onto "
@@ -10186,7 +9987,6 @@
msgstr "Memória inicial"
#: wt-status.c:1831
-#, fuzzy
msgid "No commits yet"
msgstr "Ainda commits nenhuns"
@@ -10226,7 +10026,7 @@
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git commit "
+"foi adicionado a memória alteração nenhuma (usa \"git add\" e/ou \"git commit "
"-a\")\n"
#: wt-status.c:1874
@@ -10269,7 +10069,6 @@
msgstr "nada a commitar, worktree limpa\n"
#: wt-status.c:2003
-#, fuzzy
msgid "No commits yet on "
msgstr "Memórias nenhumas em "
@@ -10305,14 +10104,12 @@
msgstr "incapaz efetuar %s: teu index contém alterações por memorizar."
#: compat/simple-ipc/ipc-unix-socket.c:182
-#, fuzzy
msgid "could not send IPC command"
-msgstr "incapaz encontrar commit %s"
+msgstr "incapaz enviar comando IPC"
#: compat/simple-ipc/ipc-unix-socket.c:189
-#, fuzzy
msgid "could not read IPC response"
-msgstr "incapaz de ler ref %s"
+msgstr "incapaz de ler resposta IPC"
#: compat/simple-ipc/ipc-unix-socket.c:866
#, c-format
@@ -10320,9 +10117,9 @@
msgstr ""
#: compat/simple-ipc/ipc-unix-socket.c:878
-#, fuzzy, c-format
+#, c-format
msgid "could not start worker[0] for '%s'"
-msgstr "incapaz analisar log para '%s'"
+msgstr "incapaz começar worker[0] para '%s'"
#: compat/precompose_utf8.c:58 builtin/clone.c:461
#, c-format
@@ -10331,12 +10128,12 @@
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opções>] [--] <caminho>..."
+msgstr "git add [<opções>] [--] <espetro-caminho>..."
#: builtin/add.c:61
-#, fuzzy, c-format
+#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "incapaz chdir para '%s'"
+msgstr "incapaz chmod %cx '%s'"
#: builtin/add.c:99
#, c-format
@@ -10345,7 +10142,7 @@
#: builtin/add.c:104 builtin/commit.c:297
msgid "updating files failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "falhou ao atualizar ficheiros"
#: builtin/add.c:114
#, c-format
@@ -10432,7 +10229,7 @@
#: builtin/add.c:376
msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignorar paths removidos na worktree (o mesmo que --no-all)"
+msgstr "ignorar paths removidos na árvore-trabalho (o mesmo que --no-all)"
#: builtin/add.c:378
msgid "don't add, only refresh the index"
@@ -10448,12 +10245,11 @@
#: builtin/add.c:382 builtin/update-index.c:1006
msgid "override the executable bit of the listed files"
-msgstr "substituir o bit executável dos ficheiros listados"
+msgstr "sobrepor o bit executável dos ficheiros listados"
#: builtin/add.c:384
-#, fuzzy
msgid "warn when adding an embedded repository"
-msgstr "criar um repositório nu"
+msgstr ""
#: builtin/add.c:386
msgid "backend for `git stash -p`"
@@ -10478,9 +10274,9 @@
msgstr ""
#: builtin/add.c:432
-#, fuzzy, c-format
+#, c-format
msgid "adding embedded git repository: %s"
-msgstr "--stdin requer um repositório git"
+msgstr ""
#: builtin/add.c:451
msgid ""
@@ -10491,7 +10287,7 @@
#: builtin/add.c:460
msgid "adding files failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "falhou adicionar ficheiros"
#: builtin/add.c:488
msgid "--dry-run is incompatible with --interactive/--patch"
@@ -10511,18 +10307,17 @@
#: builtin/add.c:522
msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
+msgstr "Opção --ignore-missing só pode ser usada em conjunto com --dry-run"
#: builtin/add.c:526
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
-msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
+msgstr "parâmetro '%s' de --chmod tem de ser -x ou +x"
#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
-#, fuzzy
msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--patch é incompatível com --{hard,mixed,soft}"
+msgstr ""
#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
@@ -10592,7 +10387,7 @@
#: builtin/am.c:972 builtin/clone.c:414
#, c-format
msgid "failed to create directory '%s'"
-msgstr "falha ao criar o diretório '%s'"
+msgstr "falhou criar pasta '%s'"
#: builtin/am.c:977
msgid "Failed to split patches."
@@ -10601,36 +10396,35 @@
#: builtin/am.c:1126
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Após resolver este problema, execute \"%s --continue\"."
+msgstr "Após resolver este problema, executa \"%s --continue\"."
#: builtin/am.c:1127
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
+msgstr "Se preferes ignorar este remendo, executa \"%s --skip\" invés."
#: builtin/am.c:1128
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-"Para restaurar o ramo original e interromper a aplicação dos patches, "
-"execute \"%s --abort\"."
+"Para restaurar o ramo original e interromper a aplicação de remendos, "
+"executa \"%s --abort\"."
#: builtin/am.c:1223
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
#: builtin/am.c:1251
-#, fuzzy
msgid "Patch is empty."
-msgstr "O patch atual está vazio."
+msgstr "Remendo está vazio."
#: builtin/am.c:1316
-#, fuzzy, c-format
+#, c-format
msgid "missing author line in commit %s"
msgstr "Autor em falta: %s"
#: builtin/am.c:1319
-#, fuzzy, c-format
+#, c-format
msgid "invalid ident line: %.*s"
msgstr "linha de indentação inválida: %.*s"
@@ -10662,7 +10456,7 @@
#: builtin/am.c:1623
msgid "applying to an empty history"
-msgstr "a aplicar a um histórico vazio"
+msgstr "submetendo para um histórico vazio"
#: builtin/am.c:1675 builtin/am.c:1679
#, c-format
@@ -10698,7 +10492,7 @@
#: builtin/am.c:1814
msgid "No changes -- Patch already applied."
-msgstr "Nenhuma alteração -- Já foi aplicado o patch."
+msgstr "Nenhuma alteração -- Remendo já foi aplicado."
#: builtin/am.c:1820
#, c-format
@@ -10748,12 +10542,12 @@
#: builtin/am.c:2185
#, c-format
msgid "Invalid value for --patch-format: %s"
-msgstr "Valor inválido de --patch-format: %s"
+msgstr "Valor inválido para --patch-format: %s"
#: builtin/am.c:2227
-#, fuzzy, c-format
+#, c-format
msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor inválido de --patch-format: %s"
+msgstr "Valor inválido para --show-current-patch: %s"
#: builtin/am.c:2231
#, c-format
@@ -10783,12 +10577,11 @@
#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
#: builtin/repack.c:472 builtin/stash.c:945
msgid "be quiet"
-msgstr "silencioso"
+msgstr "ficar silencioso"
#: builtin/am.c:2276
-#, fuzzy
msgid "add a Signed-off-by trailer to the commit message"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar atribuição Signed-off-by para a mensagem de memória"
#: builtin/am.c:2279
msgid "recode into utf8 (default)"
@@ -10808,22 +10601,20 @@
#: builtin/am.c:2287
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passar flag --keep-cr para git-mailsplit para formato mbox"
+msgstr "passar a opção --keep-cr a git-mailsplit para formato mbox"
#: builtin/am.c:2290
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"proibido passares --keep-cr para git-mailsplit independentemente de am."
-"keepcr"
+"proibido passares --keep-cr a git-mailsplit independentemente de am.keepcr"
#: builtin/am.c:2293
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
#: builtin/am.c:2295
-#, fuzzy
msgid "pass it through git-mailinfo"
-msgstr "transmitir ao git-apply"
+msgstr "passa-o pelo git-mailinfo"
#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
@@ -10849,15 +10640,15 @@
#: builtin/am.c:2322
msgid "format the patch(es) are in"
-msgstr "formato de apresentação de patches"
+msgstr "formato em que o(s) remendo(s) estão"
#: builtin/am.c:2328
msgid "override error message when patch failure occurs"
-msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
+msgstr "sobrepor mensagem de erro quando falha na aplicação de remendo ocorrer"
#: builtin/am.c:2330
msgid "continue applying patches after resolving a conflict"
-msgstr "continuar a aplicar os patches depois de resolver os conflitos"
+msgstr "continuar submetendo remendos depois de resolver um conflito"
#: builtin/am.c:2333
msgid "synonyms for --continue"
@@ -10868,16 +10659,14 @@
msgstr "ignorar remendo atual"
#: builtin/am.c:2339
-#, fuzzy
msgid "restore the original branch and abort the patching operation"
-msgstr "restaurar o ramo original e abortar a operação de patch."
+msgstr "restaurar o ramo original e abortar a operação de remendar"
#: builtin/am.c:2342
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
#: builtin/am.c:2346
-#, fuzzy
msgid "show the patch being applied"
msgstr "mostrar linhas sendo submetidas"
@@ -10897,11 +10686,11 @@
#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
msgid "GPG-sign commits"
-msgstr "assinar os commits com GPG"
+msgstr "assinar memórias com GPG"
#: builtin/am.c:2359
msgid "(internal use for git-rebase)"
-msgstr "(uso interno de git-rebase)"
+msgstr "(uso interno para git-rebase)"
#: builtin/am.c:2377
msgid ""
@@ -10940,7 +10729,7 @@
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opções>] [<patch>...]"
+msgstr "git apply [<opções>] [<remendo>...]"
#: builtin/archive.c:17
#, c-format
@@ -10956,9 +10745,8 @@
msgstr "git archive: Remoto sem URL"
#: builtin/archive.c:61
-#, fuzzy
msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr "git archive: esperava-se ACK/NAK, obteve-se EOF"
+msgstr "git archive: esperado ACK/NAK, recebi pacote flush"
#: builtin/archive.c:64
#, c-format
@@ -10971,7 +10759,7 @@
#: builtin/archive.c:69
msgid "git archive: expected a flush"
-msgstr "git archive: esvaziamento de cache (flush) esperado"
+msgstr "git archive: esperado um flush"
#: builtin/bisect--helper.c:23
msgid "git bisect--helper --bisect-reset [<commit>]"
@@ -10982,7 +10770,6 @@
msgstr ""
#: builtin/bisect--helper.c:25
-#, fuzzy
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -11018,27 +10805,27 @@
msgstr ""
#: builtin/bisect--helper.c:107
-#, fuzzy, c-format
+#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
#: builtin/bisect--helper.c:114
-#, fuzzy, c-format
+#, c-format
msgid "could not write to file '%s'"
msgstr "incapaz escrever para ficheiro '%s'"
#: builtin/bisect--helper.c:155
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' é um termo inválido."
#: builtin/bisect--helper.c:159
-#, fuzzy, c-format
+#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "incapaz usar comando embutido '%s' como um termo"
#: builtin/bisect--helper.c:169
-#, fuzzy, c-format
+#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "incapaz alterar o significado do termo '%s'"
@@ -11047,67 +10834,66 @@
msgstr "por favor, usa dois termos diferentes"
#: builtin/bisect--helper.c:195
-#, fuzzy, c-format
+#, c-format
msgid "We are not bisecting.\n"
msgstr "Estamos bissetando nada.\n"
#: builtin/bisect--helper.c:203
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' é um commit inválido"
#: builtin/bisect--helper.c:212
-#, fuzzy, c-format
+#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'."
#: builtin/bisect--helper.c:256
-#, fuzzy, c-format
+#, c-format
msgid "Bad bisect_write argument: %s"
-msgstr "Argumento de bisect_write incorreto: $state"
+msgstr "Argumento bisect_write incorreto: %s"
#: builtin/bisect--helper.c:261
-#, fuzzy, c-format
+#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "incapaz obter oid da rev '%s'"
#: builtin/bisect--helper.c:273
-#, fuzzy, c-format
+#, c-format
msgid "couldn't open the file '%s'"
msgstr "incapaz abrir o ficheiro '%s'"
#: builtin/bisect--helper.c:299
-#, fuzzy, c-format
+#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
+msgstr "Comando inválido: estás atualmente a bissetar %s/%s"
#: builtin/bisect--helper.c:326
-#, fuzzy, c-format
+#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de dar pelo menos uma revisão %s e %s.\n"
+"Podes usar \"git bisect %s\" e \"git bisect %s\" para esse fim."
#: builtin/bisect--helper.c:330
-#, fuzzy, c-format
+#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Deve começar por executar \"git bisect start\".\n"
-"Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de começar com \"git bisect start\".\n"
+"Depois precisas de dar-me pelo menos uma revisão %s e %s.\n"
+"Podes usar \"git bisect %s\" e \"git bisect %s\" para esse fim."
#: builtin/bisect--helper.c:350
-#, fuzzy, c-format
+#, c-format
msgid "bisecting only with a %s commit"
-msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
+msgstr "bissetando apenas com uma memória %s"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
@@ -11129,56 +10915,51 @@
msgstr ""
#: builtin/bisect--helper.c:432
-#, fuzzy, c-format
+#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"argumento inválido %s para 'git bisect terms'.\n"
-"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
+"Opções sustentadas: --term-good|--term-old e --term-bad|--term-new."
#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
-#, fuzzy
msgid "revision walk setup failed\n"
-msgstr "falha ao configurar percurso de revisões\n"
+msgstr "falhou configuração de percurso de revisões\n"
#: builtin/bisect--helper.c:521
-#, fuzzy, c-format
+#, c-format
msgid "could not open '%s' for appending"
msgstr "incapaz abrir '%s' para acrescentar"
#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
-#, fuzzy
msgid "'' is not a valid term"
msgstr "'' é um termo inválido"
#: builtin/bisect--helper.c:663
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized option: '%s'"
msgstr "opção desconhecida: '%s'"
#: builtin/bisect--helper.c:667
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' parece ser uma revisão inválida"
#: builtin/bisect--helper.c:698
-#, fuzzy
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorreta - é necessário uma HEAD"
#: builtin/bisect--helper.c:713
-#, fuzzy, c-format
+#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr "falhou observar '%s'. Tenta 'git bisect start <ramo-válido>'."
#: builtin/bisect--helper.c:734
msgid "won't bisect on cg-seek'ed tree"
msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
#: builtin/bisect--helper.c:737
-#, fuzzy
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorreta - referência simbólica desconhecida"
@@ -11188,9 +10969,8 @@
msgstr ""
#: builtin/bisect--helper.c:815
-#, fuzzy
msgid "You need to start by \"git bisect start\"\n"
-msgstr "Deve começar por executar \"git bisect start\"\n"
+msgstr "Deves começar com \"git bisect start\"\n"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
@@ -11198,41 +10978,40 @@
#.
#: builtin/bisect--helper.c:826
msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Quer que o Git o faça por si [Y/n]? "
+msgstr "Quer que seja eu a fazer isso [Y/n]? "
#: builtin/bisect--helper.c:844
-#, fuzzy
msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+msgstr "Por favor, chama `--bisect-state` com pelo menos um argumento"
#: builtin/bisect--helper.c:857
-#, fuzzy, c-format
+#, c-format
msgid "'git bisect %s' can take only one argument."
-msgstr "'git bisect $TERM_BAD' só leva um argumento."
+msgstr "'git bisect %s' só leva um argumento."
#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
-#, fuzzy, c-format
+#, c-format
msgid "Bad rev input: %s"
-msgstr "Revisão incorreta na entrada: $arg"
+msgstr "Entrada de rev inválida: %s"
#: builtin/bisect--helper.c:889
-#, fuzzy, c-format
+#, c-format
msgid "Bad rev input (not a commit): %s"
-msgstr "Revisão incorreta na entrada: $arg"
+msgstr "Entrada de rev inválida (é memória nenhuma): %s"
#: builtin/bisect--helper.c:921
msgid "We are not bisecting."
msgstr "Estamos bissetando nada."
#: builtin/bisect--helper.c:971
-#, fuzzy, c-format
+#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "?? de que é que estás a falar?"
+msgstr "'%s'?? estás a falar de quê?"
#: builtin/bisect--helper.c:983
-#, fuzzy, c-format
+#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "incapaz ler $file para reproduzir"
+msgstr "incapaz ler ficheiro '%s' para reprodução"
#: builtin/bisect--helper.c:1056
msgid "reset the bisection state"
@@ -11243,7 +11022,6 @@
msgstr ""
#: builtin/bisect--helper.c:1060
-#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimir termos de bifurcação"
@@ -11252,7 +11030,6 @@
msgstr ""
#: builtin/bisect--helper.c:1064
-#, fuzzy
msgid "find the next bisection commit"
msgstr "encontra próximo commit de bisecção"
@@ -11269,63 +11046,58 @@
msgstr ""
#: builtin/bisect--helper.c:1072
-#, fuzzy
msgid "skip some commits for checkout"
-msgstr "'%s' tem commit checked out nenhum"
+msgstr "ignorar algumas memórias para observação"
#: builtin/bisect--helper.c:1074
msgid "no log for BISECT_WRITE"
-msgstr ""
+msgstr "nenhum registo para BISECT_WRITE"
#: builtin/bisect--helper.c:1089
msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
+msgstr "--bisect-reset exige quer argumento nenhum ou uma memória"
#: builtin/bisect--helper.c:1094
msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
+msgstr "--bisect-next-check exige 2 ou 3 argumentos"
#: builtin/bisect--helper.c:1100
-#, fuzzy
msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ":strip= requer um inteiro positivo como argumento"
+msgstr "--bisect-terms exige 0 ou 1 argumento"
#: builtin/bisect--helper.c:1109
-#, fuzzy
msgid "--bisect-next requires 0 arguments"
-msgstr "--bisect-next requer 0 argumentos"
+msgstr "--bisect-next exige 0 argumentos"
#: builtin/bisect--helper.c:1120
-#, fuzzy
msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-next requer 0 argumentos"
+msgstr "--bisect-log exige 0 argumentos"
#: builtin/bisect--helper.c:1125
-#, fuzzy
msgid "no logfile given"
-msgstr "Nenhum ficheiro de log fornecido"
+msgstr "nenhum ficheiro-registo fornecido"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>"
+msgstr "git blame [<opções>] [<rev-opts>] [<rev>] [--] <ficheiro>"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
+msgstr "<rev-opts> estão documentadas em git-rev-list(1)"
#: builtin/blame.c:410
-#, fuzzy, c-format
+#, c-format
msgid "expecting a color: %s"
-msgstr "a redirecionar para %s "
+msgstr "esperando cor: %s"
#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
#: builtin/blame.c:728
-#, fuzzy, c-format
+#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "ignorar cor inválida '%.*s' em log.graphColors"
+msgstr "cor inválida '%s' em color.blame.repeatedLines"
#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
@@ -11337,23 +11109,19 @@
msgstr ""
#: builtin/blame.c:867
-#, fuzzy
msgid "show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
#: builtin/blame.c:868
-#, fuzzy
msgid "do not show object names of boundary commits (Default: off)"
msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
#: builtin/blame.c:869
-#, fuzzy
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
#: builtin/blame.c:870
-#, fuzzy
msgid "show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
@@ -11365,70 +11133,57 @@
msgstr "forçar informação de progresso"
#: builtin/blame.c:872
-#, fuzzy
msgid "show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
#: builtin/blame.c:873
-#, fuzzy
msgid "show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
#: builtin/blame.c:874
-#, fuzzy
msgid "show original linenumber (Default: off)"
-msgstr "Mostrar números de linha originais (Predefinição: desativado)"
+msgstr "mostrar números de linha originais (Predefinição: desligado)"
#: builtin/blame.c:875
-#, fuzzy
msgid "show in a format designed for machine consumption"
-msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
+msgstr "mostrar em formato próprio para consumo por máquina"
#: builtin/blame.c:876
-#, fuzzy
msgid "show porcelain format with per-line commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
+msgstr "mostrar em formato de porcelana com informações de memória por linha"
#: builtin/blame.c:877
-#, fuzzy
msgid "use the same output mode as git-annotate (Default: off)"
-msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
+msgstr "usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
#: builtin/blame.c:878
-#, fuzzy
msgid "show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
#: builtin/blame.c:879
-#, fuzzy
msgid "show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
#: builtin/blame.c:880
-#, fuzzy
msgid "suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
#: builtin/blame.c:881
-#, fuzzy
msgid "show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
#: builtin/blame.c:882
-#, fuzzy
msgid "ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
#: builtin/blame.c:883 builtin/log.c:1823
-#, fuzzy
msgid "rev"
-msgstr "reverter"
+msgstr "rev"
#: builtin/blame.c:883
-#, fuzzy
msgid "ignore <rev> when blaming"
-msgstr "ignorar o índice ao verificar"
+msgstr "ignorar <rev> ao blaming"
#: builtin/blame.c:884
msgid "ignore revisions from <file>"
@@ -11443,17 +11198,14 @@
msgstr ""
#: builtin/blame.c:887
-#, fuzzy
msgid "spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
#: builtin/blame.c:888
-#, fuzzy
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
+msgstr "usar revisões do <ficheiro> em vez de invocar git-rev-list"
#: builtin/blame.c:889
-#, fuzzy
msgid "use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
@@ -11462,29 +11214,24 @@
msgstr "pontuação"
#: builtin/blame.c:890
-#, fuzzy
msgid "find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
#: builtin/blame.c:891
-#, fuzzy
msgid "find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
#: builtin/blame.c:892
-#, fuzzy
msgid "range"
msgstr "intervalo"
#: builtin/blame.c:893
-#, fuzzy
msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+msgstr "processar apenas intervalo de linhas <início>,<fim> ou função :<nome-função>"
#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr ""
-"estás proibido de usar --progress com --incremental ou formatos porcelain"
+msgstr "proibido usar --progress com --incremental ou formatos porcelana"
#. TRANSLATORS: This string is used to tell us the
#. maximum display width for a relative timestamp in
@@ -11510,9 +11257,8 @@
msgstr "Linhas de culpa"
#: builtin/branch.c:29
-#, fuzzy
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opções>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -11520,16 +11266,15 @@
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
+msgstr "git branch [<opções>] [-r] (-d | -D) <nome-ramo>..."
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
#: builtin/branch.c:33
-#, fuzzy
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
+msgstr "git branch [<opções>] (-c | -C) [<ramo-antigo>] <novo-ramo>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
@@ -11609,17 +11354,15 @@
msgstr "Ramo %s eliminado (era %s).\n"
#: builtin/branch.c:440 builtin/tag.c:63
-#, fuzzy
msgid "unable to parse format string"
msgstr "incapaz processar o formato string"
#: builtin/branch.c:471
-#, fuzzy
msgid "could not resolve HEAD"
msgstr "incapaz resolver HEAD"
#: builtin/branch.c:477
-#, fuzzy, c-format
+#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) aponta para fora de refs/heads/"
@@ -11631,10 +11374,9 @@
#: builtin/branch.c:496
#, c-format
msgid "Branch %s is being bisected at %s"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "Ramo %s está sendo bissetado em %s"
#: builtin/branch.c:513
-#, fuzzy
msgid "cannot copy the current branch while not on any."
msgstr "apenas podes copiar o ramo corrente enquanto estás num."
@@ -11649,22 +11391,21 @@
#: builtin/branch.c:555
msgid "Branch rename failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Renomear ramo falhou"
#: builtin/branch.c:557
-#, fuzzy
msgid "Branch copy failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Copiar ramo falhou"
#: builtin/branch.c:561
-#, fuzzy, c-format
+#, c-format
msgid "Created a copy of a misnamed branch '%s'"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Criei uma cópia de ramo incorretamente denominado '%s'"
#: builtin/branch.c:564
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Renomeei o ramo incorretamente denominado '%s'"
#: builtin/branch.c:570
#, c-format
@@ -11677,7 +11418,6 @@
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
#: builtin/branch.c:581
-#, fuzzy
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
@@ -11707,12 +11447,11 @@
#: builtin/branch.c:635
msgid "set up tracking mode (see git-pull(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+msgstr "configurar modo de monitorização (vê git-pull(1))"
#: builtin/branch.c:637
-#, fuzzy
msgid "do not use"
-msgstr "esquema a usar"
+msgstr "deixar de usar"
#: builtin/branch.c:639 builtin/rebase.c:533
msgid "upstream"
@@ -11723,9 +11462,8 @@
msgstr "alterar a informação do ramo a montante"
#: builtin/branch.c:640
-#, fuzzy
msgid "unset the upstream info"
-msgstr "Remover a informação do ramo a montante"
+msgstr "desdefinir info de upstream"
#: builtin/branch.c:641
msgid "use colored output"
@@ -11733,11 +11471,11 @@
#: builtin/branch.c:642
msgid "act on remote-tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "atuar sobre ramos remoto de monitorização"
#: builtin/branch.c:644 builtin/branch.c:646
msgid "print only branches that contain the commit"
-msgstr "imprimir apenas ramos que contenham o commit"
+msgstr "imprimir apenas ramos que contenham a memória"
#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that don't contain the commit"
@@ -11745,7 +11483,7 @@
#: builtin/branch.c:650
msgid "Specific git-branch actions:"
-msgstr "Ações específicas do git-branch:"
+msgstr "Ações específicas de git-branch:"
#: builtin/branch.c:651
msgid "list both remote-tracking and local branches"
@@ -11761,30 +11499,27 @@
#: builtin/branch.c:655
msgid "move/rename a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "mover/renomear ramo e seu reflog"
#: builtin/branch.c:656
msgid "move/rename a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "mover/renomear um ramo, mesmo se alvo exista"
#: builtin/branch.c:657
-#, fuzzy
msgid "copy a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "copiar ramo e seu reflog"
#: builtin/branch.c:658
-#, fuzzy
msgid "copy a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "copiar um ramo, mesmo se alvo exista"
#: builtin/branch.c:659
msgid "list branch names"
msgstr "listar os nomes dos ramos"
#: builtin/branch.c:660
-#, fuzzy
msgid "show current branch name"
-msgstr "Nenhum ramo atual."
+msgstr "mostrar nome de ramo atual"
#: builtin/branch.c:661
msgid "create the branch's reflog"
@@ -11808,7 +11543,7 @@
#: builtin/branch.c:667
msgid "list branches in columns"
-msgstr "listar os ramos em colunas"
+msgstr "listar ramos em colunas"
#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
@@ -11818,7 +11553,7 @@
#: builtin/branch.c:670
msgid "print only branches of the object"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "imprimir apenas ramos de objeto"
#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
msgid "sorting and filtering are case insensitive"
@@ -11860,17 +11595,14 @@
msgstr "Ramo nenhum denominado '%s'."
#: builtin/branch.c:796
-#, fuzzy
msgid "too many branches for a copy operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados ramos para operação de cópia"
#: builtin/branch.c:805
-#, fuzzy
msgid "too many arguments for a rename operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados ramos para operação de renomeação"
#: builtin/branch.c:810
-#, fuzzy
msgid "too many arguments to set new upstream"
msgstr "demasiados ramos para definir novo ramo a montante"
@@ -11893,9 +11625,8 @@
msgstr "ramo '%s' é inexistente"
#: builtin/branch.c:834
-#, fuzzy
msgid "too many arguments to unset upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "demasiados argumentos para desdefinir upstream"
#: builtin/branch.c:838
msgid "could not unset upstream of HEAD when it does not point to any branch."
@@ -11908,7 +11639,6 @@
msgstr "Ramo '%s' tem informação de upstream nenhuma"
#: builtin/branch.c:854
-#, fuzzy
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11917,7 +11647,6 @@
"Quiseste utilizar: -a|-r --list <pattern>? "
#: builtin/branch.c:858
-#, fuzzy
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11926,7 +11655,6 @@
"upstream-to' invés."
#: builtin/bugreport.c:15
-#, fuzzy
msgid "git version:\n"
msgstr "versão git:\n"
@@ -11979,7 +11707,7 @@
msgstr ""
#: builtin/bugreport.c:160
-#, fuzzy, c-format
+#, c-format
msgid "could not create leading directories for '%s'"
msgstr "incapaz criar pastas superiores para '%s'"
@@ -11988,17 +11716,16 @@
msgstr ""
#: builtin/bugreport.c:170
-#, fuzzy
msgid "Enabled Hooks"
msgstr "Hooks Ativados"
#: builtin/bugreport.c:177
-#, fuzzy, c-format
+#, c-format
msgid "couldn't create a new file at '%s'"
msgstr "incapaz criar novo ficheiro em '%s'"
#: builtin/bugreport.c:180
-#, fuzzy, c-format
+#, c-format
msgid "unable to write to %s"
msgstr "incapaz escrever para %s"
@@ -12008,14 +11735,12 @@
msgstr ""
#: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git remote add [<opções>] <nome> <url>"
+msgstr "git bundle create [<opções>] <ficheiro> <args lista-git-rev>"
#: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
msgid "git bundle verify [<options>] <file>"
-msgstr "git rm [<opções>] [--] <ficheiro>..."
+msgstr "git bundle verify [<opções>] <ficheiro>"
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
@@ -12035,7 +11760,7 @@
#: builtin/bundle.c:71 builtin/pack-objects.c:3911
msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar medidor de progresso durante fase de escrita de objetos"
#: builtin/bundle.c:74 builtin/pack-objects.c:3914
msgid "similar to --all-progress when progress meter is shown"
@@ -12050,7 +11775,6 @@
msgstr "É necessário um repositório para criar um bundle."
#: builtin/bundle.c:109
-#, fuzzy
msgid "do not show bundle details"
msgstr "mostrar nenhuns detalhes de conjunto"
@@ -12081,7 +11805,6 @@
"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
#: builtin/cat-file.c:597
-#, fuzzy
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -12090,9 +11813,8 @@
"filters]"
#: builtin/cat-file.c:618
-#, fuzzy
msgid "only one batch option may be specified"
-msgstr "Nenhum nome de ramo especificado"
+msgstr "apenas uma opção batch pode ser especificada"
#: builtin/cat-file.c:636
msgid "<type> can be one of: blob, tree, commit, tag"
@@ -12100,7 +11822,7 @@
#: builtin/cat-file.c:637
msgid "show object type"
-msgstr "mostrar tipo do objeto"
+msgstr "mostrar tipo de objeto"
#: builtin/cat-file.c:638
msgid "show object size"
@@ -12149,8 +11871,7 @@
#: builtin/cat-file.c:660
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
-"batch-check)"
+"seguir ligações simbólica de dentro da árvore (usado com --batch ou --batch-check)"
#: builtin/cat-file.c:662
msgid "show all objects with --batch or --batch-check"
@@ -12174,7 +11895,7 @@
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
-msgstr "usar .gitattributes apenas a partir de cenário"
+msgstr "usar .gitattributes apenas de cenário"
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
@@ -12195,11 +11916,11 @@
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
-msgstr "ignorar o índice ao verificar"
+msgstr "ignorar cenário ao verificar"
#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
-msgstr "incapaz especificar pathnames com --stdin"
+msgstr "incapaz especificar nomes de caminho com --stdin"
#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
@@ -12239,7 +11960,6 @@
msgstr "contato nenhum especificado"
#: builtin/checkout--worker.c:110
-#, fuzzy
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<opções>]"
@@ -12250,11 +11970,11 @@
#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
#: builtin/worktree.c:728
msgid "string"
-msgstr "cadeia"
+msgstr "string"
#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
msgid "when creating files, prepend <string>"
-msgstr "preceder <cadeia> ao criar ficheiros"
+msgstr "ao criar ficheiros, preceder com <string>"
#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
@@ -12270,7 +11990,7 @@
#: builtin/checkout-index.c:188
msgid "force overwrite of existing files"
-msgstr "forçar substituição dos ficheiros existentes"
+msgstr "forçar o sobrescrever de ficheiros existentes"
#: builtin/checkout-index.c:190
msgid "no warning for existing files and files not in index"
@@ -12306,12 +12026,10 @@
msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
#: builtin/checkout.c:39
-#, fuzzy
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<opções>] [<ramo>]"
#: builtin/checkout.c:44
-#, fuzzy
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opções>] [--source=<ramo>] <ficheiro>..."
@@ -12353,11 +12071,11 @@
msgstr[1] ""
#: builtin/checkout.c:416
-#, fuzzy, c-format
+#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
-msgstr[0] "%d caminho atualizado"
-msgstr[1] "%d caminhos atualizados"
+msgstr[0] "Atualizado %d caminho de %s"
+msgstr[1] "Atualizados %d caminhos de %s"
#: builtin/checkout.c:423
#, c-format
@@ -12388,12 +12106,12 @@
msgstr ""
#: builtin/checkout.c:474
-#, fuzzy, c-format
+#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
#: builtin/checkout.c:479 builtin/checkout.c:484
-#, fuzzy, c-format
+#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' ou '%s' impossível ser usado com %s"
@@ -12404,7 +12122,7 @@
#: builtin/checkout.c:734
msgid "you need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "primeiro precisas resolver teu cenário atual"
#: builtin/checkout.c:788
#, c-format
@@ -12538,19 +12256,18 @@
msgstr ""
#: builtin/checkout.c:1196
-#, fuzzy, c-format
+#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "'%s' correspondeu a múltiplos (%d) ramos remoto de monitorização"
#: builtin/checkout.c:1262
-#, fuzzy
msgid "only one reference expected"
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "apenas uma referência esperada"
#: builtin/checkout.c:1279
#, c-format
msgid "only one reference expected, %d given."
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "esperava apenas uma referência, %d fornecidas."
#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
#, c-format
@@ -12563,22 +12280,22 @@
msgstr "referência é árvore nenhuma: %s"
#: builtin/checkout.c:1385
-#, fuzzy, c-format
+#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "esperado um ramo, recebi tag '%s'"
#: builtin/checkout.c:1387
-#, fuzzy, c-format
+#, c-format
msgid "a branch is expected, got remote branch '%s'"
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgstr "um ramo é esperado, recebi ramo remoto '%s'"
#: builtin/checkout.c:1388 builtin/checkout.c:1396
-#, fuzzy, c-format
+#, c-format
msgid "a branch is expected, got '%s'"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "esperado um ramo, recebi '%s'"
#: builtin/checkout.c:1391
-#, fuzzy, c-format
+#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "é suposto um branch, recebi um commit '%s'"
@@ -12613,9 +12330,8 @@
msgstr ""
#: builtin/checkout.c:1427
-#, fuzzy
msgid "you are switching branch while bisecting"
-msgstr "Está a bissetar neste momento."
+msgstr "estás a trocar de ramo enquanto bissetas"
#: builtin/checkout.c:1434
msgid "paths cannot be used with switching branches"
@@ -12633,7 +12349,7 @@
msgstr "'%s' é incapaz de ser usado com '%s'"
#: builtin/checkout.c:1462
-#, fuzzy, c-format
+#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' incapaz receber <start-point>"
@@ -12643,9 +12359,8 @@
msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
#: builtin/checkout.c:1477
-#, fuzzy
msgid "missing branch or commit argument"
-msgstr "Falta um nome dum ramo; tente -b"
+msgstr "faltando argumento de ramo ou memória"
#: builtin/checkout.c:1520
msgid "perform a 3-way merge with the new branch"
@@ -12669,7 +12384,7 @@
#: builtin/checkout.c:1537
msgid "force checkout (throw away local modifications)"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "forçar observação (descartar modificações locais)"
#: builtin/checkout.c:1539
msgid "new-branch"
@@ -12710,15 +12425,15 @@
#: builtin/checkout.c:1663
msgid "--track needs a branch name"
-msgstr "--track requer um nome dum ramo"
+msgstr "--track precisa de nome dum ramo"
#: builtin/checkout.c:1668
-#, fuzzy, c-format
+#, c-format
msgid "missing branch name; try -%c"
-msgstr "Falta um nome dum ramo; tente -b"
+msgstr "faltando nome de ramo; tente -%c"
#: builtin/checkout.c:1700
-#, fuzzy, c-format
+#, c-format
msgid "could not resolve %s"
msgstr "incapaz resolver %s"
@@ -12753,9 +12468,8 @@
"durante a extração do índice."
#: builtin/checkout.c:1757
-#, fuzzy
msgid "you must specify path(s) to restore"
-msgstr "Deve especificar um diretório."
+msgstr "deves especificar caminho(s) a restaurar"
#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
@@ -12771,63 +12485,55 @@
#: builtin/checkout.c:1786
msgid "create/reset and checkout a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e observar um ramo"
#: builtin/checkout.c:1787
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
#: builtin/checkout.c:1789
-#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>' (predefinido)"
#: builtin/checkout.c:1790
msgid "use overlay mode (default)"
-msgstr ""
+msgstr "usar modo overlay (predefinido)"
#: builtin/checkout.c:1835
-#, fuzzy
msgid "create and switch to a new branch"
-msgstr "criar e extrair um novo ramo"
+msgstr "criar e trocar para um novo ramo"
#: builtin/checkout.c:1837
-#, fuzzy
msgid "create/reset and switch to a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e trocar para um ramo"
#: builtin/checkout.c:1839
-#, fuzzy
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentar adivinhar 'git switch <ramo-inexistente>'"
#: builtin/checkout.c:1841
-#, fuzzy
msgid "throw away local modifications"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "descartar modificações locais"
#: builtin/checkout.c:1875
msgid "which tree-ish to checkout from"
msgstr ""
#: builtin/checkout.c:1877
-#, fuzzy
msgid "restore the index"
msgstr "restaurar o cenário"
#: builtin/checkout.c:1879
-#, fuzzy
msgid "restore the working tree (default)"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "restaurar a árvore-trabalho (predefinido)"
#: builtin/checkout.c:1881
-#, fuzzy
msgid "ignore unmerged entries"
-msgstr "ignora unmerged entries"
+msgstr "ignora entradas por juntar"
#: builtin/checkout.c:1882
msgid "use overlay mode"
-msgstr ""
+msgstr "usar modo overlay"
#: builtin/clean.c:29
msgid ""
@@ -12856,7 +12562,7 @@
msgstr "Ignoraria o repositório %s\n"
#: builtin/clean.c:38
-#, fuzzy, c-format
+#, c-format
msgid "could not lstat %s\n"
msgstr "incapaz lstat %s\n"
@@ -13008,9 +12714,8 @@
msgstr "git clone [<opções>] [--] <repo> [<dir>]"
#: builtin/clone.c:96
-#, fuzzy
msgid "don't clone shallow repository"
-msgstr "para clonar de um repositório local"
+msgstr "clonar nenhum repositório superficial"
#: builtin/clone.c:98
msgid "don't create a checkout"
@@ -13064,7 +12769,7 @@
#: builtin/clone.c:123 builtin/submodule--helper.c:1901
#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
msgid "use --reference only while cloning"
-msgstr "usar --reference apenas para clonar"
+msgstr "usar --reference apenas enquanto clonando"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
@@ -13122,7 +12827,7 @@
#: builtin/clone.c:141
msgid "any cloned submodules will be shallow"
-msgstr "qualquer submódulo clonado será raso"
+msgstr "qualquer submódulo clonado será superficial"
#: builtin/clone.c:142 builtin/init-db.c:548
msgid "gitdir"
@@ -13130,7 +12835,7 @@
#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
-msgstr "separar o repositório git da árvore de trabalho"
+msgstr "separar pasta git de árvore-trabalho"
#: builtin/clone.c:144
msgid "key=value"
@@ -13161,9 +12866,8 @@
msgstr "usar apenas endereços IPv6"
#: builtin/clone.c:154
-#, fuzzy
msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualquer submódulo clonado será raso"
+msgstr "qualquer submódulo clonado usará seu ramo remoto de monitorização"
#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
@@ -13188,14 +12892,14 @@
msgstr "%s existe e é pasta nenhuma"
#: builtin/clone.c:436
-#, fuzzy, c-format
+#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falhou começar iterador em '%s'"
#: builtin/clone.c:467
#, c-format
msgid "failed to create link '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou criar a ligação '%s'"
#: builtin/clone.c:471
#, c-format
@@ -13203,7 +12907,7 @@
msgstr "falha ao copiar o ficheiro para '%s'"
#: builtin/clone.c:476
-#, fuzzy, c-format
+#, c-format
msgid "failed to iterate over '%s'"
msgstr "falha ao remover '%s'"
@@ -13213,15 +12917,14 @@
msgstr "concluído.\n"
#: builtin/clone.c:517
-#, fuzzy
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-"Clonado com sucesso, mas a extração falhou.\n"
-"Pode inspecionar o que foi extraído com 'git status'\n"
-"e repetir a extração com 'git checkout -f HEAD'\n"
+"Clonagem com sucesso, mas a observação falhou.\n"
+"Podes inspecionar o que foi observado com 'git status'\n"
+"e repetir com 'git restore --source=HEAD :/'\n"
#: builtin/clone.c:594
#, c-format
@@ -13234,9 +12937,8 @@
msgstr "incapaz atualizar %s"
#: builtin/clone.c:761
-#, fuzzy
msgid "failed to initialize sparse-checkout"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou inicializar sparse-checkout"
#: builtin/clone.c:784
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
@@ -13270,7 +12972,7 @@
#: builtin/clone.c:1018
#, c-format
msgid "--bare and --origin %s options are incompatible."
-msgstr "as opções --bare e --origin %s são incompatíveis."
+msgstr "opções --bare e --origin %s são incompatíveis."
#: builtin/clone.c:1021
msgid "--bare and --separate-git-dir are incompatible."
@@ -13292,14 +12994,14 @@
msgstr "path de destino '%s' já existe e é pasta vazia nenhum."
#: builtin/clone.c:1055
-#, fuzzy, c-format
+#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "path de repositório '%s' já existe e é diretório vazio nenhum."
#: builtin/clone.c:1069
#, c-format
msgid "working tree '%s' already exists."
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "árvore-trabalho '%s' já existe."
#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
@@ -13336,24 +13038,23 @@
#: builtin/clone.c:1229
msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--depth é ignorado em clones locais; usa invés file:// ."
#: builtin/clone.c:1231
msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since é ignorado em clones locais; use file:// ."
+msgstr "--shallow-since é ignorado em clones locais; usa invés file:// ."
#: builtin/clone.c:1233
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
+msgstr "--shallow-exclude é ignorado em clones locais; usa invés file:// ."
#: builtin/clone.c:1235
-#, fuzzy
msgid "--filter is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--filter é ignorado em clones locais; usa invés file:// ."
#: builtin/clone.c:1240
msgid "source repository is shallow, ignoring --local"
-msgstr "o repositório de origem é raso, --local ignorado"
+msgstr "repositório da fonte é superficial, ignorando --local"
#: builtin/clone.c:1245
msgid "--local is ignored"
@@ -13378,29 +13079,25 @@
#: builtin/column.c:27
msgid "lookup config vars"
-msgstr "pesquisar variáveis de configuração"
+msgstr "pesquisar vars de config"
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "esquema a usar"
#: builtin/column.c:30
-#, fuzzy
msgid "maximum width"
msgstr "Largura máxima"
#: builtin/column.c:31
-#, fuzzy
msgid "padding space on left border"
msgstr "Espaço de preenchimento na borda esquerda"
#: builtin/column.c:32
-#, fuzzy
msgid "padding space on right border"
msgstr "Espaço de preenchimento na borda direita"
#: builtin/column.c:33
-#, fuzzy
msgid "padding space between columns"
msgstr "Espaço de preenchimento entre colunas"
@@ -13421,7 +13118,7 @@
msgstr ""
#: builtin/commit-graph.c:64
-#, fuzzy, c-format
+#, c-format
msgid "could not find object directory matching %s"
msgstr "incapaz encontrar pasta objeto correspondendo %s"
@@ -13440,19 +13137,19 @@
msgstr ""
#: builtin/commit-graph.c:106
-#, fuzzy, c-format
+#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Incapaz abrir commit-graph '%s'"
#: builtin/commit-graph.c:142
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argumento --split desconhecido, %s"
#: builtin/commit-graph.c:155
-#, fuzzy, c-format
+#, c-format
msgid "unexpected non-hex object ID: %s"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "ID não-hex de objeto inesperado: %s"
#: builtin/commit-graph.c:160
#, c-format
@@ -13492,9 +13189,8 @@
msgstr ""
#: builtin/commit-graph.c:232
-#, fuzzy
msgid "only expire files older than a given date-time"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "apenas expirar ficheiros mais velhos que data-tempo fornecido"
#: builtin/commit-graph.c:234
msgid "maximum number of changed-path Bloom filters to compute"
@@ -13520,7 +13216,7 @@
msgstr ""
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
-#, fuzzy, c-format
+#, c-format
msgid "not a valid object name %s"
msgstr "nome de objeto inválido %s"
@@ -13540,9 +13236,8 @@
msgstr ""
#: builtin/commit-tree.c:111
-#, fuzzy
msgid "parent"
-msgstr "número-pai"
+msgstr "parente"
#: builtin/commit-tree.c:112
msgid "id of a parent commit object"
@@ -13577,11 +13272,11 @@
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git commit [<opções>] [--] <espetro-caminho>..."
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git status [<opções>] [--] <espetro-caminho>..."
#: builtin/commit.c:51
msgid ""
@@ -13609,14 +13304,12 @@
"\n"
#: builtin/commit.c:63
-#, fuzzy
msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git rebase --skip'\n"
#: builtin/commit.c:66
-#, fuzzy
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git cherry-pick --skip'\n"
#: builtin/commit.c:69
msgid ""
@@ -13633,16 +13326,15 @@
#: builtin/commit.c:324
msgid "failed to unpack HEAD tree object"
-msgstr "falha ao descompactar o objeto árvore HEAD"
+msgstr "falhou desempacotar o objeto árvore HEAD"
#: builtin/commit.c:360
-#, fuzzy
msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspe de ficheiro com -a faz sentido nenhum."
+msgstr "--pathspec-from-file com -a faz sentido nenhum"
#: builtin/commit.c:374
msgid "No paths with --include/--only does not make sense."
-msgstr "--include/--only fazem sentido nenhum sem indicar paths."
+msgstr "--include/--only só fazem sentido, indicando caminhos."
#: builtin/commit.c:386
msgid "unable to create temporary index"
@@ -13658,7 +13350,7 @@
#: builtin/commit.c:412
msgid "Failed to update main cache tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgstr "Falhou atualizar a árvore de cenário principal"
#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
msgid "unable to write new_index file"
@@ -13673,13 +13365,12 @@
msgstr "incapaz fazer commit parcial durante um cherry-pick."
#: builtin/commit.c:493
-#, fuzzy
msgid "cannot do a partial commit during a rebase."
msgstr "incapaz fazer commit parcial durante um rebase."
#: builtin/commit.c:501
msgid "cannot read the index"
-msgstr "incapaz ler o index"
+msgstr "incapaz ler cenário"
#: builtin/commit.c:520
msgid "unable to write temporary index file"
@@ -13727,9 +13418,9 @@
msgstr "incapaz ler ficheiro de log '%s'"
#: builtin/commit.c:801
-#, fuzzy, c-format
+#, c-format
msgid "cannot combine -m with --fixup:%s"
-msgstr "incapaz de combinar '--root' com '--fork-point'"
+msgstr "incapaz de combinar -m com --fixup:%s"
#: builtin/commit.c:813 builtin/commit.c:829
msgid "could not read SQUASH_MSG"
@@ -13744,7 +13435,7 @@
msgstr "incapaz escrever o modelo de commit"
#: builtin/commit.c:893
-#, fuzzy, c-format
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored.\n"
@@ -13764,7 +13455,7 @@
"aborta o commit.\n"
#: builtin/commit.c:899
-#, fuzzy, c-format
+#, 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"
@@ -13785,7 +13476,6 @@
"Uma mensagem vazia aborta o commit.\n"
#: builtin/commit.c:915
-#, fuzzy
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13800,7 +13490,6 @@
"e tenta de novo.\n"
#: builtin/commit.c:920
-#, fuzzy
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13834,9 +13523,8 @@
msgstr "Incapaz ler index"
#: builtin/commit.c:1025
-#, fuzzy
msgid "unable to pass trailers to --trailers"
-msgstr "incapaz processar cabeçalho de %s"
+msgstr "incapaz passar atribuições para --trailers"
#: builtin/commit.c:1065
msgid "Error building trees"
@@ -13850,11 +13538,10 @@
#: builtin/commit.c:1123
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr ""
-"--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente"
+msgstr "--author '%s' é diferente de 'Nome <email>' e corresponde a autor inexistente"
#: builtin/commit.c:1137
-#, fuzzy, c-format
+#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorar inválido '%s'"
@@ -13868,14 +13555,12 @@
msgstr "--long e -z são incompatíveis"
#: builtin/commit.c:1226
-#, fuzzy
msgid "You are in the middle of a merge -- cannot reword."
-msgstr "Estás no meio de junção -- incapaz emendar."
+msgstr "Estás no meio de junção -- incapaz refrasear."
#: builtin/commit.c:1228
-#, fuzzy
msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+msgstr "Estás no meio de apanha -- incapaz refrasear."
#: builtin/commit.c:1231
#, c-format
@@ -13902,10 +13587,9 @@
#: builtin/commit.c:1266
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+msgstr "Estás no meio de apanha -- incapaz emendar."
#: builtin/commit.c:1268
-#, fuzzy
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás no meio de rebase -- incapaz emendar."
@@ -13918,7 +13602,6 @@
msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
#: builtin/commit.c:1283
-#, fuzzy
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opção -m incapaz ser combinada com -c/C/-F."
@@ -13932,12 +13615,12 @@
"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
#: builtin/commit.c:1338
-#, fuzzy, c-format
+#, c-format
msgid "unknown option: --fixup=%s:%s"
-msgstr "desconheço opção: %s\n"
+msgstr "opção desconhecida: --fixup=%s:%s"
#: builtin/commit.c:1352
-#, fuzzy, c-format
+#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' com -a faz sentido nenhum"
@@ -13947,12 +13630,11 @@
#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show branch information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de ramo"
#: builtin/commit.c:1487
-#, fuzzy
msgid "show stash information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de esconderijo"
#: builtin/commit.c:1489 builtin/commit.c:1656
msgid "compute full ahead/behind values"
@@ -13965,7 +13647,7 @@
#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
#: builtin/worktree.c:690
msgid "machine-readable output"
-msgstr "saída inteligível por máquina"
+msgstr "saída inteligível a máquina"
#: builtin/commit.c:1494 builtin/commit.c:1660
msgid "show status in long format (default)"
@@ -13988,7 +13670,6 @@
"all)"
#: builtin/commit.c:1504
-#, fuzzy
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -14013,7 +13694,6 @@
msgstr "listar ficheiros por seguir em colunas"
#: builtin/commit.c:1510
-#, fuzzy
msgid "do not detect renames"
msgstr "detecção renomeação nenhuma"
@@ -14047,7 +13727,7 @@
#: builtin/commit.c:1622
msgid "override author for commit"
-msgstr "substituir autor do commit"
+msgstr "sobrepor autor de memória"
#: builtin/commit.c:1623 builtin/gc.c:550
msgid "date"
@@ -14060,7 +13740,7 @@
#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
#: parse-options.h:329 ref-filter.h:90
msgid "commit"
-msgstr "commit"
+msgstr "memória"
#: builtin/commit.c:1625
msgid "reuse and edit message from specified commit"
@@ -14074,12 +13754,10 @@
#. and only translate <commit>.
#.
#: builtin/commit.c:1631
-#, fuzzy
msgid "[(amend|reword):]commit"
-msgstr "emendar o commit anterior"
+msgstr "[(amend|reword):]memória"
#: builtin/commit.c:1631
-#, fuzzy
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
@@ -14092,11 +13770,11 @@
#: builtin/commit.c:1633
msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
+msgstr "agora sou eu o autor da memória (usado com -C/-c/--amend)"
#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr "terminador"
+msgstr "atribuição"
#: builtin/commit.c:1634
msgid "add custom trailer(s)"
@@ -14104,9 +13782,8 @@
#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
#: builtin/pull.c:145 builtin/revert.c:110
-#, fuzzy
msgid "add a Signed-off-by trailer"
-msgstr "adicionar Signed-off-by:"
+msgstr "adicionar atribuição Signed-off-by"
#: builtin/commit.c:1636
msgid "use specified template file"
@@ -14114,7 +13791,7 @@
#: builtin/commit.c:1637
msgid "force edit of commit"
-msgstr "forçar edição do commit"
+msgstr "forçar edição de memória"
#: builtin/commit.c:1639
msgid "include status in commit message template"
@@ -14142,11 +13819,11 @@
#: builtin/commit.c:1649
msgid "commit only specified files"
-msgstr "submeter somente os ficheiros especificados"
+msgstr "memorizar somente ficheiros especificados"
#: builtin/commit.c:1650
msgid "bypass pre-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
+msgstr "ignorar pre-commit e ganchos commit-msg"
#: builtin/commit.c:1651
msgid "show what would be committed"
@@ -14154,7 +13831,7 @@
#: builtin/commit.c:1664
msgid "amend previous commit"
-msgstr "emendar o commit anterior"
+msgstr "emendar memória anterior"
#: builtin/commit.c:1665
msgid "bypass post-rewrite hook"
@@ -14185,20 +13862,19 @@
#: builtin/commit.c:1785
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+msgstr "Abortando a memorização devido a mensagem de memória vazia.\n"
#: builtin/commit.c:1790
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Abortando commit; mensagem ficou por editar.\n"
+msgstr "Abortando memorização; mensagem ficou por editar.\n"
#: builtin/commit.c:1801
-#, fuzzy, c-format
+#, c-format
msgid "Aborting commit due to empty commit message body.\n"
-msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+msgstr "Abortando memorização devido a corpo de mensagem de memória vazia.\n"
#: builtin/commit.c:1837
-#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14213,14 +13889,13 @@
msgstr "git config [<opções>]"
#: builtin/config.c:109 builtin/env--helper.c:27
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "argumento --type desconhecido: %s"
+msgstr "argumento --type desconhecido, %s"
#: builtin/config.c:121
-#, fuzzy
msgid "only one type at a time"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "apenas um tipo de cada vez"
#: builtin/config.c:130
msgid "Config file location"
@@ -14259,17 +13934,14 @@
msgstr "Ação"
#: builtin/config.c:138
-#, fuzzy
msgid "get value: name [value-pattern]"
msgstr "obter valor: nome [regex-do-valor]"
#: builtin/config.c:139
-#, fuzzy
msgid "get all values: key [value-pattern]"
msgstr "obter todos os valores: chave [regex-do-valor]"
#: builtin/config.c:140
-#, fuzzy
msgid "get values for regexp: name-regex [value-pattern]"
msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]"
@@ -14278,7 +13950,6 @@
msgstr "obter valor do URL especificado: section[.var] URL"
#: builtin/config.c:142
-#, fuzzy
msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
"substituir todos as variáveis correspondentes: nome valor [regex-do-valor]"
@@ -14288,12 +13959,10 @@
msgstr "adicionar uma nova variável: nome valor"
#: builtin/config.c:144
-#, fuzzy
msgid "remove a variable: name [value-pattern]"
msgstr "remover uma variável: nome [regex-do-valor]"
#: builtin/config.c:145
-#, fuzzy
msgid "remove all matches: name [value-pattern]"
msgstr "remover todas as correspondências: nome [regex-do-valor]"
@@ -14343,12 +14012,11 @@
#: builtin/config.c:157
msgid "value is --bool or --int"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou --int"
#: builtin/config.c:158
-#, fuzzy
msgid "value is --bool or string"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou string"
#: builtin/config.c:159
msgid "value is a path (file or directory name)"
@@ -14385,9 +14053,8 @@
msgstr ""
#: builtin/config.c:167 builtin/env--helper.c:45
-#, fuzzy
msgid "value"
-msgstr "chave=valor"
+msgstr "valor"
#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
@@ -14404,9 +14071,9 @@
msgstr ""
#: builtin/config.c:339
-#, fuzzy, c-format
+#, c-format
msgid "invalid key pattern: %s"
-msgstr "chave inválida: %s"
+msgstr "padrão de chave inválido: %s"
#: builtin/config.c:377
#, c-format
@@ -14414,7 +14081,7 @@
msgstr ""
#: builtin/config.c:441
-#, fuzzy, c-format
+#, c-format
msgid "cannot parse color '%s'"
msgstr "incapaz processar cor '%s'"
@@ -14423,17 +14090,14 @@
msgstr "incapaz processar valor de cor padrão"
#: builtin/config.c:536 builtin/config.c:833
-#, fuzzy
msgid "not in a git directory"
msgstr "está fora de pasta git"
#: builtin/config.c:539
-#, fuzzy
msgid "writing to stdin is not supported"
msgstr "escrever para stdin tem suporte nenhum"
#: builtin/config.c:542
-#, fuzzy
msgid "writing config blobs is not supported"
msgstr "escrever config blobs tem suporte nenhum"
@@ -14465,7 +14129,6 @@
msgstr ""
#: builtin/config.c:662
-#, fuzzy
msgid "--worktree can only be used inside a git repository"
msgstr "--worktree apenas pode ser usado dentro repositório git"
@@ -14507,7 +14170,7 @@
msgstr ""
#: builtin/config.c:822
-#, fuzzy, c-format
+#, c-format
msgid "unable to read config file '%s'"
msgstr "incapaz ler ficheiro config '%s'"
@@ -14516,12 +14179,10 @@
msgstr ""
#: builtin/config.c:835
-#, fuzzy
msgid "editing stdin is not supported"
msgstr "editar stdin tem suporte nenhum"
#: builtin/config.c:837
-#, fuzzy
msgid "editing blobs is not supported"
msgstr "editar blobs tem suporte nenhum"
@@ -14540,7 +14201,7 @@
" Usa uma regexp, --add ou --replace-all para alterar %s."
#: builtin/config.c:943 builtin/config.c:954
-#, fuzzy, c-format
+#, c-format
msgid "no such section: %s"
msgstr "secção inexistente: %s"
@@ -14579,13 +14240,13 @@
msgstr ""
#: builtin/credential-store.c:66
-#, fuzzy, c-format
+#, c-format
msgid "unable to get credential storage lock in %d ms"
msgstr "incapaz obter bloqueio de armazenamento de credenciais em %d ms"
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<opções>] [<commit-etc>...]"
+msgstr "git describe [<opções>] [<mnemónica>...]"
#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
@@ -14609,7 +14270,7 @@
msgstr "tag anotada %s está indisponível"
#: builtin/describe.c:281
-#, fuzzy, c-format
+#, c-format
msgid "tag '%s' is externally known as '%s'"
msgstr "a tag '%s' está de facto em '%s'"
@@ -14661,7 +14322,7 @@
"pesquisa interrompida em %s\n"
#: builtin/describe.c:529
-#, fuzzy, c-format
+#, c-format
msgid "describe %s\n"
msgstr "à procurar da descrição de %s\n"
@@ -14671,7 +14332,7 @@
msgstr "%s é nome de objeto inválido"
#: builtin/describe.c:540
-#, fuzzy, c-format
+#, c-format
msgid "%s is neither a commit nor blob"
msgstr "'%s' é nem commit nem blob"
@@ -14701,7 +14362,7 @@
#: builtin/describe.c:562
msgid "only output exact matches"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "sair apenas correspondências exatas"
#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
@@ -14749,7 +14410,7 @@
#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken é incompatível com commits ou semelhantes"
+msgstr "--broken é incompatível com mnemónicas"
#: builtin/diff-tree.c:155
msgid "--stdin and --merge-base are mutually exclusive"
@@ -14800,12 +14461,12 @@
#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]"
+msgstr "git difftool [<opções>] [<memória> [<memória>]] [--] [<caminho>...]"
#: builtin/difftool.c:261
#, c-format
msgid "failed: %d"
-msgstr "falha: %d"
+msgstr "falhou: %d"
#: builtin/difftool.c:303
#, c-format
@@ -14865,7 +14526,6 @@
msgstr "usar symlinks no modi dir-diff"
#: builtin/difftool.c:709
-#, fuzzy
msgid "tool"
msgstr "ferramenta"
@@ -14876,7 +14536,7 @@
#: builtin/difftool.c:712
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-"imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'"
+"imprimir uma lista de ferramentas diff que podem ser usadas com `--tool`"
#: builtin/difftool.c:715
msgid ""
@@ -14899,7 +14559,6 @@
msgstr ""
#: builtin/difftool.c:741
-#, fuzzy
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff é incompatível com --no-index"
@@ -14945,7 +14604,7 @@
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [opções-de-rev-list]"
+msgstr "git fast-export [opts-lista-rev]"
#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
@@ -14961,49 +14620,41 @@
#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
-msgstr "selecionar o tratamento de tags assinadas"
+msgstr "selecionar como lidar as etiquetas assinadas"
#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr "selecionar como lidar as etiquetas que marcam objetos filtrados"
#: builtin/fast-export.c:1205
-#, fuzzy
msgid "select handling of commit messages in an alternate encoding"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr "selecionar como lidar as mensagens de memória com codificação alternativa"
#: builtin/fast-export.c:1208
-#, fuzzy
msgid "dump marks to this file"
msgstr "Capturar marcas neste ficheiro"
#: builtin/fast-export.c:1210
-#, fuzzy
msgid "import marks from this file"
-msgstr "Importar marcas deste ficheiro"
+msgstr "importar marcas deste ficheiro"
#: builtin/fast-export.c:1214
-#, fuzzy
msgid "import marks from this file if it exists"
-msgstr "Importar marcas deste ficheiro"
+msgstr "importar marcas deste ficheiro se existir"
#: builtin/fast-export.c:1216
-#, fuzzy
msgid "fake a tagger when tags lack one"
msgstr "Falsear um \"tageador\" para quando falte um às tags"
#: builtin/fast-export.c:1218
-#, fuzzy
msgid "output full tree for each commit"
msgstr "Mostrar a árvore completa para cada commit"
#: builtin/fast-export.c:1220
-#, fuzzy
msgid "use the done feature to terminate the stream"
msgstr "Usar a funcionalidade done para terminar o fluxo"
#: builtin/fast-export.c:1221
-#, fuzzy
msgid "skip output of blob data"
msgstr "Ignorar a exibição de dados de blob"
@@ -15012,7 +14663,6 @@
msgstr "especificador de referência"
#: builtin/fast-export.c:1223
-#, fuzzy
msgid "apply refspec to exported refs"
msgstr "Aplicar o especificador de referência a referências exportadas"
@@ -15041,7 +14691,6 @@
msgstr ""
#: builtin/fast-export.c:1256
-#, fuzzy
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map sem --anonymize faz sentido nenhum"
@@ -15079,14 +14728,13 @@
msgstr ""
#: builtin/fetch-pack.c:242
-#, fuzzy, c-format
+#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Ficheiro de bloqueio criado mas por reportar: %s"
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git fetch [<opções>] [<repositório> [<espetro-ref>...]]"
#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
@@ -15109,27 +14757,24 @@
msgstr "obter de todos os remotos"
#: builtin/fetch.c:147 builtin/pull.c:245
-#, fuzzy
msgid "set upstream for git pull/fetch"
msgstr "definir upstream para git pull/fetch"
#: builtin/fetch.c:149 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
+msgstr "acrescentar a .git/FETCH_HEAD em vez de sobrescrever"
#: builtin/fetch.c:151
-#, fuzzy
msgid "use atomic transaction to update references"
-msgstr "solicitar transação atómica no servidor remoto"
+msgstr "usar transação atómica para atualizar referências"
#: builtin/fetch.c:153 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "caminho para o comando upload pack no remoto"
#: builtin/fetch.c:154
-#, fuzzy
msgid "force overwrite of local reference"
-msgstr "forçar a substituição do ramo local"
+msgstr "forçar sobrescrever referências locais"
#: builtin/fetch.c:156
msgid "fetch from multiple remotes"
@@ -15141,7 +14786,7 @@
#: builtin/fetch.c:160
msgid "do not fetch all tags (--no-tags)"
-msgstr "buscar tag nenhuma (--no-tags)"
+msgstr "buscar nada todas as etiquetas (--no-tags)"
#: builtin/fetch.c:162
msgid "number of submodules fetched in parallel"
@@ -15165,12 +14810,11 @@
#: builtin/fetch.c:170
msgid "control recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlar buscar recursivo de submódulos"
#: builtin/fetch.c:175
-#, fuzzy
msgid "write fetched references to the FETCH_HEAD file"
-msgstr "escrever o arquivo para este ficheiro"
+msgstr "escrever referências buscadas para ficheiro FETCH_HEAD"
#: builtin/fetch.c:176 builtin/pull.c:206
msgid "keep downloaded pack"
@@ -15195,7 +14839,7 @@
#: builtin/fetch.c:192
msgid "prepend this to submodule path output"
-msgstr "preceder isto ao caminho do submódulo"
+msgstr "preceder isto à saída de caminho de submódulo"
#: builtin/fetch.c:195
msgid ""
@@ -15205,15 +14849,15 @@
#: builtin/fetch.c:199 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
-msgstr "aceitar referência que atualizem .git/shallow"
+msgstr "aceitar refs que atualizem .git/shallow"
#: builtin/fetch.c:200 builtin/pull.c:226
msgid "refmap"
-msgstr "mapa de referências"
+msgstr "mapa-ref"
#: builtin/fetch.c:201 builtin/pull.c:227
msgid "specify fetch refmap"
-msgstr "especificar mapa de referências"
+msgstr "especificar buscar mapa-ref"
#: builtin/fetch.c:208 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
@@ -15224,7 +14868,6 @@
msgstr ""
#: builtin/fetch.c:213 builtin/fetch.c:215
-#, fuzzy
msgid "run 'maintenance --auto' after fetching"
msgstr "executar 'maintenance --auto' após buscar"
@@ -15233,14 +14876,12 @@
msgstr ""
#: builtin/fetch.c:219
-#, fuzzy
msgid "write the commit-graph after fetching"
msgstr "escrever commit-graph após buscar"
#: builtin/fetch.c:221
-#, fuzzy
msgid "accept refspecs from stdin"
-msgstr "ler referências do stdin"
+msgstr "aceitar espetro-ref de entrada padrão"
#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
@@ -15323,7 +14964,7 @@
msgstr "%s ficou por enviar todos objetos necessários\n"
#: builtin/fetch.c:1129
-#, fuzzy, c-format
+#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s rejeitada, porque raízes rasas são proibidas de ser atualizadas"
@@ -15379,7 +15020,6 @@
msgstr ""
#: builtin/fetch.c:1633
-#, fuzzy
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
@@ -15388,7 +15028,6 @@
msgstr ""
#: builtin/fetch.c:1637
-#, fuzzy
msgid "unknown branch type"
msgstr "tipo de ramo desconhecido"
@@ -15409,7 +15048,7 @@
msgstr "Incapaz buscar %s"
#: builtin/fetch.c:1790
-#, fuzzy, c-format
+#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "fetch '%s' impossível (exit code: %d)\n"
@@ -15431,7 +15070,7 @@
#: builtin/fetch.c:1998
msgid "Negative depth in --deepen is not supported"
-msgstr "Profundidade negativa em --deepen tem suporte nenhum"
+msgstr "Profundidade negativa em --deepen é insustentado"
#: builtin/fetch.c:2000
msgid "--deepen and --depth are mutually exclusive"
@@ -15451,7 +15090,7 @@
#: builtin/fetch.c:2026
msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all com refspecs, faz sentido nenhum"
+msgstr "fetch --all com espetros-ref, faz sentido nenhum"
#: builtin/fetch.c:2035
#, c-format
@@ -15520,13 +15159,12 @@
msgstr "git for-each-ref [--points-at <objeto>]"
#: builtin/for-each-ref.c:12
-#, fuzzy
msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [--merged [<memória>]] [--no-merged [<memória>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<memória>]] [--no-contains [<memória>]]"
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
@@ -15552,9 +15190,8 @@
msgstr "mostrar apenas <n> referências correspondidas"
#: builtin/for-each-ref.c:41 builtin/tag.c:483
-#, fuzzy
msgid "respect format colors"
-msgstr "formato esperado: %%(color:<cor>)"
+msgstr "respeitar cores de formatação"
#: builtin/for-each-ref.c:44
msgid "print only refs which points at the given object"
@@ -15593,19 +15230,18 @@
msgstr ""
#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
-#, fuzzy
msgid "unknown"
msgstr "desconhecido"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:78 builtin/fsck.c:100
-#, fuzzy, c-format
+#, c-format
msgid "error in %s %s: %s"
msgstr "erro em %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:94
-#, fuzzy, c-format
+#, c-format
msgid "warning in %s %s: %s"
msgstr "aviso em %s %s: %s"
@@ -15615,7 +15251,6 @@
msgstr ""
#: builtin/fsck.c:136
-#, fuzzy
msgid "wrong object type in link"
msgstr "link com tipo de objeto errado"
@@ -15632,37 +15267,36 @@
msgstr ""
#: builtin/fsck.c:291
-#, fuzzy, c-format
+#, c-format
msgid "unreachable %s %s"
-msgstr "já se tem %s (%s)"
+msgstr "inacessível %s %s"
#: builtin/fsck.c:311
-#, fuzzy, c-format
+#, c-format
msgid "dangling %s %s"
msgstr "balanceando %s %s"
#: builtin/fsck.c:321
-#, fuzzy
msgid "could not create lost-found"
msgstr "incapaz criar lost-found"
#: builtin/fsck.c:332
-#, fuzzy, c-format
+#, c-format
msgid "could not finish '%s'"
msgstr "incapaz acabar '%s'"
#: builtin/fsck.c:349
-#, fuzzy, c-format
+#, c-format
msgid "Checking %s"
msgstr "Verificando %s"
#: builtin/fsck.c:387
-#, fuzzy, c-format
+#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Verificando conectividade (%d objetos)"
#: builtin/fsck.c:406
-#, fuzzy, c-format
+#, c-format
msgid "Checking %s %s"
msgstr "Verificando %s %s"
@@ -15671,7 +15305,7 @@
msgstr "links quebrados"
#: builtin/fsck.c:420
-#, fuzzy, c-format
+#, c-format
msgid "root %s"
msgstr "raiz %s"
@@ -15691,42 +15325,40 @@
msgstr ""
#: builtin/fsck.c:496
-#, fuzzy, c-format
+#, c-format
msgid "Checking reflog %s->%s"
msgstr "Verificando reflog %s->%s"
#: builtin/fsck.c:530
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid sha1 pointer %s"
-msgstr "linha rasa inválida: %s"
+msgstr "%s: ponteiro sha1 inválido %s"
#: builtin/fsck.c:537
-#, fuzzy, c-format
+#, c-format
msgid "%s: not a commit"
msgstr "%s: é commit nenhum"
#: builtin/fsck.c:591
-#, fuzzy
msgid "notice: No default references"
msgstr "notificação: Referências padrão nenhumas"
#: builtin/fsck.c:606
-#, fuzzy, c-format
+#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto roto ou em falta: %s"
#: builtin/fsck.c:619
-#, fuzzy, c-format
+#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objeto incapaz de ser processado: %s"
#: builtin/fsck.c:639
-#, fuzzy, c-format
+#, c-format
msgid "bad sha1 file: %s"
msgstr "mau ficheiro sha1: %s"
#: builtin/fsck.c:654
-#, fuzzy
msgid "Checking object directory"
msgstr "Verificando pasta objeto"
@@ -15735,7 +15367,7 @@
msgstr "Verificando pastas objeto"
#: builtin/fsck.c:672
-#, fuzzy, c-format
+#, c-format
msgid "Checking %s link"
msgstr "Verfificando ligação %s"
@@ -15745,7 +15377,7 @@
msgstr "%s inválido"
#: builtin/fsck.c:684
-#, fuzzy, c-format
+#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s aponta para algo estranho (%s)"
@@ -15761,12 +15393,12 @@
#: builtin/fsck.c:706
msgid "Checking cache tree"
-msgstr ""
+msgstr "Verificando árvore-cenário"
#: builtin/fsck.c:711
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgstr "%s: ponteiro sha1 inválido em árvore-cenário"
#: builtin/fsck.c:720
msgid "non-tree in cache-tree"
@@ -15814,7 +15446,7 @@
#: builtin/fsck.c:767
msgid "write dangling objects in .git/lost-found"
-msgstr "escrever objetos suspensos em .git/lost-found"
+msgstr "escrever objetos perdidos em .git/lost-found"
#: builtin/fsck.c:768 builtin/prune.c:134
msgid "show progress"
@@ -15829,14 +15461,14 @@
msgstr "Verificando objetos"
#: builtin/fsck.c:856
-#, fuzzy, c-format
+#, c-format
msgid "%s: object missing"
-msgstr "mostrar tamanho do objeto"
+msgstr "%s: faltando objeto"
#: builtin/fsck.c:867
-#, fuzzy, c-format
+#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido: esperado sha1, recebi '%s'"
#: builtin/gc.c:39
msgid "git gc [<options>]"
@@ -15898,14 +15530,14 @@
msgstr ""
#: builtin/gc.c:576
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse gc.logexpiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor %s de gc.logexpiry"
#: builtin/gc.c:587
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse prune expiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor de expiração de poda %s"
#: builtin/gc.c:607
#, c-format
@@ -15947,7 +15579,7 @@
msgstr ""
#: builtin/gc.c:750
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule desconhecido: '%s'"
@@ -15960,12 +15592,10 @@
msgstr ""
#: builtin/gc.c:1022
-#, fuzzy
msgid "failed to start 'git pack-objects' process"
msgstr "começar processo 'git pack-objects' falhou"
#: builtin/gc.c:1039
-#, fuzzy
msgid "failed to finish 'git pack-objects' process"
msgstr "terminar processo 'git pack-objects' falhou"
@@ -15992,17 +15622,17 @@
msgstr ""
#: builtin/gc.c:1313
-#, fuzzy, c-format
+#, c-format
msgid "task '%s' failed"
msgstr "tarefa '%s' falhou"
#: builtin/gc.c:1395
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' é uma tarefa inválida"
#: builtin/gc.c:1400
-#, fuzzy, c-format
+#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
@@ -16027,7 +15657,6 @@
msgstr ""
#: builtin/gc.c:1422
-#, fuzzy
msgid "run a specific task"
msgstr "corre uma tarefa específica"
@@ -16036,27 +15665,25 @@
msgstr ""
#: builtin/gc.c:1482
-#, fuzzy
msgid "failed to run 'git config'"
msgstr "falhou executar 'git config'"
#: builtin/gc.c:1547
-#, fuzzy, c-format
+#, c-format
msgid "failed to expand path '%s'"
-msgstr "falha ao criar o caminho '%s'%s"
+msgstr "falhou expandir caminho '%s'"
#: builtin/gc.c:1576
-#, fuzzy
msgid "failed to start launchctl"
-msgstr "Falha ao iniciar emacsclient."
+msgstr "iniciar launchctl falhou"
#: builtin/gc.c:1613
-#, fuzzy, c-format
+#, c-format
msgid "failed to create directories for '%s'"
-msgstr "falha ao criar o diretório '%s'"
+msgstr "falhou criar pastas para '%s'"
#: builtin/gc.c:1674
-#, fuzzy, c-format
+#, c-format
msgid "failed to bootstrap service %s"
msgstr "bootstrap serviços %s falhou"
@@ -16093,14 +15720,13 @@
msgstr ""
#: builtin/gc.c:2010
-#, fuzzy
msgid "git maintenance <subcommand> [<options>]"
-msgstr "git notes prune [<opções>]"
+msgstr "git maintenance <subcomando> [<opções>]"
#: builtin/gc.c:2029
-#, fuzzy, c-format
+#, c-format
msgid "invalid subcommand: %s"
-msgstr "commit inválido %s"
+msgstr "subcomando inválido: %s"
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
@@ -16124,7 +15750,7 @@
#: builtin/pack-objects.c:3129
#, c-format
msgid "no threads support, ignoring %s"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando %s"
#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
#, c-format
@@ -16147,7 +15773,7 @@
#: builtin/grep.c:839
msgid "find in contents not managed by git"
-msgstr "procurar em conteúdos fora da gestão do git"
+msgstr "procurar em conteúdos fora da gestão de git"
#: builtin/grep.c:841
msgid "search in both tracked and untracked files"
@@ -16195,7 +15821,7 @@
#: builtin/grep.c:867
msgid "use extended POSIX regular expressions"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "usar expressões comum estendidas de POSIX"
#: builtin/grep.c:870
msgid "use basic POSIX regular expressions (default)"
@@ -16214,9 +15840,8 @@
msgstr "mostrar números de linha"
#: builtin/grep.c:880
-#, fuzzy
msgid "show column number of first match"
-msgstr "mostrar apenas nomes de ficheiro sem correspondência"
+msgstr "mostrar número de coluna da primeira correspondência"
#: builtin/grep.c:881
msgid "don't show filenames"
@@ -16247,7 +15872,6 @@
msgstr "imprimir NUL depois dos nomes de ficheiro"
#: builtin/grep.c:896
-#, fuzzy
msgid "show only matching parts of a line"
msgstr "mostrar apenas partes da linha correspondentes"
@@ -16300,7 +15924,7 @@
#: builtin/grep.c:922
msgid "read patterns from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler padrões de ficheiro"
#: builtin/grep.c:924
msgid "match <pattern>"
@@ -16325,14 +15949,13 @@
#: builtin/grep.c:943
msgid "show matching files in the pager"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar ficheiros correspondentes no paginador"
#: builtin/grep.c:947
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
#: builtin/grep.c:1013
-#, fuzzy
msgid "no pattern given"
msgstr "fornecido pattern nenhum"
@@ -16346,7 +15969,6 @@
msgstr "incapaz resolver revisão: %s"
#: builtin/grep.c:1087
-#, fuzzy
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked insustentada com --recurse-submodules"
@@ -16355,9 +15977,8 @@
msgstr ""
#: builtin/grep.c:1094 builtin/pack-objects.c:4090
-#, fuzzy
msgid "no threads support, ignoring --threads"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando --threads"
#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
#, c-format
@@ -16366,28 +15987,24 @@
#: builtin/grep.c:1131
msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager só funciona na árvore de trabalho"
+msgstr "--open-files-in-pager só funciona na árvore-trabalho"
#: builtin/grep.c:1157
-#, fuzzy
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached ou --untracked proibidos serem usados com --no-index"
#: builtin/grep.c:1160
-#, fuzzy
msgid "--untracked cannot be used with --cached"
-msgstr "--cached ou --untracked proibidos serem usados com --no-index"
+msgstr "--untracked proibido ser usado com --cached"
#: builtin/grep.c:1166
-#, fuzzy
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard proibidos serem usados para conteúdos monitorizados"
#: builtin/grep.c:1174
-#, fuzzy
msgid "both --cached and trees are given"
-msgstr "--cached e árvores foram fornecidos simultaneamente."
+msgstr "--cached e árvores foram ambos fornecidos"
#: builtin/hash-object.c:85
msgid ""
@@ -16403,7 +16020,7 @@
#: builtin/hash-object.c:98
msgid "object type"
-msgstr "tipo do objeto"
+msgstr "tipo de objeto"
#: builtin/hash-object.c:99
msgid "write the object into the object database"
@@ -16441,7 +16058,6 @@
msgstr "imprimir lista de guias úteis"
#: builtin/help.c:50
-#, fuzzy
msgid "print all configuration variable names"
msgstr "imprimir todas nomes variáveis de configuração"
@@ -16458,7 +16074,6 @@
msgstr "mostrar página info"
#: builtin/help.c:57
-#, fuzzy
msgid "print command description"
msgstr "imprimir descrição de comando"
@@ -16473,7 +16088,7 @@
#: builtin/help.c:190
msgid "Failed to start emacsclient."
-msgstr "Falha ao iniciar emacsclient."
+msgstr "Iniciar emacsclient falhou."
#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
@@ -16521,14 +16136,14 @@
msgstr "atendeu ao pedido visualizador de info nenhum"
#: builtin/help.c:517 builtin/help.c:528 git.c:348
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'git %s' é um alias de '%s'"
#: builtin/help.c:531 git.c:380
-#, fuzzy, c-format
+#, c-format
msgid "bad alias.%s string: %s"
-msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+msgstr ""
#: builtin/help.c:561 builtin/help.c:591
#, c-format
@@ -16603,7 +16218,7 @@
#: builtin/index-pack.c:381
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+msgstr "pacote tem objeto inválido em offset %<PRIuMAX>: %s"
#: builtin/index-pack.c:487
#, c-format
@@ -16709,7 +16324,7 @@
#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
#, c-format
msgid "unable to create thread: %s"
-msgstr "incapaz criar thread: %s"
+msgstr "incapaz criar fio: %s"
#: builtin/index-pack.c:1281
msgid "confusion beyond insanity"
@@ -16745,17 +16360,17 @@
msgstr ""
#: builtin/index-pack.c:1444
-#, fuzzy, c-format
+#, c-format
msgid "packfile name '%s' does not end with '.%s'"
-msgstr "ao nome de ficheiro de pacote '%s' falta terminar em '.pack'"
+msgstr "fim de nome de ficheiro-pacote '%s' é diferente de '.%s'"
#: builtin/index-pack.c:1468
-#, fuzzy, c-format
+#, c-format
msgid "cannot write %s file '%s'"
msgstr "incapaz escrever ficheiro %s '%s'"
#: builtin/index-pack.c:1476
-#, fuzzy, c-format
+#, c-format
msgid "cannot close written %s file '%s'"
msgstr "incapaz fechar ficheiro %s gravado '%s'"
@@ -16769,7 +16384,7 @@
#: builtin/index-pack.c:1524
msgid "cannot store index file"
-msgstr "incapaz guardar ficheiro index"
+msgstr "incapaz guardar ficheiro de cenário"
#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
#, c-format
@@ -16817,14 +16432,13 @@
#: builtin/index-pack.c:1850
msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin requer ser usado com --stdin"
+msgstr "--fix-thin exige ser usado com --stdin"
#: builtin/index-pack.c:1852
msgid "--stdin requires a git repository"
-msgstr "--stdin requer um repositório git"
+msgstr "--stdin exige um repositório git"
#: builtin/index-pack.c:1854
-#, fuzzy
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format incapaz ser usado com --stdin"
@@ -16833,9 +16447,8 @@
msgstr "--verify sem nome do ficheiro de pacote indicado"
#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
-#, fuzzy
msgid "fsck error in pack objects"
-msgstr "erro no objeto: %s"
+msgstr "erro fsck em objetos pacote"
#: builtin/init-db.c:63
#, c-format
@@ -16868,7 +16481,7 @@
msgstr "ignorando modelo %s"
#: builtin/init-db.c:123
-#, fuzzy, c-format
+#, c-format
msgid "templates not found in %s"
msgstr "modelos em %s por encontrar"
@@ -16878,7 +16491,7 @@
msgstr "deixando de copiar modelos de '%s': %s"
#: builtin/init-db.c:263
-#, fuzzy, c-format
+#, c-format
msgid "invalid initial branch name: '%s'"
msgstr "Nome de ramo inicial inválido: '%s'"
@@ -16944,9 +16557,8 @@
"especificar que o repositório git será partilhado por vários utilizadores"
#: builtin/init-db.c:551
-#, fuzzy
msgid "override the name of the initial branch"
-msgstr "substituir o bit executável dos ficheiros listados"
+msgstr "sobrepor o nome do ramo inicial"
#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
@@ -16985,7 +16597,6 @@
msgstr "Incapaz aceder work tree '%s'"
#: builtin/init-db.c:684
-#, fuzzy
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir incompatível com repositório nú"
@@ -17003,39 +16614,35 @@
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
-msgstr "cortar terminadores vazios"
+msgstr "cortar atribuições vazias"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr ""
#: builtin/interpret-trailers.c:101
-#, fuzzy
msgid "action if trailer already exists"
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "ação se atribuição já exista"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
-msgstr ""
+msgstr "ação se atribuição está faltando"
#: builtin/interpret-trailers.c:105
-#, fuzzy
msgid "output only the trailers"
-msgstr "cortar terminadores vazios"
+msgstr "mostrar apenas atribuições"
#: builtin/interpret-trailers.c:106
-#, fuzzy
msgid "do not apply config rules"
-msgstr "pesquisar variáveis de configuração"
+msgstr "aplicar regras de config nenhumas"
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr ""
#: builtin/interpret-trailers.c:108
-#, fuzzy
msgid "set parsing options"
-msgstr "Opções de integração"
+msgstr "definir opções de processamento"
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
@@ -17046,7 +16653,6 @@
msgstr "terminadores a adicionar"
#: builtin/interpret-trailers.c:123
-#, fuzzy
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer com --only-input faz sentido nenhum"
@@ -17072,17 +16678,14 @@
msgstr "mostrar origem"
#: builtin/log.c:181
-#, fuzzy
msgid "use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
#: builtin/log.c:184
-#, fuzzy
msgid "only decorate refs that match <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "apenas decorar refs que correspondam ao <padrão>"
#: builtin/log.c:186
-#, fuzzy
msgid "do not decorate refs that match <pattern>"
msgstr "deixar por decorar refs correspondentes a <padrão>"
@@ -17091,14 +16694,13 @@
msgstr "opções de decoração"
#: builtin/log.c:190
-#, fuzzy
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
-msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+msgstr "localizar a evolução de intervalo de linhas <início>,<fim> ou "
+"função :<nome-função> em <ficheiro>"
#: builtin/log.c:213
-#, fuzzy
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
@@ -17113,14 +16715,14 @@
msgstr "git show %s: ficheiro incorreto"
#: builtin/log.c:586 builtin/log.c:676
-#, fuzzy, c-format
+#, c-format
msgid "could not read object %s"
msgstr "incapaz ler objeto %s"
#: builtin/log.c:701
-#, fuzzy, c-format
+#, c-format
msgid "unknown type: %d"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo desconhecido: %d"
#: builtin/log.c:846
#, c-format
@@ -17132,7 +16734,7 @@
msgstr "format.headers sem valor"
#: builtin/log.c:982
-#, fuzzy, c-format
+#, c-format
msgid "cannot open patch file %s"
msgstr "incapaz abrir ficheiro patch %s"
@@ -17141,12 +16743,10 @@
msgstr ""
#: builtin/log.c:1009
-#, fuzzy
msgid "not a range"
msgstr "é intervalo nenhum"
#: builtin/log.c:1173
-#, fuzzy
msgid "cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
@@ -17164,28 +16764,25 @@
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
#: builtin/log.c:1351
-#, fuzzy
msgid "two output directories?"
msgstr "Dois diretórios de saída?"
#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
-#, fuzzy, c-format
+#, c-format
msgid "unknown commit %s"
msgstr "Commit desconhecido %s"
#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
-#, fuzzy, c-format
+#, c-format
msgid "failed to resolve '%s' as a valid ref"
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida"
#: builtin/log.c:1522
-#, fuzzy
msgid "could not find exact merge base"
msgstr "incapaz encontrar a exata base de junção."
#: builtin/log.c:1532
-#, fuzzy
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -17197,7 +16794,6 @@
"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
#: builtin/log.c:1555
-#, fuzzy
msgid "failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
@@ -17214,9 +16810,8 @@
msgstr "incapaz obter id de patch"
#: builtin/log.c:1703
-#, fuzzy
msgid "failed to infer range-diff origin of current series"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "falhou ao inferir origem intervalo-diff da série atual"
#: builtin/log.c:1705
#, c-format
@@ -17265,12 +16860,10 @@
msgstr "marcar a série como a n-ésima reiteração"
#: builtin/log.c:1768
-#, fuzzy
msgid "max length of output filename"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "comprimento máximo de saída de nome de ficheiro"
#: builtin/log.c:1770
-#, fuzzy
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
@@ -17283,7 +16876,6 @@
msgstr ""
#: builtin/log.c:1776
-#, fuzzy
msgid "use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
@@ -17360,15 +16952,15 @@
#: builtin/log.c:1804
msgid "attach the patch"
-msgstr "anexar o patch"
+msgstr "anexar remendo"
#: builtin/log.c:1807
msgid "inline the patch"
-msgstr "incorporar o patch"
+msgstr "incorporar remendo"
#: builtin/log.c:1811
msgid "enable message threading, styles: shallow, deep"
-msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
+msgstr "ativar mensagens por tópicos, estilos: shallow (superficial), deep (profundo)"
#: builtin/log.c:1813
msgid "signature"
@@ -17380,7 +16972,7 @@
#: builtin/log.c:1815
msgid "base-commit"
-msgstr "commit-base"
+msgstr "memória-base"
#: builtin/log.c:1816
msgid "add prerequisite tree info to the patch series"
@@ -17395,9 +16987,8 @@
msgstr "imprimir nomes de ficheiros de patch nenhuns"
#: builtin/log.c:1822
-#, fuzzy
msgid "show progress while generating patches"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar progresso enquanto se gera remendos"
#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
@@ -17417,12 +17008,10 @@
msgstr "linha de indentação inválida: %s"
#: builtin/log.c:1931
-#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n e -k são mutuamente exclusivos."
#: builtin/log.c:1933
-#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
@@ -17478,7 +17067,6 @@
msgstr "incapaz ler ficheiro de assinatura '%s'"
#: builtin/log.c:2160
-#, fuzzy
msgid "Generating patches"
msgstr "falha ao editar patch"
@@ -17488,7 +17076,7 @@
#: builtin/log.c:2263
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
#: builtin/log.c:2317
#, c-format
@@ -17511,7 +17099,6 @@
msgstr "usar letras minúsculas para ficheiros 'assume unchanged'"
#: builtin/ls-files.c:623
-#, fuzzy
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'"
@@ -17578,15 +17165,15 @@
#: builtin/ls-files.c:659
msgid "add the standard git exclusions"
-msgstr "incluir as exclusões standard do git"
+msgstr "incluir as exclusões standard de git"
#: builtin/ls-files.c:663
msgid "make the output relative to the project top directory"
-msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+msgstr "fazer a saída relativa à pasta de topo de projeto"
#: builtin/ls-files.c:666
msgid "recurse through submodules"
-msgstr "percorrer recursivamente submódulos"
+msgstr "percorrer recursivamente pelos submódulos"
#: builtin/ls-files.c:668
msgid "if any <file> is not in the index, treat this as an error"
@@ -17606,9 +17193,8 @@
msgstr "mostrar dados de depuração"
#: builtin/ls-files.c:674
-#, fuzzy
msgid "suppress duplicate entries"
-msgstr "suprimir a cadeias de caracteres de nomes"
+msgstr "suprimir entradas duplicadas"
#: builtin/ls-remote.c:9
msgid ""
@@ -17630,19 +17216,19 @@
#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
-msgstr "caminho para git-upload-pack no servidor remoto"
+msgstr "caminho para git-upload-pack no host remoto"
#: builtin/ls-remote.c:66
msgid "limit to tags"
-msgstr "restringir-se a tags"
+msgstr "restringir-se a etiquetas"
#: builtin/ls-remote.c:67
msgid "limit to heads"
-msgstr "restringir-se a cabeças"
+msgstr "limitar-se a cabeças"
#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
-msgstr "mostrar nenhumas tags descascadas"
+msgstr "mostrar nenhumas etiquetas descascadas"
#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
@@ -17658,7 +17244,7 @@
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
+msgstr "git ls-tree [<opções>] <arvoredo> [<caminho>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
@@ -17691,16 +17277,14 @@
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-"listar toda árvore; e para além do diretório atual (implica --full-name)"
+"listar toda árvore; para além do diretório atual (implica --full-name)"
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
-#, fuzzy
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr "git merge [<opções>] <msg> HEAD <commit>"
+msgstr "git mailinfo [<opções>] <msg> <remendo> < mail >info"
#: builtin/mailinfo.c:58
-#, fuzzy
msgid "keep subject"
msgstr "manter assunto"
@@ -17709,7 +17293,6 @@
msgstr ""
#: builtin/mailinfo.c:62
-#, fuzzy
msgid "copy Message-ID to the end of commit message"
msgstr "Esta é a 2ª mensagem de commit:"
@@ -17734,9 +17317,8 @@
msgstr ""
#: builtin/mailinfo.c:73
-#, fuzzy
msgid "<action>"
-msgstr "ação"
+msgstr "<ação>"
#: builtin/mailinfo.c:74
msgid "action when quoted CR is found"
@@ -17753,23 +17335,23 @@
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <memória> <memória>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <memória>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <memória>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <memória> <memória>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<memória>]"
#: builtin/merge-base.c:143
msgid "output all common ancestors"
@@ -17777,7 +17359,7 @@
#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "encontrar antecessores para uma única junção de n pontos"
#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
@@ -17865,16 +17447,16 @@
#: builtin/merge.c:58
msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "git merge [<opções>] [<memória>...]"
#: builtin/merge.c:123
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
#: builtin/merge.c:146
-#, fuzzy, c-format
+#, c-format
msgid "option `%s' requires a value"
-msgstr "a opção '%s' requer um valor"
+msgstr "opção `%s' exige um valor"
#: builtin/merge.c:199
#, c-format
@@ -17940,7 +17522,7 @@
#: builtin/merge.c:279 builtin/pull.c:169
msgid "merge strategy to use"
-msgstr "estratégia de integração a usar"
+msgstr "estratégia de junção a usar"
#: builtin/merge.c:280 builtin/pull.c:172
msgid "option=value"
@@ -17948,7 +17530,7 @@
#: builtin/merge.c:281 builtin/pull.c:173
msgid "option for selected merge strategy"
-msgstr "opções da estratégia de integração selecionada"
+msgstr "opção para estratégia de junção selecionada"
#: builtin/merge.c:283
msgid "merge commit message (for a non-fast-forward merge)"
@@ -17956,12 +17538,11 @@
#: builtin/merge.c:290
msgid "abort the current in-progress merge"
-msgstr "abortar integração em curso"
+msgstr "abortar a junção atualmente em curso"
#: builtin/merge.c:292
-#, fuzzy
msgid "--abort but leave index and working tree alone"
-msgstr "repor HEAD, índice e árvore de trabalho"
+msgstr "--abort mas deixar o cenário e a árvore-trabalho quietas"
#: builtin/merge.c:294
msgid "continue the current in-progress merge"
@@ -17972,9 +17553,8 @@
msgstr "permitir junção de históricos diferentes"
#: builtin/merge.c:303
-#, fuzzy
msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
+msgstr "ignorar pre-merge-commit e ganchos commit-msg"
#: builtin/merge.c:320
msgid "could not run stash."
@@ -17994,19 +17574,18 @@
msgstr "falha ao executar o comando read-tree"
#: builtin/merge.c:400
-#, fuzzy
msgid "Already up to date. (nothing to squash)"
msgstr " (nada para esmagar)"
#: builtin/merge.c:414
#, c-format
msgid "Squash commit -- not updating HEAD\n"
-msgstr "Squash commit -- deixar HEAD por atualizar\n"
+msgstr "Squash commit -- deixando HEAD por atualizar\n"
#: builtin/merge.c:464
#, c-format
msgid "No merge message -- not updating HEAD\n"
-msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n"
+msgstr "Mensagem de junção nenhuma -- deixando HEAD por atualizar\n"
#: builtin/merge.c:515
#, c-format
@@ -18040,11 +17619,9 @@
#: builtin/merge.c:822
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
+msgstr "Memorizando junção nenhuma; usa 'git commit' para completar a junção.\n"
#: builtin/merge.c:828
-#, fuzzy
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"
@@ -18056,12 +17633,11 @@
"\n"
#: builtin/merge.c:833
-#, fuzzy
msgid "An empty message aborts the commit.\n"
msgstr "Uma mensagem vazia aborta o commit.\n"
#: builtin/merge.c:836
-#, fuzzy, c-format
+#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
@@ -18118,20 +17694,19 @@
#: builtin/merge.c:1317
msgid "--abort expects no arguments"
-msgstr "--abort supõe argumento nenhum"
+msgstr "--abort espera argumento nenhum"
#: builtin/merge.c:1321
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
#: builtin/merge.c:1339
-#, fuzzy
msgid "--quit expects no arguments"
-msgstr "--abort supõe argumento nenhum"
+msgstr "--quit espera argumento nenhum"
#: builtin/merge.c:1352
msgid "--continue expects no arguments"
-msgstr "--continue supõe argumento nenhum"
+msgstr "--continue espera argumento nenhum"
#: builtin/merge.c:1356
msgid "There is no merge in progress (MERGE_HEAD missing)."
@@ -18162,7 +17737,6 @@
msgstr "Impossível combinar --squash com --no-ff."
#: builtin/merge.c:1398
-#, fuzzy
msgid "You cannot combine --squash with --commit."
msgstr "Impossível combinar --squash com --commit."
@@ -18245,9 +17819,9 @@
msgstr ""
#: builtin/mktag.c:27
-#, fuzzy, c-format
+#, c-format
msgid "warning: tag input does not pass fsck: %s"
-msgstr "aviso: `:include:` insustentado: %s\n"
+msgstr "aviso: input de etiqueta falha na verificação fsck: %s"
#: builtin/mktag.c:38
#, c-format
@@ -18260,23 +17834,22 @@
msgstr ""
#: builtin/mktag.c:56
-#, fuzzy, c-format
+#, c-format
msgid "could not read tagged object '%s'"
msgstr "incapaz ler objeto %s"
#: builtin/mktag.c:59
-#, fuzzy, c-format
+#, c-format
msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr "objeto %s é %s, é %s nenhum(a)"
+msgstr "objeto '%s' etiquetado como '%s', mas é de tipo '%s'"
#: builtin/mktag.c:97
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
#: builtin/mktag.c:100
-#, fuzzy
msgid "tag on stdin did not refer to a valid object"
-msgstr "'%s' aponta para objeto válido nenhum!"
+msgstr "etiqueta em entrada padrão referiu-se a objeto inválido"
#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
@@ -18299,22 +17872,18 @@
msgstr "permitir a criação de mais do que uma árvore"
#: builtin/multi-pack-index.c:10
-#, fuzzy
msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
msgstr "git multi-pack-index [<opções>] write [--preferred-pack=<pacote>]"
#: builtin/multi-pack-index.c:13
-#, fuzzy
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<opções>] verify"
#: builtin/multi-pack-index.c:16
-#, fuzzy
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<opções>] expire"
#: builtin/multi-pack-index.c:19
-#, fuzzy
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<opções>] repack [--batch-size=<tamanho>]"
@@ -18337,7 +17906,7 @@
msgstr ""
#: builtin/multi-pack-index.c:179
-#, fuzzy, c-format
+#, c-format
msgid "unrecognized subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -18353,20 +17922,20 @@
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"Por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
-msgstr "%.*s está no índice"
+msgstr "%.*s está no cenário"
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover/renomear mesmo se destino existir"
#: builtin/mv.c:127
msgid "skip move/rename errors"
-msgstr "ignorar erros ao mover/mudar o nome"
+msgstr "ignorar erros de mover/renomear"
#: builtin/mv.c:170
#, c-format
@@ -18376,7 +17945,7 @@
#: builtin/mv.c:181
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr "A verificar a mudança de nome de '%s' para '%s'\n"
+msgstr "Verificando renomeação de '%s' para '%s'\n"
#: builtin/mv.c:185
msgid "bad source"
@@ -18451,9 +18020,8 @@
msgstr "git name-rev [<opções>] --stdin"
#: builtin/name-rev.c:524
-#, fuzzy
msgid "print only ref-based names (no object names)"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "imprimir apenas nomes baseados em ref (nomes de objeto nenhum)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -18461,11 +18029,11 @@
#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "usar apenas refs que correspondam ao <padrão>"
#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
-msgstr "ignorar referências que correspondam ao <padrão>"
+msgstr "ignorar refs que correspondam ao <padrão>"
#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
@@ -18485,41 +18053,41 @@
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <notes-ref>] [list [<objeto>]]"
+msgstr "git notes [--ref <notas-ref>] [list [<objeto>]]"
#: builtin/notes.c:29
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 <msg> | -F "
+"git notes [--ref <notas-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
"<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <notes-ref>] copy [-f] <de-objeto> <para-objeto>"
+msgstr "git notes [--ref <notas-ref>] copy [-f] <de-objeto> <para-objeto>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F "
+"git notes [--ref <notas-ref>] append [--allow-empty] [-m <msg> | -F "
"<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] edit [--allow-empty] [<objeto>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <notes-ref>] show [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] show [<objeto>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <estratégia>] <notes-ref>"
+"git notes [--ref <notas-ref>] merge [-v | -q] [-s <estratégia>] <notas-ref>"
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
@@ -18531,16 +18099,15 @@
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <notes-ref>] remove [<objeto>...]"
+msgstr "git notes [--ref <notas-ref>] remove [<objeto>...]"
#: builtin/notes.c:38
-#, fuzzy
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <notas-ref>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <notas-ref>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
@@ -18572,7 +18139,7 @@
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<opções>] <notes-ref>"
+msgstr "git notes merge [<opções>] <notas-ref>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
@@ -18635,12 +18202,12 @@
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida."
#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
-msgstr "falha ao ler o objeto '%s'."
+msgstr "falhou ler objeto '%s'."
#: builtin/notes.c:268
#, c-format
@@ -18655,7 +18222,7 @@
#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou copiar notas de '%s' para '%s'"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
@@ -18691,7 +18258,7 @@
#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "reutilizar objeto de nota especificado"
#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
@@ -18765,19 +18332,19 @@
#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
-msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
+msgstr "falha ao remover a árvore-trabalho de 'git notes merge'"
#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
+msgstr "falha ao ler ref NOTES_MERGE_PARTIAL"
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "incapaz encontrar commit a partir de NOTES_MERGE_PARTIAL."
+msgstr "incapaz encontrar memória a partir de NOTES_MERGE_PARTIAL."
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "incapaz processar commit a partir de NOTES_MERGE_PARTIAL."
+msgstr "incapaz processar memória a partir de NOTES_MERGE_PARTIAL."
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
@@ -18785,7 +18352,7 @@
#: builtin/notes.c:742
msgid "failed to finalize notes merge"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou finalizar junção de notas"
#: builtin/notes.c:768
#, c-format
@@ -18798,7 +18365,7 @@
#: builtin/notes.c:786
msgid "Merge options"
-msgstr "Opções de integração"
+msgstr "Opções de junção"
#: builtin/notes.c:788
msgid ""
@@ -18845,7 +18412,7 @@
#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "falhou ao guardar ligação à ref de notas atual (%s)"
#: builtin/notes.c:878
#, c-format
@@ -18929,7 +18496,7 @@
msgstr ""
#: builtin/pack-objects.c:722
-#, fuzzy, c-format
+#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo detetado para objeto %s"
@@ -18939,9 +18506,9 @@
msgstr ""
#: builtin/pack-objects.c:1036
-#, fuzzy, c-format
+#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+msgstr "esperado objeto no offset %<PRIuMAX> em pacote %s"
#: builtin/pack-objects.c:1155
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
@@ -18975,7 +18542,7 @@
msgstr ""
#: builtin/pack-objects.c:1980
-#, fuzzy, c-format
+#, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset de base delta está fora do limite para %s"
@@ -18984,13 +18551,13 @@
msgstr "A contar objetos"
#: builtin/pack-objects.c:2426
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz processar cabeçalho de objeto de %s"
#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
#: builtin/pack-objects.c:2522
-#, fuzzy, c-format
+#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s incapaz ser lido"
@@ -19009,13 +18576,13 @@
msgstr ""
#: builtin/pack-objects.c:2990
-#, fuzzy, c-format
+#, c-format
msgid "unable to pack objects reachable from tag %s"
-msgstr "incluir objetos alcançáveis a partir de qualquer referência"
+msgstr "incapaz de empacotar objetos alcançáveis a partir de etiqueta %s"
#: builtin/pack-objects.c:3076
msgid "Compressing objects"
-msgstr "A comprimir objetos"
+msgstr "Comprimindo objetos"
#: builtin/pack-objects.c:3082
msgid "inconsistency with delta count"
@@ -19035,14 +18602,14 @@
msgstr ""
#: builtin/pack-objects.c:3199
-#, fuzzy, c-format
+#, c-format
msgid "could not get type of object %s in pack %s"
-msgstr "incapaz obter tipo de objeto %s"
+msgstr "incapaz obter tipo de objeto %s em pacote %s"
#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
-#, fuzzy, c-format
+#, c-format
msgid "could not find pack '%s'"
-msgstr "incapaz acabar '%s'"
+msgstr "incapaz encontrar pacote '%s'"
#: builtin/pack-objects.c:3378
#, c-format
@@ -19063,7 +18630,6 @@
msgstr ""
#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
-#, fuzzy
msgid "cannot open pack index"
msgstr "incapaz abrir index pack"
@@ -19073,22 +18639,20 @@
msgstr ""
#: builtin/pack-objects.c:3658
-#, fuzzy
msgid "unable to force loose object"
msgstr "incapaz forçar objeto solto"
#: builtin/pack-objects.c:3788
-#, fuzzy, c-format
+#, c-format
msgid "not a rev '%s'"
msgstr "rev '%s' nenhum"
#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
-#, fuzzy, c-format
+#, c-format
msgid "bad revision '%s'"
msgstr "revisão '%s' incorreto"
#: builtin/pack-objects.c:3819
-#, fuzzy
msgid "unable to add recent objects"
msgstr "incapaz adicionar objetos recentes"
@@ -19100,10 +18664,9 @@
#: builtin/pack-objects.c:3876
#, c-format
msgid "bad index version '%s'"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário '%s' inválida"
#: builtin/pack-objects.c:3915
-#, fuzzy
msgid "<version>[,<offset>]"
msgstr "versão[,offset]"
@@ -19114,7 +18677,7 @@
#: builtin/pack-objects.c:3919
msgid "maximum size of each output pack file"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "tamanho máximo de cada saída de ficheiro-pacote"
#: builtin/pack-objects.c:3921
msgid "ignore borrowed objects from alternate object store"
@@ -19218,13 +18781,12 @@
msgstr "ignorar pacotes que tenham um ficheiro .keep"
#: builtin/pack-objects.c:3976
-#, fuzzy
msgid "ignore this pack"
-msgstr "usar pacote fino"
+msgstr "ignorar este pacote"
#: builtin/pack-objects.c:3978
msgid "pack compression level"
-msgstr "nível de compactação do pacote"
+msgstr "nível de compressão de pacote"
#: builtin/pack-objects.c:3980
msgid "do not hide commits by grafts"
@@ -19241,12 +18803,10 @@
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
#: builtin/pack-objects.c:3988
-#, fuzzy
msgid "write a bitmap index if possible"
-msgstr "escrever índice de mapa de bits"
+msgstr "escrever um index de bitmap se possível"
#: builtin/pack-objects.c:3992
-#, fuzzy
msgid "handling for missing objects"
msgstr "lidando para objetos que faltem"
@@ -19255,9 +18815,8 @@
msgstr ""
#: builtin/pack-objects.c:3997
-#, fuzzy
msgid "respect islands during delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "respeitar ilhas durante compressão de delta"
#: builtin/pack-objects.c:3999
msgid "protocol"
@@ -19286,29 +18845,24 @@
msgstr ""
#: builtin/pack-objects.c:4101
-#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
-msgstr "incapaz usar --thin para construir pack indexável"
+msgstr "incapaz usar --thin para construir pacote indexável"
#: builtin/pack-objects.c:4104
-#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable e -A são incompatíveis"
+msgstr "--keep-unreachable e --unpack-unreachable são incompatíveis"
#: builtin/pack-objects.c:4110
-#, fuzzy
msgid "cannot use --filter without --stdout"
-msgstr "usar --filter com --stdout"
+msgstr "apenas podes usar --filter com --stdout"
#: builtin/pack-objects.c:4112
-#, fuzzy
msgid "cannot use --filter with --stdin-packs"
-msgstr "usar --filter com --stdout"
+msgstr "incapaz usar --filter com --stdin-packs"
#: builtin/pack-objects.c:4116
-#, fuzzy
msgid "cannot use internal rev list with --stdin-packs"
-msgstr "incapaz especificar pathnames com --stdin"
+msgstr ""
#: builtin/pack-objects.c:4175
msgid "Enumerating objects"
@@ -19347,9 +18901,8 @@
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune.c:14
-#, fuzzy
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <tempo>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<cabeça>...]"
#: builtin/prune.c:133
msgid "report pruned objects"
@@ -19357,7 +18910,7 @@
#: builtin/prune.c:136
msgid "expire objects older than <time>"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "expirar objetos mais velhos que <tempo>"
#: builtin/prune.c:138
msgid "limit traversal to objects outside promisor packfiles"
@@ -19374,12 +18927,11 @@
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git pull [<opções>] [<repositório> [<espetro-ref>...]]"
#: builtin/pull.c:123
-#, fuzzy
msgid "control for recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlo para buscar recursivo de submódulos"
#: builtin/pull.c:127
msgid "Options related to merging"
@@ -19394,7 +18946,6 @@
msgstr "permitir avanço rápido"
#: builtin/pull.c:167 parse-options.h:340
-#, fuzzy
msgid "automatically stash/stash pop before and after"
msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
@@ -19404,7 +18955,7 @@
#: builtin/pull.c:193
msgid "force overwrite of local branch"
-msgstr "forçar a substituição do ramo local"
+msgstr "forçar sobrescrever ramo local"
#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
@@ -19459,7 +19010,7 @@
#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
-msgstr "Consulte git-pull(1) para obter mais detalhes."
+msgstr "Vê git-pull(1) para detalhes."
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
#: builtin/rebase.c:1254
@@ -19491,13 +19042,13 @@
"a partir do remoto, mas essa ref está por buscar."
#: builtin/pull.c:596
-#, fuzzy, c-format
+#, c-format
msgid "unable to access commit %s"
msgstr "incapaz acessar commit %s"
#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
-msgstr "ignorado --verify-signatures para rebase"
+msgstr "ignorando --verify-signatures para rebase"
#: builtin/pull.c:930
msgid ""
@@ -19570,15 +19121,15 @@
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git push [<opções>] [<repositório> [<espetro-ref>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
-msgstr "forma abreviada de tag sem <tag>"
+msgstr "forma abreviada de etiqueta sem <etiqueta>"
#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
-msgstr "--delete só aceita nomes simples como referências de destino"
+msgstr "--delete só aceita nomes de ref simples como destino"
#: builtin/push.c:164
msgid ""
@@ -19590,7 +19141,7 @@
"config'."
#: builtin/push.c:167
-#, fuzzy, c-format
+#, 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"
@@ -19714,27 +19265,26 @@
"objeto fora de commit, sem usar a opção '--force'.\n"
#: builtin/push.c:285
-#, fuzzy
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
"branch has been updated since the last checkout. You may want\n"
"to integrate those changes locally (e.g., 'git pull ...')\n"
"before forcing an update.\n"
msgstr ""
-"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
-"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n"
-"'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque a ponta do ramo remoto de\n"
+"monitorização foi atualizado desde a última observação. Poderás querer\n"
+"integrar essas alterações localmente (e.g., 'git pull ...') antes de\n"
+"forçar uma atualização.\n"
#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
-msgstr "Fazendo push para %s\n"
+msgstr "Atirando para %s\n"
#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "falha ao publicar algumas referências em '%s'"
+msgstr "falha ao atirar algumas refs para '%s'"
#: builtin/push.c:544
msgid "repository"
@@ -19742,32 +19292,31 @@
#: builtin/push.c:545 builtin/send-pack.c:189
msgid "push all refs"
-msgstr "publicar todas as referências"
+msgstr "atirar todas as refs"
#: builtin/push.c:546 builtin/send-pack.c:191
msgid "mirror all refs"
-msgstr "replicar todas as referências"
+msgstr "replicar todas as refs"
#: builtin/push.c:548
msgid "delete refs"
-msgstr "eliminar referências"
+msgstr "apagar refs"
#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
-msgstr "atirar tags (incapaz ser usado com --all ou --mirror)"
+msgstr "atirar etiquetas (incapaz ser usado com --all ou --mirror)"
#: builtin/push.c:552 builtin/send-pack.c:192
msgid "force updates"
msgstr "forçar atualização"
#: builtin/push.c:553 builtin/send-pack.c:204
-#, fuzzy
msgid "<refname>:<expect>"
-msgstr "nome da referência>:<esperado"
+msgstr "<nome-ref>:<esperado>"
#: builtin/push.c:554 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
-msgstr "exigir que o antigo valor da referência tenha este valor"
+msgstr "exigir que o antigo valor da ref tenha este valor"
#: builtin/push.c:557 builtin/send-pack.c:208
msgid "require remote updates to be integrated locally"
@@ -19808,7 +19357,7 @@
#: builtin/push.c:574 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
-msgstr "solicitar transação atómica no servidor remoto"
+msgstr "solicitar transação atómica do lado remoto"
#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
@@ -19851,7 +19400,7 @@
#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
-msgstr "incapaz combinar --all com refspecs"
+msgstr "incapaz combinar --all com espetros-ref"
#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
@@ -19859,7 +19408,7 @@
#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
-msgstr "incapaz combinar --mirror com refspecs"
+msgstr "incapaz combinar --mirror com espetros-ref"
#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
@@ -19867,57 +19416,50 @@
#: builtin/push.c:648
msgid "push options must not have new line characters"
-msgstr "opções de atiranço podem ter caracteres de nova linha nenhuns"
+msgstr "opções de atirar podem ter caracteres de nova linha nenhuns"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
#: builtin/range-diff.c:10
-#, fuzzy
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "git range-diff [<opções>] <ponta-antiga>...<ponta-nova>"
#: builtin/range-diff.c:11
-#, fuzzy
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git mv [<opções>] <origem>... <destino>"
+msgstr "git range-diff [<opções>] <base> <ponta-antiga> <nova-ponta>"
#: builtin/range-diff.c:30
-#, fuzzy
msgid "use simple diff colors"
-msgstr "usar a ferramenta diff especificada"
+msgstr "usar cores diff simples"
#: builtin/range-diff.c:32
-#, fuzzy
msgid "notes"
-msgstr "notes-ref"
+msgstr "notas"
#: builtin/range-diff.c:32
msgid "passed to 'git log'"
msgstr ""
#: builtin/range-diff.c:35
-#, fuzzy
msgid "only emit output related to the first range"
-msgstr "mostrar apenas commits fora do primeiro ramo"
+msgstr "apenas emitir saída relativa ao primeiro intervalo"
#: builtin/range-diff.c:37
-#, fuzzy
msgid "only emit output related to the second range"
-msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+msgstr "apenas emitir saída relativa ao segundo intervalo"
#: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, fuzzy, c-format
+#, c-format
msgid "not a commit range: '%s'"
-msgstr "ramo inexistente: '%s'"
+msgstr "intervalo de memórias nenhum: '%s'"
#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr ""
#: builtin/range-diff.c:89
-#, fuzzy
msgid "need two commit ranges"
msgstr "preciso dois intervalos de memórias"
@@ -19990,21 +19532,19 @@
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
+msgstr "ignorar aplicar filtro de observação disperso"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "depurar unpack-trees"
#: builtin/read-tree.c:157
-#, fuzzy
msgid "suppress feedback messages"
-msgstr "suprimir mensagens informativas"
+msgstr "suprimir mensagens de feedback"
#: builtin/read-tree.c:188
-#, fuzzy
msgid "You need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "Primeiro precisas resolver teu cenário atual"
#: builtin/rebase.c:35
msgid ""
@@ -20018,27 +19558,24 @@
msgstr ""
#: builtin/rebase.c:39
-#, fuzzy
msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git am [<opções>] (--continue | --skip | --abort)"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, fuzzy, c-format
+#, c-format
msgid "unusable todo list: '%s'"
msgstr "lista de tarefas inutilizável: '%s'"
#: builtin/rebase.c:311
-#, fuzzy, c-format
+#, c-format
msgid "could not create temporary %s"
msgstr "incapaz criar %s temporário"
#: builtin/rebase.c:317
-#, fuzzy
msgid "could not mark as interactive"
msgstr "incapaz marcar como interativo"
#: builtin/rebase.c:370
-#, fuzzy
msgid "could not generate todo list"
msgstr "incapaz gerar lista de tarefas"
@@ -20047,9 +19584,8 @@
msgstr ""
#: builtin/rebase.c:481
-#, fuzzy
msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--helper [<opções>]"
+msgstr "git rebase--interactive [<opções>]"
#: builtin/rebase.c:494 builtin/rebase.c:1389
msgid "keep commits which start empty"
@@ -20057,12 +19593,11 @@
#: builtin/rebase.c:498 builtin/revert.c:128
msgid "allow commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
+msgstr "permitir memórias com mensagens vazias"
#: builtin/rebase.c:500
-#, fuzzy
msgid "rebase merge commits"
-msgstr "mergetag incorreta no commit '%s'"
+msgstr "rebasear memórias de junção"
#: builtin/rebase.c:502
msgid "keep original branch points of cousins"
@@ -20073,9 +19608,8 @@
msgstr ""
#: builtin/rebase.c:505
-#, fuzzy
msgid "sign commits"
-msgstr "assinar os commits com GPG"
+msgstr "assinar memórias"
#: builtin/rebase.c:507 builtin/rebase.c:1328
msgid "display a diffstat of what changed upstream"
@@ -20086,16 +19620,14 @@
msgstr "continuar rebase"
#: builtin/rebase.c:511
-#, fuzzy
msgid "skip commit"
-msgstr "commit"
+msgstr "ignorar memória"
#: builtin/rebase.c:512
msgid "edit the todo list"
msgstr ""
#: builtin/rebase.c:514
-#, fuzzy
msgid "show the current patch"
msgstr "mostrar remendo atual"
@@ -20124,12 +19656,10 @@
msgstr ""
#: builtin/rebase.c:529
-#, fuzzy
msgid "restrict-revision"
msgstr "revisão-restrita"
#: builtin/rebase.c:529
-#, fuzzy
msgid "restrict revision"
msgstr "revisão restrita"
@@ -20142,34 +19672,28 @@
msgstr ""
#: builtin/rebase.c:534
-#, fuzzy
msgid "the upstream commit"
-msgstr "Remover a informação do ramo a montante"
+msgstr "a memória de upstream"
#: builtin/rebase.c:536
-#, fuzzy
msgid "head-name"
-msgstr "mudar nome"
+msgstr "nome-cabeça"
#: builtin/rebase.c:536
-#, fuzzy
msgid "head name"
-msgstr "à frente "
+msgstr "nome de cabeça"
#: builtin/rebase.c:541
-#, fuzzy
msgid "rebase strategy"
-msgstr "estratégia de integração"
+msgstr "estratégia de rebaseamento"
#: builtin/rebase.c:542
-#, fuzzy
msgid "strategy-opts"
-msgstr "estratégia"
+msgstr "opções-estratégia"
#: builtin/rebase.c:543
-#, fuzzy
msgid "strategy options"
-msgstr "opções de decoração"
+msgstr "opções de estratégia"
#: builtin/rebase.c:544
msgid "switch-to"
@@ -20180,19 +19704,16 @@
msgstr ""
#: builtin/rebase.c:546
-#, fuzzy
msgid "onto-name"
msgstr "para-nome"
#: builtin/rebase.c:546
-#, fuzzy
msgid "onto name"
msgstr "para nome"
#: builtin/rebase.c:547
-#, fuzzy
msgid "cmd"
-msgstr "comando"
+msgstr "cmd"
#: builtin/rebase.c:547
msgid "the command to run"
@@ -20212,12 +19733,12 @@
msgstr ""
#: builtin/rebase.c:625
-#, fuzzy, c-format
+#, c-format
msgid "could not get 'onto': '%s'"
msgstr "incapaz obter 'onto': '%s'"
#: builtin/rebase.c:642
-#, fuzzy, c-format
+#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválida: '%s'"
@@ -20227,7 +19748,6 @@
msgstr ""
#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
-#, fuzzy
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20260,7 +19780,7 @@
msgstr ""
#: builtin/rebase.c:1240
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
@@ -20277,7 +19797,7 @@
"\n"
#: builtin/rebase.c:1256
-#, fuzzy, c-format
+#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
@@ -20298,50 +19818,42 @@
msgstr ""
#: builtin/rebase.c:1319
-#, fuzzy
msgid "rebase onto given branch instead of upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "rebasear sobre ramo dado invés de upstream"
#: builtin/rebase.c:1321
-#, fuzzy
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar a base de junção de upstream e ramo como base atual"
#: builtin/rebase.c:1323
-#, fuzzy
msgid "allow pre-rebase hook to run"
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "permitir gancho pré-rebase correr"
#: builtin/rebase.c:1325
msgid "be quiet. implies --no-stat"
msgstr ""
#: builtin/rebase.c:1331
-#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "esconder diffstat de o que alterou upstream"
#: builtin/rebase.c:1334
-#, fuzzy
msgid "add a Signed-off-by trailer to each commit"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar a atribuição Signed-off-by para cada memória"
#: builtin/rebase.c:1337
-#, fuzzy
msgid "make committer date match author date"
-msgstr "agrupar por committer em vez de autor"
+msgstr "fazer data de memorizador corresponder à data de autor"
#: builtin/rebase.c:1339
msgid "ignore author date and use current date"
-msgstr ""
+msgstr "ignorar data de autor e usar data atual"
#: builtin/rebase.c:1341
-#, fuzzy
msgid "synonym of --reset-author-date"
msgstr "sinónimo de --reset-author-date"
#: builtin/rebase.c:1343 builtin/rebase.c:1347
-#, fuzzy
msgid "passed to 'git apply'"
msgstr "passado para 'git apply'"
@@ -20354,26 +19866,22 @@
msgstr ""
#: builtin/rebase.c:1354
-#, fuzzy
msgid "continue"
-msgstr "continuar rebase"
+msgstr "continuar"
#: builtin/rebase.c:1357
-#, fuzzy
msgid "skip current patch and continue"
msgstr "ignorar remendo atual e continuar"
#: builtin/rebase.c:1359
-#, fuzzy
msgid "abort and check out the original branch"
-msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr ""
#: builtin/rebase.c:1362
msgid "abort but keep HEAD where it is"
msgstr ""
#: builtin/rebase.c:1363
-#, fuzzy
msgid "edit the todo list during an interactive rebase"
msgstr "editar a lista de afazeres durante rebase interativa"
@@ -20386,9 +19894,8 @@
msgstr ""
#: builtin/rebase.c:1373
-#, fuzzy
msgid "use merging strategies to rebase"
-msgstr "estratégia de integração a usar"
+msgstr "usar estratégias de junção para rebasear"
#: builtin/rebase.c:1377
msgid "let the user edit the list of commits to rebase"
@@ -20411,23 +19918,20 @@
msgstr ""
#: builtin/rebase.c:1404
-#, fuzzy
msgid "allow rebasing commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
+msgstr "permitir rebasear memórias com mensagens vazias"
#: builtin/rebase.c:1408
msgid "try to rebase merges instead of skipping them"
msgstr ""
#: builtin/rebase.c:1411
-#, fuzzy
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "usa 'merge-base --fork-point' para refinar upstream"
#: builtin/rebase.c:1413
-#, fuzzy
msgid "use the given merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "usar a estratégia de junção dada"
#: builtin/rebase.c:1415 builtin/revert.c:115
msgid "option"
@@ -20446,7 +19950,6 @@
msgstr ""
#: builtin/rebase.c:1442
-#, fuzzy
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está em curso. Incapaz de rebasear."
@@ -20456,17 +19959,14 @@
msgstr ""
#: builtin/rebase.c:1488
-#, fuzzy
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "incapaz de combinar '--keep-base' com '--onto'"
#: builtin/rebase.c:1490
-#, fuzzy
msgid "cannot combine '--keep-base' with '--root'"
msgstr "incapaz de combinar '--keep-base' com '--root'"
#: builtin/rebase.c:1494
-#, fuzzy
msgid "cannot combine '--root' with '--fork-point'"
msgstr "incapaz de combinar '--root' com '--fork-point'"
@@ -20491,17 +19991,16 @@
"e marcá-los como resolvidos usando git add"
#: builtin/rebase.c:1555
-#, fuzzy
msgid "could not discard worktree changes"
msgstr "incapaz de descartar alterações de worktree"
#: builtin/rebase.c:1574
-#, fuzzy, c-format
+#, c-format
msgid "could not move back to %s"
msgstr "incapaz de retroceder a %s"
#: builtin/rebase.c:1620
-#, fuzzy, c-format
+#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
@@ -20526,9 +20025,9 @@
msgstr ""
#: builtin/rebase.c:1690
-#, fuzzy, c-format
+#, c-format
msgid "Unknown mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "Modo desconhecido: %s"
#: builtin/rebase.c:1729
msgid "--strategy requires --merge or --interactive"
@@ -20562,7 +20061,6 @@
msgstr ""
#: builtin/rebase.c:1856
-#, fuzzy
msgid "Could not create new root commit"
msgstr "incapaz criar novo commit raiz"
@@ -20577,12 +20075,12 @@
msgstr ""
#: builtin/rebase.c:1893
-#, fuzzy, c-format
+#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Aponta nada para commit válido '%s'"
#: builtin/rebase.c:1921
-#, fuzzy, c-format
+#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: nenhum ramo/commit '%s'"
@@ -20593,7 +20091,6 @@
msgstr "Referência inexistente: %s"
#: builtin/rebase.c:1940
-#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "Foi impossível resolver HEAD para uma revisão"
@@ -20602,56 +20099,53 @@
msgstr "Submeta ou esconda-as."
#: builtin/rebase.c:1997
-#, fuzzy, c-format
+#, c-format
msgid "could not switch to %s"
msgstr "incapaz alternar para %s"
#: builtin/rebase.c:2008
-#, fuzzy
msgid "HEAD is up to date."
-msgstr "HEAD está agora em"
+msgstr "HEAD está atualizada."
#: builtin/rebase.c:2010
-#, fuzzy, c-format
+#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Branch atual %s está atualizado.\n"
#: builtin/rebase.c:2018
-#, fuzzy
msgid "HEAD is up to date, rebase forced."
-msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+msgstr "HEAD está atualizada, rebase forçado."
#: builtin/rebase.c:2020
-#, fuzzy, c-format
+#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Branch actual %s está atualizado, rebase forçado.\n"
#: builtin/rebase.c:2028
msgid "The pre-rebase hook refused to rebase."
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "Gancho pré-rebase recusou rebasear."
#: builtin/rebase.c:2035
-#, fuzzy, c-format
+#, c-format
msgid "Changes to %s:\n"
msgstr "Modificações para %s:\n"
#: builtin/rebase.c:2038
-#, fuzzy, c-format
+#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modificações de %s para %s:\n"
#: builtin/rebase.c:2063
-#, fuzzy, c-format
+#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n"
#: builtin/rebase.c:2072
-#, fuzzy
msgid "Could not detach HEAD"
-msgstr "incapaz soltar HEAD"
+msgstr "Incapaz desanexar HEAD"
#: builtin/rebase.c:2081
-#, fuzzy, c-format
+#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avançei-rápido %s para %s.\n"
@@ -20715,7 +20209,7 @@
#: builtin/receive-pack.c:2492
msgid "You must specify a directory."
-msgstr "Deve especificar um diretório."
+msgstr "Deves especificar uma pasta."
#: builtin/reflog.c:17
msgid ""
@@ -20750,22 +20244,21 @@
msgstr ""
#: builtin/reflog.c:699
-#, fuzzy
msgid "no reflog specified to delete"
msgstr "especificado reflog nenhum para apagar"
#: builtin/reflog.c:708
-#, fuzzy, c-format
+#, c-format
msgid "not a reflog: %s"
msgstr "reflog inválido: %s"
#: builtin/reflog.c:713
-#, fuzzy, c-format
+#, c-format
msgid "no reflog for '%s'"
msgstr "reflog nenhum para '%s'"
#: builtin/reflog.c:759
-#, fuzzy, c-format
+#, c-format
msgid "invalid ref format: %s"
msgstr "formato de ref inválido: %s"
@@ -20883,7 +20376,7 @@
#: builtin/remote.c:169
msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "ou busca tag nenhuma (--no-tags)"
+msgstr "ou buscar etiqueta nenhuma (--no-tags)"
#: builtin/remote.c:171
msgid "branch(es) to track"
@@ -20929,7 +20422,7 @@
msgstr "(apagar)"
#: builtin/remote.c:655
-#, fuzzy, c-format
+#, c-format
msgid "could not set '%s'"
msgstr "incapaz definir '%s'"
@@ -20942,9 +20435,9 @@
msgstr ""
#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
-#, fuzzy, c-format
+#, c-format
msgid "No such remote: '%s'"
-msgstr "Remoto inexistente '%s'"
+msgstr "Remoto inexistente: '%s'"
#: builtin/remote.c:710
#, c-format
@@ -21016,12 +20509,12 @@
#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente sobre remoto %s"
#: builtin/remote.c:1058
-#, fuzzy, c-format
+#, c-format
msgid "rebases interactively (with merges) onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente (com junções) sobre remoto %s"
#: builtin/remote.c:1061
#, c-format
@@ -21148,7 +20641,7 @@
#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
-msgstr " Referências locais serão refletidas (mirror) por 'git push'"
+msgstr " Referências locais serão replicadas (mirror) por 'git push'"
#: builtin/remote.c:1303
#, c-format
@@ -21303,9 +20796,9 @@
msgstr ""
#: builtin/repack.c:309
-#, fuzzy, c-format
+#, c-format
msgid "cannot open index for %s"
-msgstr "incapaz opendir '%s'"
+msgstr "incapaz abrir cenário para %s"
#: builtin/repack.c:368
#, c-format
@@ -21331,11 +20824,11 @@
#: builtin/repack.c:467
msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr "passar --no-reuse-delta ao git-pack-objects"
+msgstr "passar --no-reuse-delta para git-pack-objects"
#: builtin/repack.c:469
msgid "pass --no-reuse-object to git-pack-objects"
-msgstr "passar --no-reuse-object ao git-pack-objects"
+msgstr "passar --no-reuse-object para git-pack-objects"
#: builtin/repack.c:471
msgid "do not run git-update-server-info"
@@ -21347,12 +20840,11 @@
#: builtin/repack.c:476
msgid "write bitmap index"
-msgstr "escrever índice de mapa de bits"
+msgstr "escrever index de bitmap"
#: builtin/repack.c:478
-#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
-msgstr "passar --local ao git-pack-objects"
+msgstr "passar --delta-islands para git-pack-objects"
#: builtin/repack.c:479
msgid "approxidate"
@@ -21368,7 +20860,7 @@
#: builtin/repack.c:484
msgid "size of the window used for delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "dimensão da janela usada para compressão de delta"
#: builtin/repack.c:485 builtin/repack.c:491
msgid "bytes"
@@ -21385,9 +20877,8 @@
msgstr "limitar a profundidade máxima de delta"
#: builtin/repack.c:490
-#, fuzzy
msgid "limits the maximum number of threads"
-msgstr "limitar a profundidade máxima de delta"
+msgstr "limitar máximo número de fios"
#: builtin/repack.c:492
msgid "maximum size of each packfile"
@@ -21398,9 +20889,8 @@
msgstr "reempacotar objetos em pacotes marcados com .keep"
#: builtin/repack.c:496
-#, fuzzy
msgid "do not repack this pack"
-msgstr "criar pacotes finos"
+msgstr "reempacotar nada deste pacote"
#: builtin/repack.c:498
msgid "find a geometric progression with factor <N>"
@@ -21416,7 +20906,7 @@
#: builtin/repack.c:527
msgid "--geometric is incompatible with -A, -a"
-msgstr ""
+msgstr "--geometric é incompatível com -A, -a"
#: builtin/repack.c:639
msgid "Nothing new to pack."
@@ -21428,13 +20918,13 @@
msgstr ""
#: builtin/repack.c:671
-#, fuzzy, c-format
+#, c-format
msgid "could not unlink: %s"
msgstr "incapaz unlink: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
-msgstr "git replace [-f] <objeto> <substituição>"
+msgstr "git replace [-f] <objeto> <substituto>"
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
@@ -21442,12 +20932,11 @@
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <commit> [<pai>...]"
+msgstr "git replace [-f] --graft <memória> [<parente>...]"
#: builtin/replace.c:25
-#, fuzzy
msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --edit <objeto>"
+msgstr "git replace [-f] --convert-graft-file"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
@@ -21465,22 +20954,22 @@
msgstr ""
#: builtin/replace.c:125
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' not found"
msgstr "ref substituição '%s' por encontrar"
#: builtin/replace.c:141
-#, fuzzy, c-format
+#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Ref substituição '%s' apagada"
#: builtin/replace.c:153
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' é nome de ref inválido"
#: builtin/replace.c:158
-#, fuzzy, c-format
+#, c-format
msgid "replace ref '%s' already exists"
msgstr "ref substituição '%s' já existe"
@@ -21493,7 +20982,7 @@
msgstr ""
#: builtin/replace.c:229
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for writing"
msgstr "incapaz abrir %s para escrita"
@@ -21502,55 +20991,49 @@
msgstr ""
#: builtin/replace.c:258
-#, fuzzy, c-format
+#, c-format
msgid "unable to open %s for reading"
msgstr "incapaz abrir %s para ler"
#: builtin/replace.c:272
-#, fuzzy
msgid "unable to spawn mktree"
msgstr "incapaz lançar mktree"
#: builtin/replace.c:276
-#, fuzzy
msgid "unable to read from mktree"
msgstr "incapaz ler de mktree"
#: builtin/replace.c:285
-#, fuzzy
msgid "mktree reported failure"
msgstr "mktree reportou falha"
#: builtin/replace.c:289
-#, fuzzy
msgid "mktree did not return an object name"
msgstr "mktree retornou nome de objeto nenhum"
#: builtin/replace.c:298
-#, fuzzy, c-format
+#, c-format
msgid "unable to fstat %s"
msgstr "incapaz fstat %s"
#: builtin/replace.c:303
-#, fuzzy
msgid "unable to write object to database"
msgstr "incapaz escrever objeto para base de dados"
#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
#: builtin/replace.c:454
-#, fuzzy, c-format
+#, c-format
msgid "not a valid object name: '%s'"
msgstr "nome de objeto inválido: '%s'"
#: builtin/replace.c:326
-#, fuzzy, c-format
+#, c-format
msgid "unable to get object type for %s"
msgstr "incapaz obter tipo de objetos para %s"
#: builtin/replace.c:342
-#, fuzzy
msgid "editing object file failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou editar ficheiro-objeto"
#: builtin/replace.c:351
#, c-format
@@ -21558,14 +21041,14 @@
msgstr ""
#: builtin/replace.c:384
-#, fuzzy, c-format
+#, c-format
msgid "could not parse %s as a commit"
msgstr "incapaz processar %s como commit"
#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "mergetag incorreta no commit '%s'"
+msgstr "mergetag inválida em memória '%s'"
#: builtin/replace.c:418
#, c-format
@@ -21582,7 +21065,7 @@
"em vez de --graft"
#: builtin/replace.c:469
-#, fuzzy, c-format
+#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "o commit original '%s' tem uma assinatura gpg."
@@ -21606,7 +21089,7 @@
msgstr ""
#: builtin/replace.c:527
-#, fuzzy, c-format
+#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
@@ -21631,9 +21114,8 @@
msgstr "mudar os pais de um commit"
#: builtin/replace.c:552
-#, fuzzy
msgid "convert existing graft file"
-msgstr "forçar substituição dos ficheiros existentes"
+msgstr "converter ficheiro excerto existente"
#: builtin/replace.c:553
msgid "replace the ref if it exists"
@@ -21648,21 +21130,20 @@
msgstr "usar este formato"
#: builtin/replace.c:569
-#, fuzzy
msgid "--format cannot be used when not listing"
-msgstr "--format apenas pode ser usado quando faz listagem"
+msgstr "--format apenas pode ser usado quando fazes listagem"
#: builtin/replace.c:577
msgid "-f only makes sense when writing a replacement"
-msgstr ""
+msgstr "-f apenas faz sentido quando escreves um substituto"
#: builtin/replace.c:581
msgid "--raw only makes sense with --edit"
-msgstr ""
+msgstr "--raw apenas faz sentido com --edit"
#: builtin/replace.c:587
msgid "-d needs at least one argument"
-msgstr ""
+msgstr "-d precisa pelo menos um argumento"
#: builtin/replace.c:593
msgid "bad number of arguments"
@@ -21677,19 +21158,16 @@
msgstr ""
#: builtin/replace.c:611
-#, fuzzy
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file leva argumento nenhum"
#: builtin/replace.c:617
-#, fuzzy
msgid "only one pattern can be given with -l"
-msgstr "combinar padrões especificados com -e"
+msgstr "com -l apenas pode ser dado um padrão"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr ""
-"git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
#: builtin/rerere.c:58
msgid "register clean resolutions in index"
@@ -21697,10 +21175,10 @@
#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
+msgstr "'git rerere forget' sem caminho é obsoleto"
#: builtin/rerere.c:111
-#, fuzzy, c-format
+#, c-format
msgid "unable to generate diff for '%s'"
msgstr "incapaz gerar diff para '%s'"
@@ -21711,9 +21189,8 @@
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:33
-#, fuzzy
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..."
+msgstr "git reset [-q] [<arvoredo>] [--] <espetro-caminho>..."
#: builtin/reset.c:34
msgid ""
@@ -21721,9 +21198,8 @@
msgstr ""
#: builtin/reset.c:35
-#, fuzzy
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
+msgstr "git reset --patch [<arvoredo>] [--] [<espetro-caminho>...]"
#: builtin/reset.c:41
msgid "mixed"
@@ -21756,7 +21232,7 @@
#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
-msgstr "Falha ao procurar árvore de %s."
+msgstr "Falhou encontrar árvore de %s."
#: builtin/reset.c:116
#, c-format
@@ -21771,7 +21247,7 @@
#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
#: builtin/stash.c:687
msgid "be quiet, only report errors"
-msgstr "silencioso, só reportar erros"
+msgstr "ficar silencioso, só reportar erros"
#: builtin/reset.c:297
msgid "reset HEAD and index"
@@ -21783,7 +21259,7 @@
#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
-msgstr "repor HEAD, índice e árvore de trabalho"
+msgstr "restabelecer HEAD, cenário e árvore-trabalho"
#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
@@ -21809,8 +21285,7 @@
#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr ""
-"--mixed acompanhado com caminhos é obsoleto; use 'git reset -- <caminhos>'."
+msgstr "--mixed com caminhos é obsoleto; usa 'git reset -- <caminhos>' invés."
#: builtin/reset.c:373
#, c-format
@@ -21881,7 +21356,6 @@
msgstr "mostrar em formato fixo e longo"
#: builtin/rev-parse.c:438
-#, fuzzy
msgid "premature end of input"
msgstr "fim de input prematuro"
@@ -21890,7 +21364,6 @@
msgstr "antes do separador '--' foi dado string de utilização nenhuma"
#: builtin/rev-parse.c:548
-#, fuzzy
msgid "Needed a single revision"
msgstr "Precisava uma única revisão"
@@ -21910,58 +21383,52 @@
"utilização."
#: builtin/rev-parse.c:712
-#, fuzzy
msgid "--resolve-git-dir requires an argument"
-msgstr "--resolve-git-dir requer argumento"
+msgstr "--resolve-git-dir exige argumento"
#: builtin/rev-parse.c:715
-#, fuzzy, c-format
+#, c-format
msgid "not a gitdir '%s'"
msgstr "gitdir '%s' nenhuma"
#: builtin/rev-parse.c:739
-#, fuzzy
msgid "--git-path requires an argument"
-msgstr "--git-path requer argumento"
+msgstr "--git-path exige argumento"
#: builtin/rev-parse.c:749
-#, fuzzy
msgid "-n requires an argument"
-msgstr "-n requer argumento"
+msgstr "-n exige argumento"
#: builtin/rev-parse.c:763
-#, fuzzy
msgid "--path-format requires an argument"
-msgstr "--path-format requer argumento"
+msgstr "--path-format exige argumento"
#: builtin/rev-parse.c:769
-#, fuzzy, c-format
+#, c-format
msgid "unknown argument to --path-format: %s"
msgstr "argumento desconhecido para --path-format: %s"
#: builtin/rev-parse.c:776
-#, fuzzy
msgid "--default requires an argument"
-msgstr "--default requer argumento"
+msgstr "--default exige argumento"
#: builtin/rev-parse.c:782
-#, fuzzy
msgid "--prefix requires an argument"
-msgstr "--prefix requer argumento"
+msgstr "--prefix exige argumento"
#: builtin/rev-parse.c:851
-#, fuzzy, c-format
+#, c-format
msgid "unknown mode for --abbrev-ref: %s"
msgstr "modo desconhecido para --abbrev-ref: %s"
#: builtin/rev-parse.c:1023
-#, fuzzy, c-format
+#, c-format
msgid "unknown mode for --show-object-format: %s"
msgstr "modo desconhecido para --show-object-format: %s"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<opções>] <commit-etc>..."
+msgstr "git revert [<opções>] <mnemónica>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
@@ -21969,7 +21436,7 @@
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<opções>] <commit-etc>..."
+msgstr "git cherry-pick [<opções>] <mnemónica>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
@@ -22011,7 +21478,7 @@
#: builtin/revert.c:111
msgid "parent-number"
-msgstr "número-pai"
+msgstr "número-parente"
#: builtin/revert.c:112
msgid "select mainline parent"
@@ -22019,11 +21486,11 @@
#: builtin/revert.c:114
msgid "merge strategy"
-msgstr "estratégia de integração"
+msgstr "estratégia de junção"
#: builtin/revert.c:116
msgid "option for merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "opção para estratégia de junção"
#: builtin/revert.c:125
msgid "append commit name"
@@ -22116,10 +21583,9 @@
msgstr ""
#: builtin/rm.c:310
-#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
#: builtin/rm.c:331
#, c-format
@@ -22153,20 +21619,17 @@
#: builtin/send-pack.c:202
msgid "read refs from stdin"
-msgstr "ler referências do stdin"
+msgstr "ler refs de entrada padrão"
#: builtin/send-pack.c:203
msgid "print status from remote helper"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "imprimir status de ajudante remoto"
#: builtin/shortlog.c:16
-#, fuzzy
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr "git shortlog [<opções>] [<intervalo-revisões>] [[--] [<caminho>...]]"
#: builtin/shortlog.c:17
-#, fuzzy
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<opções>]"
@@ -22179,35 +21642,31 @@
msgstr ""
#: builtin/shortlog.c:323
-#, fuzzy, c-format
+#, c-format
msgid "unknown group type: %s"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo de grupo desconhecido: %s"
#: builtin/shortlog.c:351
-#, fuzzy
msgid "group by committer rather than author"
-msgstr "agrupar por committer em vez de autor"
+msgstr "agrupar por memorizador em vez de autor"
#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "ordenar saída de acordo com o número de commits por autor"
#: builtin/shortlog.c:356
-#, fuzzy
msgid "suppress commit descriptions, only provides commit count"
msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits"
#: builtin/shortlog.c:358
-#, fuzzy
msgid "show the email address of each author"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+msgstr "mostrar endereço de e-mail de cada autor"
#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:360
-#, fuzzy
msgid "linewrap output"
msgstr "ajustar linhas"
@@ -22237,7 +21696,7 @@
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
#: builtin/show-branch.c:395
#, c-format
@@ -22273,7 +21732,7 @@
#: builtin/show-branch.c:654
msgid "suppress naming strings"
-msgstr "suprimir a cadeias de caracteres de nomes"
+msgstr "suprimir nomes de strings"
#: builtin/show-branch.c:656
msgid "include the current branch"
@@ -22297,7 +21756,7 @@
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
-msgstr "mostrar apenas commits fora do primeiro ramo"
+msgstr "mostrar apenas memórias fora do primeiro ramo"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
@@ -22328,7 +21787,7 @@
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
-msgstr "a opção --reflog precisa do nome de um ramo"
+msgstr "opção --reflog precisa de nome de ramo"
#: builtin/show-branch.c:741
#, c-format
@@ -22418,18 +21877,16 @@
msgstr ""
#: builtin/sparse-checkout.c:46
-#, fuzzy
msgid "git sparse-checkout list"
-msgstr "git archive --list"
+msgstr "git sparse-checkout list"
#: builtin/sparse-checkout.c:72
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
#: builtin/sparse-checkout.c:227
-#, fuzzy
msgid "failed to create directory for sparse-checkout file"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar a pasta para ficheiro sparse-checkout"
#: builtin/sparse-checkout.c:268
msgid "unable to upgrade repository format to enable worktreeConfig"
@@ -22458,10 +21915,10 @@
#: builtin/sparse-checkout.c:361
#, c-format
msgid "failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr "falhou abrir '%s'"
#: builtin/sparse-checkout.c:413
-#, fuzzy, c-format
+#, c-format
msgid "could not normalize path %s"
msgstr "incapaz normalizar patch %s"
@@ -22470,7 +21927,7 @@
msgstr ""
#: builtin/sparse-checkout.c:450
-#, fuzzy, c-format
+#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "incapaz de unquote string de C-style '%s'"
@@ -22484,27 +21941,23 @@
#: builtin/sparse-checkout.c:588
msgid "git sparse-checkout reapply"
-msgstr ""
+msgstr "git sparse-checkout reapply"
#: builtin/sparse-checkout.c:607
-#, fuzzy
msgid "git sparse-checkout disable"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
+msgstr "git sparse-checkout disable"
#: builtin/sparse-checkout.c:638
-#, fuzzy
msgid "error while refreshing working directory"
msgstr "erro enquanto refrescava pasta de trabalho"
#: builtin/stash.c:24 builtin/stash.c:40
-#, fuzzy
msgid "git stash list [<options>]"
msgstr "git stash list [<opções>]"
#: builtin/stash.c:25 builtin/stash.c:45
-#, fuzzy
msgid "git stash show [<options>] [<stash>]"
-msgstr "git stash show [<opções>] [<escondido>]"
+msgstr "git stash show [<opções>] [<esconderijo>]"
#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
@@ -22515,9 +21968,8 @@
msgstr ""
#: builtin/stash.c:28 builtin/stash.c:65
-#, fuzzy
msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <nome-de-ramo> [<escondido>]"
+msgstr "git stash branch <nome-de-ramo> [<esconderijo>]"
#: builtin/stash.c:30
msgid ""
@@ -22553,29 +22005,27 @@
msgstr ""
#: builtin/stash.c:130
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' é commit tipo-arrumos nenhum"
#: builtin/stash.c:150
-#, fuzzy, c-format
+#, c-format
msgid "Too many revisions specified:%s"
-msgstr "Demasiadas revisões especificadas: $REV"
+msgstr "Demasiadas revisões especificadas:%s"
#: builtin/stash.c:164
-#, fuzzy
msgid "No stash entries found."
msgstr "Nenhuma pilha encontrada."
#: builtin/stash.c:178
-#, fuzzy, c-format
+#, c-format
msgid "%s is not a valid reference"
msgstr "%s é referência inválida"
#: builtin/stash.c:227
-#, fuzzy
msgid "git stash clear with arguments is unimplemented"
-msgstr "git stash clear com parâmetros está por implementar"
+msgstr "git stash clear com argumentos está por implementar"
#: builtin/stash.c:431
#, c-format
@@ -22586,32 +22036,28 @@
msgstr ""
#: builtin/stash.c:492
-#, fuzzy
msgid "cannot apply a stash in the middle of a merge"
msgstr "incapaz aplicar arrumação durante uma junção"
#: builtin/stash.c:503
-#, fuzzy, c-format
+#, c-format
msgid "could not generate diff %s^!."
msgstr "incapaz gerar diff %s^!."
#: builtin/stash.c:510
-#, fuzzy
msgid "conflicts in index. Try without --index."
-msgstr "Conflitos no index. Tenta sem --index."
+msgstr "conflitos no cenário. Tenta sem --index."
#: builtin/stash.c:516
-#, fuzzy
msgid "could not save index tree"
msgstr "incapaz guardar árvore index"
#: builtin/stash.c:525
-#, fuzzy
msgid "could not restore untracked files from stash"
msgstr "incapaz restaurar ficheiros por seguir de arrumos"
#: builtin/stash.c:539
-#, fuzzy, c-format
+#, c-format
msgid "Merging %s with %s"
msgstr "Juntando %s com %s"
@@ -22624,22 +22070,21 @@
msgstr ""
#: builtin/stash.c:635
-#, fuzzy, c-format
+#, c-format
msgid "Dropped %s (%s)"
-msgstr "A descartar ${REV} ($s)"
+msgstr "Descartei %s (%s)"
#: builtin/stash.c:638
-#, fuzzy, c-format
+#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Incapaz descartar entrada de arrumos"
#: builtin/stash.c:651
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' é referência de arrumos nenhuma"
#: builtin/stash.c:701
-#, fuzzy
msgid "The stash entry is kept in case you need it again."
msgstr "A pilha é guarda no caso de precisar dela de novo."
@@ -22648,34 +22093,29 @@
msgstr "Nenhum nome de ramo especificado"
#: builtin/stash.c:808
-#, fuzzy
msgid "failed to parse tree"
msgstr "falhou processar árvore"
#: builtin/stash.c:819
-#, fuzzy
msgid "failed to unpack trees"
-msgstr "falha ao descompactar o objeto árvore HEAD"
+msgstr "falhou desempacotar árvores"
#: builtin/stash.c:839
-#, fuzzy
msgid "include untracked files in the stash"
-msgstr "incluir ficheiros desmonitorizados de esconderijo"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
#: builtin/stash.c:842
-#, fuzzy
msgid "only show untracked files in the stash"
msgstr "mostrar apenas ficheiros desmonitorizados de esconderijo"
#: builtin/stash.c:929 builtin/stash.c:966
-#, fuzzy, c-format
+#, c-format
msgid "Cannot update %s with %s"
msgstr "Incapaz atualizar %s com %s"
#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
-#, fuzzy
msgid "stash message"
-msgstr "mensagem da tag"
+msgstr "mensagem de esconderijo"
#: builtin/stash.c:957
msgid "\"git stash store\" requires one <commit> argument"
@@ -22710,7 +22150,6 @@
msgstr "Impossível usar --patch e --include-untracked ou --all ao mesmo tempo"
#: builtin/stash.c:1422
-#, fuzzy
msgid "Did you forget to 'git add'?"
msgstr "Será que falta 'git add'?"
@@ -22727,13 +22166,13 @@
msgstr "Incapaz guardar o estado atual"
#: builtin/stash.c:1464
-#, fuzzy, c-format
+#, c-format
msgid "Saved working directory and index state %s"
-msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+msgstr "Pasta-trabalho e estado de cenário %s guardados"
#: builtin/stash.c:1554
msgid "Cannot remove worktree changes"
-msgstr "Incapaz remover alterações de worktree"
+msgstr "Incapaz remover alterações de árvore-trabalho"
#: builtin/stash.c:1593 builtin/stash.c:1658
msgid "keep index"
@@ -22744,19 +22183,16 @@
msgstr ""
#: builtin/stash.c:1596 builtin/stash.c:1661
-#, fuzzy
msgid "quiet mode"
msgstr "modo silencioso"
#: builtin/stash.c:1598 builtin/stash.c:1663
-#, fuzzy
msgid "include untracked files in stash"
-msgstr "incluir ficheiros desmonitorizados de esconderijo"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
#: builtin/stash.c:1600 builtin/stash.c:1665
-#, fuzzy
msgid "include ignore files"
-msgstr "mostrar ficheiros ignorados"
+msgstr "incluir ficheiros ignorados"
#: builtin/stash.c:1700
msgid ""
@@ -22811,7 +22247,7 @@
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
#: builtin/submodule--helper.c:526
-#, fuzzy, c-format
+#, c-format
msgid "Entering '%s'\n"
msgstr "Entrando em '%s'\n"
@@ -22836,7 +22272,6 @@
#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
#: builtin/submodule--helper.c:1489
-#, fuzzy
msgid "recurse into nested submodules"
msgstr "percorrer recursivamente submódulos aninhados"
@@ -22845,7 +22280,7 @@
msgstr ""
#: builtin/submodule--helper.c:601
-#, fuzzy, c-format
+#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -22856,7 +22291,7 @@
#: builtin/submodule--helper.c:668
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "Falhou registar url para caminho de submódulo '%s'"
#: builtin/submodule--helper.c:672
#, c-format
@@ -22888,19 +22323,18 @@
"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
#: builtin/submodule--helper.c:837
-#, fuzzy, c-format
+#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
-#, fuzzy, c-format
+#, c-format
msgid "failed to recurse into submodule '%s'"
-msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+msgstr "falhou percorrer recursivamente o submódulo '%s'"
#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
-#, fuzzy
msgid "suppress submodule status output"
-msgstr "preceder isto ao caminho do submódulo"
+msgstr "suprimir saída de status de submódulo"
#: builtin/submodule--helper.c:889
msgid ""
@@ -22909,9 +22343,8 @@
msgstr ""
#: builtin/submodule--helper.c:895
-#, fuzzy
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<caminho>...]"
#: builtin/submodule--helper.c:919
msgid "git submodule--helper name <path>"
@@ -22928,17 +22361,17 @@
msgstr ""
#: builtin/submodule--helper.c:1007
-#, fuzzy, c-format
+#, c-format
msgid "%s"
msgstr "[%s]"
#: builtin/submodule--helper.c:1057
-#, fuzzy, c-format
+#, c-format
msgid "couldn't hash object from '%s'"
msgstr "incapaz fazer hash a objeto a partir de '%s'"
#: builtin/submodule--helper.c:1061
-#, fuzzy, c-format
+#, c-format
msgid "unexpected mode %o\n"
msgstr "modo inesperado %o\n"
@@ -22947,7 +22380,6 @@
msgstr ""
#: builtin/submodule--helper.c:1304
-#, fuzzy
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "compara a memória no arquivador com aquela no submódulo HEAD"
@@ -22956,16 +22388,14 @@
msgstr ""
#: builtin/submodule--helper.c:1308
-#, fuzzy
msgid "limit the summary size"
-msgstr "restringir-se a cabeças"
+msgstr "limitar tamanho de sumário"
#: builtin/submodule--helper.c:1313
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
#: builtin/submodule--helper.c:1337
-#, fuzzy
msgid "could not fetch a revision for HEAD"
msgstr "incapaz buscar uma revisão para HEAD"
@@ -22974,14 +22404,14 @@
msgstr ""
#: builtin/submodule--helper.c:1409
-#, fuzzy, c-format
+#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url de submódulo para '%s'\n"
#: builtin/submodule--helper.c:1415
-#, fuzzy, c-format
+#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "falhou registar url para caminho de submódulo '%s'"
#: builtin/submodule--helper.c:1429
#, c-format
@@ -23002,7 +22432,7 @@
msgstr ""
#: builtin/submodule--helper.c:1548
-#, fuzzy, c-format
+#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
@@ -23011,31 +22441,31 @@
"removê-la e remover toda a história)"
#: builtin/submodule--helper.c:1560
-#, fuzzy, c-format
+#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
-"use '-f' para as descartar"
+"Árvore-trabalho de submódulo '%s' contém alterações locais; "
+"usa '-f' para as descartar"
#: builtin/submodule--helper.c:1568
-#, fuzzy, c-format
+#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Pasta '%s' limpa\n"
#: builtin/submodule--helper.c:1570
-#, fuzzy, c-format
+#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossível remover submodule work tree '%s'\n"
#: builtin/submodule--helper.c:1581
-#, fuzzy, c-format
+#, c-format
msgid "could not create empty submodule directory %s"
msgstr "incapaz criar pasta vazio de submódulo %s"
#: builtin/submodule--helper.c:1597
-#, fuzzy, c-format
+#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"
@@ -23054,8 +22484,7 @@
#: builtin/submodule--helper.c:1646
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
+msgstr "Usa '--all' se queres mesmo anular a inicialização de todos submódulos"
#: builtin/submodule--helper.c:1690
msgid ""
@@ -23122,12 +22551,10 @@
msgstr "forçar progresso da clonagem"
#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
-#, fuzzy
msgid "disallow cloning into non-empty directory"
-msgstr "a aplicar a um histórico vazio"
+msgstr "proibindo clonar para uma pasta com conteúdo"
#: builtin/submodule--helper.c:1916
-#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23190,9 +22617,8 @@
msgstr "rebase, merge, checkout ou none"
#: builtin/submodule--helper.c:2357
-#, fuzzy
msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
+msgstr "criar um clone superficial, truncado ao número especificado de revisões"
#: builtin/submodule--helper.c:2360
msgid "parallel jobs"
@@ -23207,9 +22633,8 @@
msgstr "imprimir progresso da clonagem nenhum"
#: builtin/submodule--helper.c:2374
-#, fuzzy
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule--helper update-clone [--prefix=<caminho>] [<caminho>...]"
#: builtin/submodule--helper.c:2387
msgid "bad value for update parameter"
@@ -23225,32 +22650,29 @@
"mas o superprojeto está em ramo nenhum"
#: builtin/submodule--helper.c:2558
-#, fuzzy, c-format
+#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "incapaz obter pega de repositório para submódulo '%s'"
#: builtin/submodule--helper.c:2591
msgid "recurse into submodules"
-msgstr "percorrer recursivamente submódulos"
+msgstr "entrar recursivamente nos submódulos"
#: builtin/submodule--helper.c:2597
-#, fuzzy
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<caminho>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opções>] [<caminho>...]"
#: builtin/submodule--helper.c:2653
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
#: builtin/submodule--helper.c:2656
-#, fuzzy
msgid "unset the config in the .gitmodules file"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "desdefinir a config no ficheiro .gitmodules"
#: builtin/submodule--helper.c:2661
-#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper name <caminho>"
+msgstr "git submodule--helper config <nome> [<valor>]"
#: builtin/submodule--helper.c:2662
msgid "git submodule--helper config --unset <name>"
@@ -23261,10 +22683,9 @@
msgstr ""
#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, fuzzy, sh-format
+#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+msgstr "por favor certifica-te que ficheiro .gitmodules está na árvore-trabalho"
#: builtin/submodule--helper.c:2698
msgid "suppress output for setting url of a submodule"
@@ -23283,21 +22704,18 @@
msgstr ""
#: builtin/submodule--helper.c:2741
-#, fuzzy
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"
#: builtin/submodule--helper.c:2742
-#, fuzzy
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
#: builtin/submodule--helper.c:2749
-#, fuzzy
msgid "--branch or --default required"
-msgstr "nome do ramo é obrigatório"
+msgstr "--branch ou --default exigido"
#: builtin/submodule--helper.c:2752
msgid "--branch and --default are mutually exclusive"
@@ -23368,11 +22786,11 @@
#: builtin/submodule--helper.c:2991
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' é subcomando inválido de submodule--helper"
+msgstr "'%s' é subcomando de submodule--helper inválido"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<opções>] <nome> [<referência>]"
+msgstr "git symbolic-ref [<opções>] <nome> [<ref>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
@@ -23399,7 +22817,6 @@
msgstr "razão da atualização"
#: builtin/tag.c:25
-#, fuzzy
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
@@ -23409,10 +22826,9 @@
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nome-da-tag>..."
+msgstr "git tag -d <nome-etiqueta>..."
#: builtin/tag.c:28
-#, fuzzy
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -23426,7 +22842,7 @@
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<formato>] <nometag>..."
+msgstr "git tag -v [--format=<formato>] <nome-etiqueta>..."
#: builtin/tag.c:100
#, c-format
@@ -23480,7 +22896,7 @@
#: builtin/tag.c:275
msgid "bad object type."
-msgstr "tipo de objeto incorreto."
+msgstr "tipo de objeto inválido."
#: builtin/tag.c:328
msgid "no tag message?"
@@ -23517,12 +22933,11 @@
#: builtin/tag.c:457
msgid "tag message"
-msgstr "mensagem da tag"
+msgstr "mensagem de etiqueta"
#: builtin/tag.c:459
-#, fuzzy
msgid "force edit of tag message"
-msgstr "forçar edição do commit"
+msgstr "forçar edição de mensagem de etiqueta"
#: builtin/tag.c:460
msgid "annotated and GPG-signed tag"
@@ -23534,7 +22949,7 @@
#: builtin/tag.c:464
msgid "replace the tag if exists"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir a tag se existir"
#: builtin/tag.c:465 builtin/update-ref.c:505
msgid "create a reflog"
@@ -23574,23 +22989,23 @@
#: builtin/tag.c:548
msgid "-n option is only allowed in list mode"
-msgstr "a opção -n só é permitida no modo lista"
+msgstr "a opção -n só é permitida no modo listagem"
#: builtin/tag.c:550
msgid "--contains option is only allowed in list mode"
-msgstr "a opção --contains só é permitida no modo lista"
+msgstr "opção --contains só é permitida no modo listagem"
#: builtin/tag.c:552
msgid "--no-contains option is only allowed in list mode"
-msgstr "opção --no-contains só é permitida no modo lista"
+msgstr "opção --no-contains só é permitida no modo listagem"
#: builtin/tag.c:554
msgid "--points-at option is only allowed in list mode"
-msgstr "a opção --points-at só é permitida no modo lista"
+msgstr "opção --points-at só é permitida no modo listagem"
#: builtin/tag.c:556
msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "as opções --merged e --no-merged só são permitidas no modo lista"
+msgstr "opções --merged e --no-merged só são permitidas no modo listagem"
#: builtin/tag.c:567
msgid "only one -F or -m option is allowed."
@@ -23599,17 +23014,17 @@
#: builtin/tag.c:592
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s' é nome de tag inválido."
+msgstr "'%s' é nome de etiqueta inválido."
#: builtin/tag.c:597
#, c-format
msgid "tag '%s' already exists"
-msgstr "a tag '%s' já existe"
+msgstr "a etiqueta '%s' já existe"
#: builtin/tag.c:628
#, c-format
msgid "Updated tag '%s' (was %s)\n"
-msgstr "Atualizei tag '%s' (era %s)\n"
+msgstr "Atualizei etiqueta '%s' (era %s)\n"
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
@@ -23618,7 +23033,7 @@
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar pasta %s"
#: builtin/update-index.c:100
#, c-format
@@ -23711,7 +23126,7 @@
#: builtin/update-index.c:1000
msgid "add the specified entry to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "adicionar entrada especificada ao cenário"
#: builtin/update-index.c:1010
msgid "mark files as \"not changing\""
@@ -23746,7 +23161,7 @@
#: builtin/update-index.c:1028
msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos"
+msgstr "com --stdin: linhas da entrada são terminadas com bytes nulos"
#: builtin/update-index.c:1030
msgid "read list of paths to be updated from standard input"
@@ -23782,7 +23197,7 @@
#: builtin/update-index.c:1057
msgid "enable or disable split index"
-msgstr "ativar ou desativar a divisão do índice"
+msgstr "ativar ou desativar a divisão de cenário"
#: builtin/update-index.c:1059
msgid "enable/disable untracked cache"
@@ -23801,12 +23216,10 @@
msgstr ""
#: builtin/update-index.c:1067
-#, fuzzy
msgid "enable or disable file system monitor"
-msgstr "ativar ou desativar a divisão do índice"
+msgstr "ativar ou desativar monitorizador de sistema de ficheiros"
#: builtin/update-index.c:1069
-#, fuzzy
msgid "mark files as fsmonitor valid"
msgstr "marcar ficheiros válidos para fsmonitor"
@@ -23856,37 +23269,31 @@
msgstr "Cache por monitorizar ativada para '%s'"
#: builtin/update-index.c:1220
-#, fuzzy
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr ""
-"core.splitIndex está definida como false; remova ou altere-a se pretende "
-"mesmo ativar índice separado"
+msgstr "core.fsmonitor está desdefinida; define-a se queres mesmo ativar fsmonitor"
#: builtin/update-index.c:1224
msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor ativado"
#: builtin/update-index.c:1227
-#, fuzzy
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-"core.splitIndex está definida como true; remova ou altere-a se pretende "
-"mesmo desativar índice separado"
+"core.fsmonitor está definida; remove-a se queres mesmo desativar fsmonitor"
#: builtin/update-index.c:1231
msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor desativado"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<opções>] -d <nome-da-referência> [<valor-antigo>]"
+msgstr "git update-ref [<opções>] -d <nome-ref> [<valor-antigo>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-"git update-ref [<opções>] <nome-da-referência> <novo-valor> [<valor-"
-"antigo>]"
+"git update-ref [<opções>] <nome-ref> <novo-valor> [<valor-antigo>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
@@ -23894,7 +23301,7 @@
#: builtin/update-ref.c:500
msgid "delete the reference"
-msgstr "eliminar a referência"
+msgstr "apagar a referência"
#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
@@ -23902,7 +23309,7 @@
#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
-msgstr "os argumentos da entrada padrão terminam em NUL"
+msgstr "a entrada padrão tem argumentos NUL-terminados"
#: builtin/update-ref.c:504
msgid "read updates from stdin"
@@ -23914,11 +23321,11 @@
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
-msgstr "atualizar os ficheiros de informação do zero"
+msgstr "atualizar os ficheiros de info do zero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<opções>] <dir>"
+msgstr "git upload-pack [<opções>] <pasta>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
@@ -23926,7 +23333,7 @@
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+msgstr "sair imediatamente depois de anúncio inicial de ref"
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
@@ -23938,7 +23345,7 @@
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <memória>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
@@ -23950,7 +23357,7 @@
#: builtin/verify-pack.c:59
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pacote>..."
#: builtin/verify-pack.c:70
msgid "verbose"
@@ -23962,14 +23369,13 @@
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <etiqueta>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
-msgstr "imprimir conteúdo da tag"
+msgstr "imprimir conteúdo da etiqueta"
#: builtin/worktree.c:18
-#, fuzzy
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opções>] <caminho> [<mnemónica>]"
@@ -23982,32 +23388,30 @@
msgstr "git worktree lock [<opções>] <caminho>"
#: builtin/worktree.c:21
-#, fuzzy
msgid "git worktree move <worktree> <new-path>"
-msgstr "git worktree move <árvore-de-trabalho> <novo-caminho>"
+msgstr "git worktree move <árvore-trabalho> <novo-caminho>"
#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opções>]"
#: builtin/worktree.c:23
-#, fuzzy
msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree remove [<opções>] <árvore-de-trabalho>"
+msgstr "git worktree remove [<opções>] <árvore-trabalho>"
#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <caminho>"
#: builtin/worktree.c:61 builtin/worktree.c:944
-#, fuzzy, c-format
+#, c-format
msgid "failed to delete '%s'"
msgstr "falhou apagar '%s'"
#: builtin/worktree.c:74
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s/%s: %s"
-msgstr "A remover %s"
+msgstr "Removendo %s/%s: %s"
#: builtin/worktree.c:147
msgid "report pruned working trees"
@@ -24015,7 +23419,7 @@
#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
-msgstr "expirar árvores de trabalho mais antigos que <tempo>"
+msgstr "expirar árvores-trabalho mais velhas que <tempo>"
#: builtin/worktree.c:219
#, c-format
@@ -24023,7 +23427,7 @@
msgstr "'%s' já existe"
#: builtin/worktree.c:228
-#, fuzzy, c-format
+#, c-format
msgid "unusable worktree destination '%s'"
msgstr "destino '%s' de worktree inutilizável"
@@ -24051,7 +23455,7 @@
msgstr "iniciando"
#: builtin/worktree.c:420 builtin/worktree.c:426
-#, fuzzy, c-format
+#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Erro a eliminar ramo '%s'"
@@ -24066,9 +23470,9 @@
msgstr ""
#: builtin/worktree.c:437
-#, fuzzy, c-format
+#, c-format
msgid "Preparing worktree (detached HEAD %s)"
-msgstr "A preparar %s (identificador %s)"
+msgstr "Preparando árvore-trabalho (HEAD desanexada %s)"
#: builtin/worktree.c:482
msgid "checkout <branch> even if already checked out in other worktree"
@@ -24085,24 +23489,21 @@
#: builtin/worktree.c:489
msgid "populate the new working tree"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "povoar nova árvore-trabalho"
#: builtin/worktree.c:490
-#, fuzzy
msgid "keep the new working tree locked"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "manter nova árvore-trabalho trancada"
#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "reason for locking"
msgstr "razão para trancar"
#: builtin/worktree.c:495
-#, fuzzy
msgid "set up tracking mode (see git-branch(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+msgstr "configurar modo de monitorização (vê git-branch(1))"
#: builtin/worktree.c:498
-#, fuzzy
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto"
@@ -24111,9 +23512,8 @@
msgstr ""
#: builtin/worktree.c:508
-#, fuzzy
msgid "--reason requires --lock"
-msgstr "--reason requer --lock"
+msgstr "--reason exige --lock"
#: builtin/worktree.c:512
msgid "added with --lock"
@@ -24128,9 +23528,8 @@
msgstr ""
#: builtin/worktree.c:693
-#, fuzzy
msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "expirar árvores de trabalho mais antigos que <tempo>"
+msgstr "adicionar a anotação 'a podar' para árvores-trabalho mais velhas que <tempo>"
#: builtin/worktree.c:702
msgid "--verbose and --porcelain are mutually exclusive"
@@ -24166,17 +23565,16 @@
msgstr ""
#: builtin/worktree.c:827
-#, fuzzy
msgid "force move even if worktree is dirty or locked"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover mesmo que a árvore-trabalho esteja suja ou trancada"
#: builtin/worktree.c:850 builtin/worktree.c:974
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' é uma working tree principal"
#: builtin/worktree.c:855
-#, fuzzy, c-format
+#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "incapaz descobrir nome de destino a partir de '%s'"
@@ -24204,7 +23602,7 @@
msgstr ""
#: builtin/worktree.c:924
-#, fuzzy, c-format
+#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falhou executar 'git status' em '%s'"
@@ -24214,7 +23612,7 @@
msgstr ""
#: builtin/worktree.c:933
-#, fuzzy, c-format
+#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "falhou executar 'git status' em '%s', código %d"
@@ -24241,14 +23639,14 @@
msgstr ""
#: builtin/worktree.c:1008
-#, fuzzy, c-format
+#, c-format
msgid "repair: %s: %s"
-msgstr "%s: %s"
+msgstr "reparar: %s: %s"
#: builtin/worktree.c:1011
-#, fuzzy, c-format
+#, c-format
msgid "error: %s: %s"
-msgstr "%s: %s"
+msgstr "erro: %s: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -24278,7 +23676,6 @@
msgstr ""
#: git.c:36
-#, fuzzy
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"
@@ -24306,7 +23703,7 @@
msgstr ""
#: git.c:230
-#, fuzzy, c-format
+#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "--super-prefix recebeu prefixo nenhum\n"
@@ -24326,7 +23723,7 @@
msgstr ""
#: git.c:326
-#, fuzzy, c-format
+#, c-format
msgid "unknown option: %s\n"
msgstr "desconheço opção: %s\n"
@@ -24361,9 +23758,8 @@
msgstr ""
#: git.c:480
-#, fuzzy
msgid "close failed on standard output"
-msgstr "enviar resultados para a saída padrão"
+msgstr "fechar a saída padrão falhou"
#: git.c:833
#, c-format
@@ -24371,12 +23767,12 @@
msgstr ""
#: git.c:883
-#, fuzzy, c-format
+#, c-format
msgid "cannot handle %s as a builtin"
msgstr "incapaz lidar %s como um builtin"
#: git.c:896
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: %s\n"
"\n"
@@ -24390,7 +23786,7 @@
msgstr ""
#: git.c:928
-#, fuzzy, c-format
+#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "incapaz de executar comando '%s': %s\n"
@@ -24400,7 +23796,6 @@
msgstr ""
#: http-fetch.c:128
-#, fuzzy
msgid "not a git repository"
msgstr "é repositório git nenhum"
@@ -24409,22 +23804,19 @@
msgstr ""
#: http-fetch.c:143
-#, fuzzy
msgid "--index-pack-args can only be used with --packfile"
-msgstr "-N só pode ser usado com --mixed"
+msgstr ""
#: t/helper/test-fast-rebase.c:141
-#, fuzzy
msgid "unhandled options"
-msgstr "Opções gerais"
+msgstr "opções largadas"
#: t/helper/test-fast-rebase.c:146
-#, fuzzy
msgid "error preparing revisions"
msgstr "erro preparando revisões"
#: t/helper/test-reach.c:154
-#, fuzzy, c-format
+#, c-format
msgid "commit %s is not marked reachable"
msgstr "commit %s está a ser tratado como inalcançável"
@@ -24433,14 +23825,12 @@
msgstr ""
#: t/helper/test-serve-v2.c:7
-#, fuzzy
msgid "test-tool serve-v2 [<options>]"
-msgstr "git rebase--helper [<opções>]"
+msgstr "test-tool serve-v2 [<opções>]"
#: t/helper/test-serve-v2.c:19
-#, fuzzy
msgid "exit immediately after advertising capabilities"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+msgstr "sair imediatamente depois de anunciar capacidades"
#: t/helper/test-simple-ipc.c:262
#, c-format
@@ -24527,14 +23917,12 @@
msgstr ""
#: t/helper/test-simple-ipc.c:704
-#, fuzzy
msgid "number of requests per thread"
-msgstr "incapaz criar thread: %s"
+msgstr "número de pedidos por fio"
#: t/helper/test-simple-ipc.c:706
-#, fuzzy
msgid "byte"
-msgstr "bytes"
+msgstr "byte"
#: t/helper/test-simple-ipc.c:706
msgid "ballast character"
@@ -24542,7 +23930,7 @@
#: t/helper/test-simple-ipc.c:707
msgid "token"
-msgstr ""
+msgstr "token"
#: t/helper/test-simple-ipc.c:707
msgid "command token to send to the server"
@@ -24562,12 +23950,10 @@
msgstr "Afixar chaves públicas tem suporte nenhum com cURL < 7.44.0"
#: http.c:910
-#, fuzzy
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE tem suporte nenhum com cURL < 7.44.0"
#: http.c:989
-#, fuzzy
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Restrição protocolar tem suporte nenhum com cURL < 7.44.0"
@@ -24582,7 +23968,7 @@
msgstr ""
#: http.c:1143
-#, fuzzy, c-format
+#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Incapaz de definir backend SSL para '%s': já definido"
@@ -24603,7 +23989,7 @@
msgstr ""
#: remote-curl.c:307
-#, fuzzy, c-format
+#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs é inválido; isto é um repositório git?"
@@ -24617,14 +24003,14 @@
msgstr ""
#: remote-curl.c:499
-#, fuzzy, c-format
+#, c-format
msgid "repository '%s' not found"
msgstr "repositório '%s' inexistente"
#: remote-curl.c:503
-#, fuzzy, c-format
+#, c-format
msgid "Authentication failed for '%s'"
-msgstr "Falha ao executar: $rest"
+msgstr "Autenticação falhou para '%s'"
#: remote-curl.c:507
#, c-format
@@ -24634,14 +24020,13 @@
#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
-msgstr "a redirecionar para %s "
+msgstr "redirecionando para %s"
#: remote-curl.c:644
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
#: remote-curl.c:656
-#, fuzzy
msgid "remote server sent unexpected response end packet"
msgstr "servidor remoto enviou pacote fim de resposta inesperado"
@@ -24659,12 +24044,11 @@
msgstr ""
#: remote-curl.c:834
-#, fuzzy, c-format
+#, c-format
msgid "RPC failed; %s"
-msgstr "falha: %d"
+msgstr "RPC falhou: %s"
#: remote-curl.c:874
-#, fuzzy
msgid "cannot handle pushes this big"
msgstr "incapaz atirar algo tão grande"
@@ -24689,7 +24073,6 @@
msgstr ""
#: remote-curl.c:1134
-#, fuzzy
msgid "dumb http transport does not support shallow capabilities"
msgstr "transporte http estúpido insustenta capacidades shallow"
@@ -24707,7 +24090,7 @@
msgstr ""
#: remote-curl.c:1257 remote-curl.c:1375
-#, fuzzy, c-format
+#, c-format
msgid "http transport does not support %s"
msgstr "transporte http insustenta %s"
@@ -24737,7 +24120,6 @@
msgstr ""
#: compat/compiler.h:38
-#, fuzzy
msgid "no libc information available\n"
msgstr "informação libc indisponível\n"
@@ -24746,9 +24128,8 @@
msgstr ""
#: list-objects-filter-options.h:95
-#, fuzzy
msgid "object filtering"
-msgstr "tipo do objeto"
+msgstr "filtração de objeto"
#: parse-options.h:184
msgid "expiry-date"
@@ -24767,24 +24148,23 @@
msgstr "ser mais silencioso"
#: parse-options.h:318
-#, fuzzy
msgid "use <n> digits to display object names"
-msgstr "usar <n> dígitos para mostrar SHA-1s"
+msgstr "usar <n> dígitos para mostrar nomes de objetos"
#: parse-options.h:337
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
#: parse-options.h:338
-#, fuzzy
msgid "read pathspec from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler espetro-caminho de ficheiro"
#: parse-options.h:339
-#, fuzzy
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr ""
+"com --pathspec-from-file, os elementos de espetro-caminho estão separados por "
+"caractere NUL"
#: ref-filter.h:99
msgid "key"
@@ -24801,30 +24181,27 @@
#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr ""
#: command-list.h:52
-#, fuzzy
msgid "Annotate file lines with commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
+msgstr "Anotar linha de ficheiro com informação de memória"
#: command-list.h:53
-#, fuzzy
msgid "Apply a patch to files and/or to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "Submeter um remendo a ficheiros e/ou ao cenário"
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr ""
#: command-list.h:55
-#, fuzzy
msgid "Create an archive of files from a named tree"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "Criar arquivo de ficheiros a partir de árvore nomeada"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
@@ -24859,13 +24236,12 @@
msgstr ""
#: command-list.h:64
-#, fuzzy
msgid "Show canonical names and email addresses of contacts"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+msgstr "Mostrar nomes canónicos e endereços de e-mail de contatos"
#: command-list.h:65
msgid "Switch branches or restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
+msgstr "Trocar ramos ou restaurar ficheiros de árvore-trabalho"
#: command-list.h:66
msgid "Copy files from the index to the working tree"
@@ -24896,9 +24272,8 @@
msgstr "Clonar um repositório num novo diretório"
#: command-list.h:73
-#, fuzzy
msgid "Display data in columns"
-msgstr "listar os ramos em colunas"
+msgstr "Mostrar informação em colunas"
#: command-list.h:74
msgid "Record changes to the repository"
@@ -24990,7 +24365,6 @@
msgstr ""
#: command-list.h:96
-#, fuzzy
msgid "Rewrite branches"
msgstr " Ramo remoto:%s"
@@ -25071,7 +24445,6 @@
msgstr ""
#: command-list.h:116
-#, fuzzy
msgid "The Git repository browser"
msgstr "O browser de repositórios Git"
@@ -25080,14 +24453,12 @@
msgstr "Mostrar histórico de commits"
#: command-list.h:118
-#, fuzzy
msgid "Show information about files in the index and the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+msgstr "Mostrar informação acerca de ficheiros no cenário e árvore-trabalho"
#: command-list.h:119
-#, fuzzy
msgid "List references in a remote repository"
-msgstr "repositório de referência"
+msgstr "Listar referências em um repositório remoto"
#: command-list.h:120
msgid "List the contents of a tree object"
@@ -25110,17 +24481,14 @@
msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
#: command-list.h:125
-#, fuzzy
msgid "Find as good common ancestors as possible for a merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "Encontrar tantos quantos antecessores comuns bons para uma junção"
#: command-list.h:126
-#, fuzzy
msgid "Run a three-way file merge"
msgstr "Faz uma junção por três de ficheiro"
#: command-list.h:127
-#, fuzzy
msgid "Run a merge for files needing merging"
msgstr "Faz um merge de ficheiros precisando de merge"
@@ -25141,7 +24509,6 @@
msgstr ""
#: command-list.h:132
-#, fuzzy
msgid "Creates a tag object with extra validation"
msgstr "outro objeto tag"
@@ -25158,7 +24525,6 @@
msgstr ""
#: command-list.h:136
-#, fuzzy
msgid "Add or inspect object notes"
msgstr "Adicionar ou inspecionar notas de objeto"
@@ -25171,7 +24537,6 @@
msgstr ""
#: command-list.h:139
-#, fuzzy
msgid "Find redundant pack files"
msgstr "Encontrar ficheiros de pacote redundantes"
@@ -25200,7 +24565,6 @@
msgstr "Atualizar referências remotas juntamente com objetos associados"
#: command-list.h:146
-#, fuzzy
msgid "Applies a quilt patchset onto the current branch"
msgstr "Submete a mistura de patchset para o ramo atual."
@@ -25217,14 +24581,12 @@
msgstr "Reaplicar commits no topo de outra base"
#: command-list.h:150
-#, fuzzy
msgid "Receive what is pushed into the repository"
msgstr "Receber para o repositório, o que foi atirado"
#: command-list.h:151
-#, fuzzy
msgid "Manage reflog information"
-msgstr "mostrar informação de resolver-desfazer"
+msgstr "Gerir informação de registo-ref"
#: command-list.h:152
msgid "Manage set of tracked repositories"
@@ -25235,9 +24597,8 @@
msgstr ""
#: command-list.h:154
-#, fuzzy
msgid "Create, list, delete refs to replace objects"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar refs para substituir objetos"
#: command-list.h:155
msgid "Generates a summary of pending changes"
@@ -25249,15 +24610,13 @@
#: command-list.h:157
msgid "Reset current HEAD to the specified state"
-msgstr "Repor a HEAD atual no estado especificado"
+msgstr "Restabelecer a HEAD atual para estado especificado"
#: command-list.h:158
-#, fuzzy
msgid "Restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
+msgstr "Restaurar ficheiros de árvore-trabalho"
#: command-list.h:159
-#, fuzzy
msgid "Revert some existing commits"
msgstr "Reverter algumas memórias existentes"
@@ -25266,7 +24625,6 @@
msgstr ""
#: command-list.h:161
-#, fuzzy
msgid "Pick out and massage parameters"
msgstr "demasiados parâmetros"
@@ -25295,16 +24653,14 @@
msgstr "Mostrar vários tipos objetos"
#: command-list.h:168
-#, fuzzy
msgid "Show branches and their commits"
-msgstr "imprimir apenas ramos que contenham o commit"
+msgstr "Mostrar ramos e as suas memórias"
#: command-list.h:169
msgid "Show packed archive index"
msgstr ""
#: command-list.h:170
-#, fuzzy
msgid "List references in a local repository"
msgstr "Lista referências num repositório local"
@@ -25321,18 +24677,16 @@
msgstr ""
#: command-list.h:174
-#, fuzzy
msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: já existe no diretório de trabalho"
+msgstr "Esconde as alterações de pasta-trabalho suja"
#: command-list.h:175
-#, fuzzy
msgid "Add file contents to the staging area"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
#: command-list.h:176
msgid "Show the working tree status"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "Mostrar status de árvore-trabalho"
#: command-list.h:177
msgid "Remove unnecessary whitespace"
@@ -25347,18 +24701,16 @@
msgstr ""
#: command-list.h:180
-#, fuzzy
msgid "Switch branches"
msgstr "Troca branches"
#: command-list.h:181
-#, fuzzy
msgid "Read, modify and delete symbolic refs"
msgstr "eliminar referências simbólicas"
#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar ou verificar um objeto-etiqueta assinado com GPG"
#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
@@ -25393,12 +24745,10 @@
msgstr ""
#: command-list.h:191
-#, fuzzy
msgid "Check the GPG signature of commits"
msgstr "Verifica assinatura GPG de memórias"
#: command-list.h:192
-#, fuzzy
msgid "Validate packed Git archive files"
msgstr "Validar ficheiros pacote de arquivo Git"
@@ -25415,12 +24765,10 @@
msgstr "Mostrar logs com diferenças que cada memória introduz"
#: command-list.h:196
-#, fuzzy
msgid "Manage multiple working trees"
msgstr "Gerir múltiplas working trees"
#: command-list.h:197
-#, fuzzy
msgid "Create a tree object from the current index"
msgstr "Criar um objeto tree a partir de index atual"
@@ -25445,9 +24793,8 @@
msgstr ""
#: command-list.h:203
-#, fuzzy
msgid "Tweaking diff output"
-msgstr "suprimir saída do diff"
+msgstr "Mexendo com saída de diff"
#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
@@ -25458,7 +24805,6 @@
msgstr ""
#: command-list.h:206
-#, fuzzy
msgid "A Git Glossary"
msgstr "Um Glossário de Git"
@@ -25500,14 +24846,12 @@
msgstr ""
#: command-list.h:216
-#, fuzzy
msgid "A tutorial introduction to Git: part two"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgstr "Um tutorial de introdução a Git: parte dois"
#: command-list.h:217
-#, fuzzy
msgid "A tutorial introduction to Git"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgstr "Um tutorial de introdução a Git"
#: command-list.h:218
msgid "An overview of recommended workflows with Git"
@@ -25536,13 +24880,13 @@
msgstr "bisseção incapaz de continuar"
#: git-bisect.sh:111
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect-state $state' exited with error code $res"
msgstr ""
"bisseção impossível:\n"
-"'bisect_state $state' retornou código $res de erro"
+"'bisect-state $state' retornou código de erro $res"
#: git-bisect.sh:118
msgid "bisect run success"
@@ -25570,7 +24914,7 @@
msgstr "Incapaz de encontrar commit comum com $pretty_name"
#: git-merge-octopus.sh:77
-#, fuzzy, sh-format
+#, sh-format
msgid "Already up to date with $pretty_name"
msgstr "Já está atualizado com $pretty_name"
@@ -25610,14 +24954,14 @@
msgstr "'$sm_path' já existe no index e é submódulo nenhum"
#: git-submodule.sh:218
-#, fuzzy, sh-format
+#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' tem memória nenhuma checked out"
#: git-submodule.sh:248
#, sh-format
msgid "Failed to add submodule '$sm_path'"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+msgstr "Falhou ao adicionar submódulo '$sm_path'"
#: git-submodule.sh:257
#, sh-format
@@ -25644,7 +24988,7 @@
"submódulo '$sm_path'"
#: git-submodule.sh:565
-#, fuzzy, sh-format
+#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
@@ -25732,7 +25076,6 @@
msgstr "A rebasear ($new_count/$total)"
#: git-rebase--preserve-merges.sh:197
-#, fuzzy
msgid ""
"\n"
"Commands:\n"
@@ -25897,11 +25240,11 @@
#: git-rebase--preserve-merges.sh:681
#, sh-format
msgid "Execution failed: $rest"
-msgstr "Falha ao executar: $rest"
+msgstr "Execução falhou: $rest"
#: git-rebase--preserve-merges.sh:683
msgid "and made changes to the index and/or the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+msgstr "e fiz alterações ao cenário e/ou à árvore-trabalho"
#: git-rebase--preserve-merges.sh:685
msgid ""
@@ -25936,7 +25279,7 @@
#: git-rebase--preserve-merges.sh:710
msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corrija-o usando 'git rebase --edit-todo'."
+msgstr "Por favor corrige isto usando 'git rebase --edit-todo'."
#: git-rebase--preserve-merges.sh:745
#, sh-format
@@ -26020,8 +25363,8 @@
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+msgstr[0] "Rebasear $shortrevisions sobre $shortonto ($todocount comando)"
+msgstr[1] "Rebasear $shortrevisions sobre $shortonto ($todocount comandos)"
#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
@@ -26266,7 +25609,6 @@
"d - deixar de fora este pedaço e os próximos deste ficheiro"
#: git-add--interactive.perl:1299
-#, fuzzy
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -26312,26 +25654,26 @@
msgstr "ignorando por juntar: %s\n"
#: git-add--interactive.perl:1479
-#, fuzzy, perl-format
+#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/"
"%s,?]? "
#: git-add--interactive.perl:1480
-#, fuzzy, perl-format
+#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
#: git-add--interactive.perl:1481
-#, fuzzy, perl-format
+#, perl-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
#: git-add--interactive.perl:1482
-#, fuzzy, perl-format
+#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar este pedaço ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
@@ -26420,12 +25762,12 @@
#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "modo --patch desconhecido: %s"
#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
-msgstr "argumento inválido %s, esperava-se --"
+msgstr "argumento inválido %s, esperando --"
#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
@@ -26665,7 +26007,6 @@
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1544
-#, fuzzy
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): "
@@ -26689,9 +26030,7 @@
#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr ""
-"Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-"
-"debug."
+msgstr "Incapaz inicializar SMTP devidamente. Verifica config e usa --smtp-debug."
#: git-send-email.perl:1664
#, perl-format
@@ -26773,7 +26112,7 @@
msgstr "codificação de transferência inválida"
#: git-send-email.perl:2051
-#, fuzzy, perl-format
+#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
"%s\n"
@@ -26788,13 +26127,13 @@
msgstr "incapaz abrir %s: %s\n"
#: git-send-email.perl:2064
-#, fuzzy, perl-format
+#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"warning: no patches were sent\n"
msgstr ""
-"fatal: %s: %s\n"
-"aviso: enviado patch nenhum\n"
+"fatal: %s:%d é mais longo que 998 caracteres\n"
+"aviso: enviado remendo nenhum\n"
#: git-send-email.perl:2082
#, perl-format
diff --git a/po/sv.po b/po/sv.po
index 7e08824..e3b17b6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.33.0\n"
+"Project-Id-Version: git 2.34.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 21:14+0100\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-11 23:20+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -18,213 +18,213 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 3.30.1\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binär"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "ingenting"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "oändrad"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Uppdatera"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "kunde inte köa \"%s\""
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "kunde inte skriva indexet"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Återställ"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "kunde inte tolka HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorerar ej sammanslagen: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Uppdatera patch"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Granska diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "visa sökvägar med ändringar"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "välj stycken och uppdatera selektivt"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "visa skillnad mellan HEAD och index"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "lägg innehåll i ospårade filer till köade ändringar"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Kommandoradshjälp:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "markera en post"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "markera intervall av poster"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "markera flera intervall"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "markera post baserad på unikt prefix"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "avmarkera angivna poster"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "välj alla poster"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(tomt) avsluta markering"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "markera en numrerad post"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(tomt) markera ingenting"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Vad nu"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "köad"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "ej köad"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "sökväg"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "kunde inte uppdatera indexet"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
@@ -737,7 +737,7 @@
msgid "'git apply' failed"
msgstr "\"git apply\" misslyckades"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -746,47 +746,47 @@
"\n"
"Slå av meddelandet med \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:270
+#: advice.c:196
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."
@@ -794,41 +794,48 @@
"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:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
-"motsvarar\n"
-"indexposter utanför den nuvarande glesa utcheckningen:\n"
+"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n"
+"utanför din \"sparse-checkout\"-definition, så de kommer inte\n"
+"uppdateras i indexet:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
-"poster."
+"Om du har tänkt uppdatera sådana poster, försök något av följande:\n"
+"* Använd flaggan --sparse.\n"
+"* Inaktivera eller ändra reglerna för gles utcheckning."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1009,49 +1016,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3056
+#: apply.c:3057
#, 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)."
-#: apply.c:3068
+#: apply.c:3069
#, 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"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1060,25 +1067,25 @@
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
"\""
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1086,419 +1093,420 @@
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3208
+#: apply.c:3209
#, 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)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3412
+#: apply.c:3413
#, 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"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Utför trevägssammanslagning...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Misslyckades utföra trevägssammanslagning...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Faller tillbaka på direkt tillämpning...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg \"%s\""
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3976
+#: apply.c:3998
#, 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)"
-#: apply.c:3981
+#: apply.c:4003
#, 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"
-#: apply.c:4001
+#: apply.c:4023
#, 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"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4327
+#: apply.c:4349
#, 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"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4559
+#: apply.c:4581
#, 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..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4937
+#: apply.c:4959
#, 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"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "antal"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:5006
+#: apply.c:5028
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"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:5012
+#: apply.c:5034
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"
-#: apply.c:5014
+#: apply.c:5036
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"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"försök en trevägssammanslagning, fall tillbaka på normal patch om det "
"misslyckas"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "åtgärd"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "rot"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
@@ -1570,152 +1578,151 @@
msgid "cannot read %s"
msgstr "kan inte läsa %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "ingen sådan referens: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "objektnamnet är inte giltigt: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "inte ett trädobjekt: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "aktuell arbetskatalog är inte spårad"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Hittar inte filen: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Inte en vanlig fil: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "fmt"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "prefix"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "fil"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "ta med ospårade filer i arkivet"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "välj komprimeringsgrad"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "arkiv"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "kommando"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%-*s är inte ett giltigt namn på attribut"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s inte tillåtet: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1723,22 +1730,22 @@
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1747,7 +1754,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1756,7 +1763,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1765,7 +1772,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1776,7 +1783,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1788,36 +1795,36 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1826,7 +1833,7 @@
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsargument?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1836,7 +1843,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1857,11 +1864,12 @@
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -2028,7 +2036,7 @@
#: bundle.c:44
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""
+msgstr "okänd hashningsalgoritm för bunt: \"%s\""
#: bundle.c:48
#, c-format
@@ -2038,15 +2046,15 @@
#: bundle.c:74
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"
+msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -2057,29 +2065,29 @@
#: bundle.c:201
msgid "need a repository to verify a bundle"
-msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
+msgstr "behöver ett arkiv för att bekräfta en bunt."
#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Paketet (bundlen) innehåller denna referens:"
-msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
+msgstr[0] "Bunten innehåller denna referens:"
+msgstr[1] "Bunten innehåller dessa %d referenser:"
#: bundle.c:264
msgid "The bundle records a complete history."
-msgstr "Paketet (bundlen) beskriver en komplett historik."
+msgstr "Bunten beskriver en komplett historik."
#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Paketet (bundlen) kräver denna referens:"
-msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
+msgstr[0] "Bunten kräver denna referens:"
+msgstr[1] "Bunten kräver dessa %d referenser:"
#: bundle.c:333
msgid "unable to dup bundle descriptor"
-msgstr "kan inte duplicera pakethandtag"
+msgstr "kan inte duplicera bunthandtag"
#: bundle.c:340
msgid "Could not spawn pack-objects"
@@ -2097,21 +2105,21 @@
#: bundle.c:504
#, c-format
msgid "unsupported bundle version %d"
-msgstr "version %d för paket (bundle) stöds ej"
+msgstr "version %d för bunt stöds ej"
#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"
+msgstr "kan inte skriva bunt med version %d med algoritmen %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
#: bundle.c:553
msgid "Refusing to create empty bundle."
-msgstr "Vägrar skapa ett tomt paket (bundle)."
+msgstr "Vägrar skapa en tom bunt."
#: bundle.c:563
#, c-format
@@ -2146,7 +2154,7 @@
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "felaktig hashnings-version"
@@ -2191,190 +2199,190 @@
msgid "unable to find all commit-graph files"
msgstr "kan inte hitta alla incheckingsgraffiler"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Rensar incheckningsmärken i incheckningsgraf"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Beräknar topografiska nivåer för incheckningsgraf"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Samlar refererade incheckningar"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Söker ytterligare kanter i incheckingsgraf"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "kan inte skapa temporärt graflager"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "kan inte justera delade behörigheter för \"%s\""
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Skriver ut incheckningsgraf i %d pass"
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Söker sammanslagna incheckningar"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Slår ihop incheckningsgraf"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "för många incheckningar för att skriva graf"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
"trasig"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Bekräftar incheckningar i incheckningsgrafen"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "incheckningsgrafens förälder för %s är %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2382,7 +2390,7 @@
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
"noll på annan plats"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2390,32 +2398,32 @@
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
"%s, men noll på annan plats"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
"= %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2435,29 +2443,29 @@
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1239
#, 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."
-#: commit.c:1241
+#: commit.c:1243
#, 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."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2471,7 +2479,7 @@
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2486,35 +2494,35 @@
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "felaktigt konfigurationsformat: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
@@ -2524,303 +2532,303 @@
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "tom konfigurationsnyckel"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "felaktigt antal i %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "för många poster i %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "konfigurationsnyckel saknas för %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "konfigurationsvärde saknas för %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "kunde inte utföra mmap på \"%s\"%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -2855,72 +2863,72 @@
msgid "expected flush after capabilities"
msgstr "förväntade \"flush\" efter förmågor"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignorerar förmågor efter första raden \"%s\""
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "protokollfel: förväntade inte capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "arkivet på andra sidan kan inte vara grunt"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "ogiltigt paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokollfel: förväntade inte \"%s\""
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "okänt objektformat \"%s\" angavs av servern"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ogiltigt svar på ls-refs: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "förväntade \"flush\" efter ref-listan"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "förväntade svarsavslutningspaket efter ref-listan"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokollet \"%s\" stöds inte"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Slår upp %s..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "kan inte slå upp %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2929,7 +2937,7 @@
"klart.\n"
"Ansluter till %s (port %s)..."
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2939,79 +2947,79 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "klart."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "kunde inte slå upp %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "okänd port %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "konstigt värdnamn \"%s\" blockerat"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "konstig port \"%s\" blockerad"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "kan inte starta mellanserver (proxy) %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh-varianten \"simple\" stöder inte -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh-varianten \"simple\" stöder inte -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh-varianten \"simple\" stöder inte val av port"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "konstigt sökvägsnamn \"%s\" blockerat"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "kunde inte grena (fork)"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
@@ -3156,17 +3164,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url innehåller radbrytning i komponenten %s: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "url saknar protokoll: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "kan inte tolka url för inloggingsuppgifter: %s"
@@ -3268,23 +3276,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "okänt värde för --diff-merges: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base fungerar inte med intervall"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base fungerar bara med incheckningar"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "kan inte hämta HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "ingen sammanslagningsbas hittades"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "flera sammanslagningsbaser hittades"
@@ -3300,17 +3308,17 @@
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
"en arbetskatalog."
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3318,7 +3326,7 @@
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3328,7 +3336,7 @@
"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
"\""
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3336,12 +3344,12 @@
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
"blankstegslägen"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3350,27 +3358,27 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "
"-S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3378,22 +3386,22 @@
"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
"all med -G och -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "ogiltigt värde för --stat: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s förväntar ett numeriskt värde"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3402,42 +3410,42 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "okänt värde efter ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3445,154 +3453,154 @@
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "skriv bara ut den sista raden för --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3600,7 +3608,7 @@
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3608,87 +3616,87 @@
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
"eller --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "lägg till ytterligare prefix på alla rader i utdata"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "ange tecken för att ange ny rad istället för \"+\""
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "ange tecken för att ange gammal rad istället för \"-\""
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "ange tecken för att ange sammanhang istället för \" \""
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "använd oförändrade som källa för att hitta kopior"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3696,163 +3704,163 @@
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "skapa diffar med algoritmen \"patience diff\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "skapa diffar med algoritmen \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algoritm>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "välj en diff-algoritm"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<text>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "skapa diffar med algoritmen \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<läge>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
"sökvägar"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<när>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<format>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3860,66 +3868,66 @@
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "styr ordningen i vilken filer visas i utdata"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<sökväg>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "visa ändringen i angiven sökväg först"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "hoppa över utdata fram till angiven sökväg"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Skriv utdata till en specifik fil"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"uttömmande namnbytesdetektering hoppades över på grund av för många filer."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3931,7 +3939,7 @@
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
@@ -3971,338 +3979,416 @@
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Kunde inte gissa katalognamn.\n"
+"Ange en katalog på kommandoraden"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "felaktig git-namnrymdssökväg \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "kunde inte ställa in GIT_DIR till \"%s\""
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "klart"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-patch: ogiltig utdata från index-pack"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Servern stöder %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Servern stöder inte det här arkivets objektformat"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "källarkivet är grunt, tillåter inte kloning."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: hämtning misslyckades."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "omaka algoritmer: klient %s; server %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "servern stöder inte algoritmen \"%s\""
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Servern stöder filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "oväntad bekräftelserad: \"%s\""
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "väntade att paketfil skulle sändas efter \"ready\""
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: förväntade svarsavslutningspaket"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "oväntat \"ready\" från fjärr"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
+"signaturer"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"
+"signaturer (tillgängligt i openssh version 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "felaktig/inkompatibel signatur \"%s\""
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey måste anges för ssh-signering"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
+"version 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4310,109 +4396,109 @@
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
"P under PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "starta arbetskatalog (se också: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "jobba med aktuell förändring (se också: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "utforska historiken och tillståndet (se också: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "utöka, markera och justera din gemensamma historik"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "samarbeta (se också: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Huvudsakliga porslinskommandon"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Tilläggskommandon / manipulerare"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Tilläggskommandon / frågare"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Interaktion med andra"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Lågnivåkommandon / maniupulerare"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Lågnivåkommandon / frågare"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Lågnivåkommandon / synka arkiv"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Lågnivåkommandon / interna hjälpare"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "okänd kommandolisttyp \"%s\""
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Vägledningar för Git-koncept:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Externa kommandon"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Kommadoalias"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4421,32 +4507,37 @@
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Köra \"%s\" istället? (j/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4460,16 +4551,16 @@
"\n"
"Mest lika kommandon är"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4483,6 +4574,15 @@
"\n"
"Menade du ett av dessa?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
+"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Författar-identitet okänd\n"
@@ -4545,7 +4645,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
@@ -4640,7 +4740,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "oväntad rad: \"%s\""
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "förväntade \"flush\" efter ls-refs-argument"
@@ -4648,39 +4753,39 @@
msgid "quoted CRLF detected"
msgstr "citerad CRLF upptäcktes"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "felaktig funktion \"%s\" för \"%s\""
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
"sammanslagningsbasen)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Obs: Snabbspolar undermodulen %s till %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Misslyckades slå ihop undermodulen %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4689,7 +4794,7 @@
"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4706,7 +4811,7 @@
"\n"
"vilket godtar lösningen.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4716,21 +4821,21 @@
"finns:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4739,7 +4844,7 @@
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4748,7 +4853,7 @@
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4759,7 +4864,7 @@
"den har namnbytts till flera andra kataloger, utan att någon destination "
"fick en majoritet av filerna."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4768,7 +4873,7 @@
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
"bytt namn."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4777,7 +4882,7 @@
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
"flyttar den till %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4786,7 +4891,7 @@
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
"namn i %s; flyttar den till %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4795,7 +4900,7 @@
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
"%s, föreslår att den bör flyttas till%s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4804,13 +4909,13 @@
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
"bytte namn i %s; flyttar den till %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4821,23 +4926,23 @@
"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
"nästlade konfliktmarkörer."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4846,7 +4951,7 @@
"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
"till %s istället."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4855,7 +4960,7 @@
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
"så att de kan protokollföras någonstans."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4864,24 +4969,24 @@
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
"så att de kan protokollföras någonstans."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "innehåll"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "undermodul"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4890,7 +4995,7 @@
"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
"lämnad i trädet."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4902,12 +5007,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4917,109 +5022,109 @@
"sammanslagning:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Redan à jour."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
"sammanslagningen."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, 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:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Snabbspolar undermodulen %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
"hittades inte)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5028,7 +5133,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5037,7 +5142,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5046,7 +5151,7 @@
"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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5055,40 +5160,40 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet vid %s."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Vägrar förlora lortig fil vid \"%s\""
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, 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:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5097,17 +5202,17 @@
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5118,7 +5223,7 @@
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
"destination fick en majoritet av filerna."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5127,80 +5232,80 @@
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
"%s->%s i %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, 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:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -5208,190 +5313,222 @@
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-indexets OID-utbredning har fel storlek"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "kan inte spara reverse-index-fil"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "kunde inte tolka rad: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "felaktig rad: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "kunde inte läsa paket{"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "kunde inte öppna indexet för %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "såg inte paketfilen %s som skulle kastas"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "okänt föredraget paket: %s"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "kan inte välja föredraget paket %s som inte har några objekt"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "föredraget paket \"%s\" har löpt ut"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "inga paketfiler att indexera."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "kunde inte skriva fler-paketsbitkarta"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "kunde inte skriva flerpakets-index"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "felaktig kontrollsumma"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx saknar oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Bekräftar OID-ordning i multi-pack-index"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Räknar refererade objekt"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ser efter och tar bort orefererade packfiler"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "kunde inte starta pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "kunde inte avsluta pack-objects"
@@ -5450,258 +5587,258 @@
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "kan inte normalisera objektkatalogen: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "kan inte läsa \"alternates\"-filen"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: object-file.c:789
+#: object-file.c:722
#, 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."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "kunde inte hitta objektkatalog för %s"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap misslyckades%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "felaktig objekttyp"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "kan inte packa upp %s-huvudet"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "kan inte tolka %s-huvud"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "felaktig objekttyp"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "kan inte packa upp %s-huvudet"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "huvudet för %s är för långt, mer än %d byte"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "kunde inte skriva filen %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "fel vid stängning av fil för löst objekt"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "kunde inte skriva fil för löst objekt"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "kan inte läsa objekt för %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "trasig tagg"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
@@ -5828,12 +5965,25 @@
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: kunde inte öppna paket"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "kan inte hämta storlek på %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "kan inte hämta diskanvändning för %s"
@@ -5863,45 +6013,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "kan inte både skriva och bekräfta reverse-index"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "kunde inte ta status: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "kunde inte göra %s läsbar"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "kunde inte skriva kontraktsfilen \"%s\""
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paketfilen %s kunde inte kopplas%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "flaggan \"%s\" antar ett numeriskt värde"
@@ -5922,71 +6072,71 @@
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s behöver ett värde"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s är inkompatibel med %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibelt med något annat"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s tar inget värde"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s är inte tillgängligt"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "menade du \"--%s\" (med två bindestreck)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "alias för --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -5994,48 +6144,72 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-TAL"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Endast en \"attr:\"-angivelse tillåten."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "attr-angivelse kan inte vara tom"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "ogiltigt attributnamn %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6043,51 +6217,51 @@
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
"globala sökvägsinställningar"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "linjen er felaktigt citerad: %s"
@@ -6108,7 +6282,7 @@
msgid "flush packet write failed"
msgstr "fel vid skrivning av \"flush\"-paket"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "protokollfel: omöjligt lång rad"
@@ -6116,7 +6290,7 @@
msgid "packet write with format failed"
msgstr "paketskrivning med format misslyckades"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
@@ -6125,25 +6299,25 @@
msgid "packet write failed: %s"
msgstr "paketskrivning misslyckades: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "läsfel"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "fjärren lade på oväntat"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokollfel: felaktig radlängdstecken: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokollfel: felaktig radlängd: %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
@@ -6157,7 +6331,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "kunde inte skapa trådad lstat: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
@@ -6187,20 +6361,20 @@
msgid "Removing duplicate objects"
msgstr "Tar bort duplicerade objekt"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6209,12 +6383,12 @@
"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
"\"%s\""
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "kunde inte tolka git-huvudet \"%.*s\""
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
@@ -6242,7 +6416,7 @@
msgstr ""
"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "\"%s\" har inte någon utcheckad incheckning"
@@ -6262,16 +6436,16 @@
msgid "unable to stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "\"%s\" finns både som en fil och en katalog"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Uppdatera indexet"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6280,7 +6454,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6289,143 +6463,143 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "felaktig signatur 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "felaktig indexversion %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "felaktig sha1-signatur för indexfil"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorerar filtillägget %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "okänt format 0x%08x på indexpost"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "osorterade köposter i index"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "flera köposter för den sammanslagna filen \"%s\""
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "osorterade köposter för \"%s\""
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "kunde inte skapa tråd för load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: öppning av indexfilen misslyckades"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: kan inte ta startus på det öppna indexet"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indexfilen mindre än förväntat"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: kan inte koppla indexfilen%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "kunde inte uppdatera delat index \"%s\""
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "trasigt index, förväntade %s i %s, fick %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "misslyckades omvandla till glest index"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "kan inte rätta behörighetsbitar på \"%s\""
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: kan inte återgå till kö 0"
@@ -6508,7 +6682,7 @@
msgstr[0] "Ombasera %s på %s (%d kommando)"
msgstr[1] "Ombasera %s på %s (%d kommandon)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6517,7 +6691,7 @@
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6525,7 +6699,7 @@
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6539,7 +6713,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6549,14 +6723,14 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "kunde inte skriva \"%s\""
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "kunde inte skriva \"%s\"."
@@ -6590,12 +6764,10 @@
"\" (fel).\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: \"preserve\" har ersatts av \"merges\""
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6616,258 +6788,278 @@
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "okänt %%(objectsize)-argument: %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) tar inte argument"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "okänt %%(subject)-argument: %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr "förvändate %%(trailers:nyckel=<värde>)"
+msgstr "förväntade %%(trailers:key=<värde>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "okänt %%(raw)-argument: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "positivt värde förväntat \"%s\" i %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "okänt argument \"%s\" i %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "okänd e-postalternativ: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) tar inte argument"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "kommandot förkastar atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "\"%s\" pekar inte på ett giltigt objekt!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6892,81 +7084,81 @@
"\n"
"\tgit branch -m <namn>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "kunde inte hämta \"%s\""
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "felaktigt namn på gren: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorerar dinglande symbolisk referens %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "loggen för referensen %s har lucka efter %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "loggen för referensen %s slutade oväntat på %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "loggen för %s är tom"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "referensuppdateringar avbrutna av krok"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
@@ -7268,7 +7460,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "fel vid skrivning av \"%s\" (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "misslyckades spola \"%s\""
@@ -7313,8 +7505,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
@@ -7352,46 +7544,41 @@
msgid "could not determine HEAD revision"
msgstr "kunde inte bestämma HEAD-revision"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "kunde inte hitta trädet för %s."
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input är inkompatibelt med --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketfil> stöds inte längre"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk är inkompatibelt med --unsorted-input"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2687
+#: revision.c:2693
#, 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:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "misslyckades öppna /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "kan inte skapa asynkron tråd: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
-"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
@@ -7410,23 +7597,23 @@
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7434,47 +7621,48 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "revert"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7482,53 +7670,75 @@
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
-"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
-"och checka in resultatet med \"git commit\""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git cherry-pick --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git cherry-pick --skip\"\n"
+"För att avbryta och återgå till där du var före \"git cherry-pick\",\n"
+"kör \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git revert --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git revert --skip\"\n"
+"För att avbryta och återgå till där du var före \"git revert\",\n"
+"kör \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
@@ -7536,65 +7746,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7623,11 +7833,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7654,7 +7864,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7679,345 +7889,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "ogiltig författar-identitet \"%s\""
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "trasig författare: saknar datuminformation"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "avbryter pågående \"cherry-pick\""
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "avbryter pågående \"revert\""
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: \"%s\""
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "en \"revert\" pågår redan"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "en \"cherry-pick\" pågår redan"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
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:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "ingen \"revers\" pågår"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "ingen \"cherry-pick\" pågår"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "kunde inte hoppa över incheckningen"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "ingenting att hoppa över"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8026,16 +8241,16 @@
"har du redan checkat in?\n"
"testa \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8054,27 +8269,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Kör: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8089,11 +8304,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8110,90 +8325,90 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Oväntat svar från stash: \"%s\""
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Kunde inte skapa katalog för \"%s\""
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Skapade autostash: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "kunde inte utföra \"reset --hard\""
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8204,29 +8419,29 @@
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Tillämpning av autostash gav konflikter."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash finns; skapar ny stash-post."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8247,58 +8462,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Ombaserar (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Lyckades ombasera och uppdatera %s.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8308,50 +8523,59 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continue\" igen."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "hoppade över tidigare applicerad incheckning %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
@@ -8510,27 +8734,15 @@
"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "misslyckades öppna /dev/null eller \"dup\""
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "försöker använda glest index utan \"cone\"-läge"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indexposten är en katalog, men inte gles (%08x)"
@@ -8587,13 +8799,13 @@
msgstr[0] "%u byte/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "kunde inte redigera \"%s\""
@@ -8617,7 +8829,7 @@
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
@@ -8642,22 +8854,22 @@
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "i ej utcheckad undermodul \"%s\""
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "felaktigt argument till --ignore-submodules: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8666,12 +8878,12 @@
"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
"med samma namn. Hoppar över den."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8680,36 +8892,36 @@
"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
"undermodulen \"%s\""
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "process för undermodulen \"%s\" misslyckades"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Sänder undermodulen \"%s\"\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kunde inte sända undermodulen \"%s\"\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Hämtar undermodulen %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8718,61 +8930,61 @@
"Fel vid hämtning av undermodul:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "kunde inte återställa indexet i undermodul"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8780,17 +8992,17 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8801,11 +9013,11 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
@@ -8827,7 +9039,7 @@
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
@@ -8842,11 +9054,11 @@
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "kunde inte läsa från standard in"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
@@ -8916,7 +9128,7 @@
msgid "error while running fast-import"
msgstr "fel när fast-import kördes"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "kunde inte läsa referensen %s"
@@ -8934,7 +9146,7 @@
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
@@ -8943,7 +9155,7 @@
msgid "can't connect to subservice %s"
msgstr "kan inte ansluta till undertjänsten %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only kräver protokoll v2"
@@ -8956,59 +9168,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "hjälparen returnerade oväntad status %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "hjälparen %s stöder inte dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "hjälparen %s stöder inte --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "hjälparen %s stöder inte --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "hjälparen %s stöder inte --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "hjälparen %s stöder inte --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "hjälparen %s stöder inte \"push-option\""
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "hjälparen %s stöder inte \"force\""
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "kunde inte köra fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "fel vid körning av fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9017,52 +9229,52 @@
"Inga gemensamma referenser och inga angavs; gör inget.\n"
"Du kanske borde ange en gren.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "objektformatet \"%s\" stöds ej"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "felformat svar i referenslistan: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "läs(%s) misslyckades"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "skriv(%s) misslyckades"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "%s-tråden misslyckades"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s-tråden misslyckades ansluta: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "kan inte starta tråd för kopiering av data: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "processen %s misslyckades vänta"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "processen %s misslyckades"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "kan inte skapa tråd för kopiering av data"
@@ -9074,48 +9286,48 @@
#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa paketet (bundlen) \"%s\""
+msgstr "kunde inte läsa bunten \"%s\""
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: \"%s\""
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "se protocol.version i \"git help config\" för mer information"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "serverflaggor kräver protokollversion 2 eller senare"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "servern stöder inte wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "kunde inte tolka inställningen för transport.color.*"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "stöd för protokoll v2 ännu ej implementerat"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "okänt värde för inställningen \"%s\": %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporten \"%s\" tillåts inte"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync stöds inte längre"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9124,7 +9336,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9151,11 +9363,11 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Avbryter."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
@@ -9430,16 +9642,16 @@
"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
"kollisionsgrupp finns i arbetskatalogen:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Uppdaterar indexflaggor"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "förväntade \"flush\" efter \"fetch\"-argument"
@@ -9476,7 +9688,7 @@
msgid "Fetching objects"
msgstr "Hämtar objekt"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
@@ -9572,17 +9784,27 @@
msgid "gitdir file points to non-existent location"
msgstr "gitdir-filen pekar på en ickeexisterande plats"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "kunde inte lagra miljövariabeln \"%s\""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
@@ -10124,25 +10346,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "kunde inte sända IPC-kommando"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "kunde inte läsa IPC-svar"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "kunde inte ta status \"accept_thread\" \"%s\""
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "kunde inte starta \"worker[0]\" för \"%s\""
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -10151,131 +10373,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "kan inte utföra chmod %cx \"%s\""
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Kunde inte öppna \"%s\" för skrivning."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:343
+#: builtin/add.c:351
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:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\""
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "bakända för \"git stash -p\""
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10306,12 +10527,12 @@
"\n"
"Se \"git help submodule\" för ytterligare information."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10321,51 +10542,51 @@
"Slå av detta meddelande med\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run är inkompatibelt med --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file är inkompatibelt med --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:522
+#: builtin/add.c:547
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:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x"
+msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul kräver --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10375,109 +10596,109 @@
"Slå av detta meddelande genom att köra\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:814
+#: builtin/am.c:815
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:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, 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:1127
+#: builtin/am.c:1128
#, 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:1128
+#: builtin/am.c:1129
#, 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:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Patchen är tom."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "saknad \"author\"-rad i incheckningen %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
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:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10485,25 +10706,25 @@
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -10511,35 +10732,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
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:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Använd \"git am --show-current-patch=diff\" för att se patchen som "
@@ -10567,17 +10788,17 @@
"lösta.\n"
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10585,159 +10806,159 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Felaktigt värde för --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
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:2290
+#: builtin/am.c:2292
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:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "sänd det genom git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "återställ originalgrenen och avbryt patchningen"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "avbryt patchningen men behåll HEAD där det är"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "visa patchen som tillämpas"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10745,16 +10966,16 @@
"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:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, 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:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10763,11 +10984,11 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "interaktivt läge kräver patchar på kommandoraden"
@@ -10775,45 +10996,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "kunde inte skapa arkivfilen \"%s\""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "kunde inte omdirigera utdata"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Fjärr utan URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: förväntade en tömning (flush)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<incheckning>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10852,46 +11063,59 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <kommando>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "kan inte kopiera filen \"%s\" i läget \"%s\""
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "kunde inte skriva till filen \"%s\""
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "kan inte öppna filen \"%s\" för läsning"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "\"%s\" är inte en giltig term"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kan inte ändra betydelsen av termen \"%s\""
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "termerna måste vara olika"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Vi utför ingen bisect för tillfället.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "\"%s\" är inte en giltig incheckning"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10899,27 +11123,27 @@
"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
"<incheckning>\"."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Felaktigt argument till bisect_write: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "kan inte läsa oid för referensen \"%s\""
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "kunde inte öppna filen \"%s\""
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10928,7 +11152,7 @@
"Du måste ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10939,7 +11163,7 @@
"Du måste sedan ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "utför bisect med endast en %s incheckning"
@@ -10948,15 +11172,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "inga termer angivna"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10965,7 +11189,7 @@
"Aktuella termer är %s för det gamla tillståndet\n"
"och %s för det nya tillståndet.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10974,54 +11198,54 @@
"ogiltigt argument %s för \"git bisect terms\".\n"
"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "misslyckades starta revisionstraversering\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "kunde inte öppna \"%s\" för tillägg"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "\"\" är inte en giltig term"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "okänd flagga: %s"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "\"%s\" verkar inte vara en giltig revision"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "felaktigt HEAD - Jag behöver ett HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
# cogito-relaterat
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "felaktigt HEAD - konstig symbolisk referens"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "ogiltig referens: \"%s\""
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Du måste starta med \"git bisect start\"\n"
@@ -11029,104 +11253,151 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
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]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Anropa \"--bisect-state\" med minst ett argument."
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "\"git bisect %s\" kan bara ta ett argument."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Felaktig rev-indata: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Felaktig rev-indata (ej incheckning): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "\"%s\"?? vad menar du?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "kan inte läsa filen \"%s\" för återuppspelning"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect-körning misslyckades: inget kommando gavs."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "kör %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"\"bisect\"-körningen misslyckades: felkod %d från \"%s\" är < 0 eller >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "kan inte öppna \"%s\" för skrivning"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "\"bisect\"-körningen kan inte fortsätta längre"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "\"bisect\"-körningen lyckades"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect hittade första trasiga incheckning"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" "
+"avslutades med felkoden %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "återställ bisect-tillstånd"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "se efter om termer för rätt och fel finns"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "skriv ut termer för bisect"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "påbörja bisect-körningen"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "hitta nästa incheckning i bisect"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "markera tillståndet för en eller flera referenser"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "lista \"bisect\"-stegen som utförts så långt"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "spela upp \"bisect\"-processen från angiven fil"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "hoppa över ett par incheckningar"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualisera \"bisect\"-körningen"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "ingen logg för BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check kräver 2 eller 3 argument"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms kräver noll eller ett argument"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next kräver 0 argument"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log kräver 0 argument"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "ingen loggfil angiven"
@@ -11138,150 +11409,152 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "förväntade en färg: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "måste sluta med en färg"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "ogiltigt värde för blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "kan inte hitta revision %s att ignorera"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "visa statistik över arbetskostnad"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
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:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
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:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "ignorera ändringar i blanksteg"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "incheckning"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "ignorera <incheckning> vid klandringen"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "ignorera incheckningar från <fil>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "färglägg redundant metadata från tidigare rader annorlunda"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "färglägg rader efter ålder"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
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:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "intervall"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
@@ -11293,18 +11566,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Klandra rader"
@@ -11405,75 +11678,75 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "kunde inte slå upp HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pekar utenför refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
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:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, 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:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11484,211 +11757,211 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
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:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "ta bort uppströmsinformationen"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:650
-msgid "Specific git-branch actions:"
-msgstr "Specifika git-branch åtgärder:"
-
#: builtin/branch.c:651
+msgid "Specific git-branch actions:"
+msgstr "Specifika git-branch-åtgärder:"
+
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "visa namn på aktuell gren"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, 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:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
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:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11696,7 +11969,7 @@
"Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
"Menade du att använda: -a|-r --list <mönster>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11704,32 +11977,32 @@
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to istället."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git version:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() misslyckades med felet \"%s\" (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "kompilatorinfo:"
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc-info:"
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "körs inte från ett git-arkiv - inga krokar att visa\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11765,38 +12038,33 @@
"Se över resten av felrapporten nedan.\n"
"Du kan ta bort rader du inte vill dela.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "ange mål för buggrapporteringsfilen"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "ange ett filändelse i strftime-format"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Systeminfo"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Aktiverade krokar"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "kunde inte skapa filen på \"%s\""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "kunde inte skriva till %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Skapade ny rapport på \"%s\"\n"
@@ -11817,53 +12085,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fil> [<refnamn>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "ange formatversion för paket (bundle)."
+msgstr "ange formatversion för bunten."
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
+msgstr "Behöver ett arkiv för att skapa en bunt."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
-msgstr "visa inte paketdetaljer"
+msgstr "visa inte buntdetaljer"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
-msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
+msgstr "Behöver ett arkiv för att packa upp en bunt."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "var pratsam; måste skrivas före ett underkommando"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Packar upp objektbunt"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11871,7 +12139,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11879,72 +12147,72 @@
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "endast en buntflagga kan anges"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör filter på objektets innehåll"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "ordna inte --batch-all-objects output"
@@ -11964,7 +12232,7 @@
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
@@ -11972,8 +12240,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -12031,11 +12299,10 @@
msgstr "git checkout--worker [<flaggor>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "sträng"
@@ -12186,11 +12453,11 @@
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12199,50 +12466,50 @@
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12265,7 +12532,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12292,19 +12559,19 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
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:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12313,7 +12580,7 @@
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12333,51 +12600,51 @@
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
"checkout.defaultRemote=origin i din konfiguration."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "endast en referens förväntades"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "förväntade gren, fick taggen \"%s\""
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "förväntade gren, fick \"%s\""
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "förväntade gren, fick incheckningen \"%s\""
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12385,7 +12652,7 @@
"kan inte växla gren vid sammanslagning\n"
"Överväg \"git merge --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12393,7 +12660,7 @@
"kan inte växla gren mitt i en \"am\"-körning\n"
"Överväg \"git am --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12401,7 +12668,7 @@
"kan inte växla gren vid ombasering\n"
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12409,7 +12676,7 @@
"kan inte växla gren i en \"cherry-pick\"\n"
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12417,139 +12684,139 @@
"kan inte växla gren i en \"revert\"\n"
"Överväg \"git revert --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "då växlar grenar medan du gör en \"bisect\""
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "\"%s\" kan inte ta <startpunkt>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
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:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
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:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p och --overlay är ömsesidigt uteslutande"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "grennamn saknas; försök med -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "kunde inte upplösa %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, 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:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file är inkompatibelt med --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file är inkompatibelt med --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12557,71 +12824,71 @@
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "du måste ange katalog(er) att återställa"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "använd överläggsläge (standard)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "skapa och växla till en ny gren"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "skapa/nollställ och växla till en gren"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "kasta bort lokala ändringar"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "vilken träd-igt att checka ut från"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "återställ indexet"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "återställ arbetskatalogen (förval)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "ignorera ej sammanslagna poster"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "använd överläggsläge"
@@ -12762,8 +13029,8 @@
msgstr "ta bort hela kataloger"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
@@ -12852,19 +13119,20 @@
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "namn"
@@ -12880,8 +13148,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "djup"
@@ -12889,8 +13157,8 @@
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "tid"
@@ -12899,16 +13167,16 @@
msgstr "skapa en grund klon från en angiven tidpunkt"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
@@ -12937,23 +13205,23 @@
msgstr "ställ in konfiguration i det nya arkivet"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "serverspecifik"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
@@ -12966,50 +13234,42 @@
msgid "initialize sparse-checkout file to include only files at root"
msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Kunde inte gissa katalognamn.\n"
-"Ange en katalog på kommandoraden"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "misslyckades iterera över \"%s\""
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13019,151 +13279,151 @@
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka med \"git restore --source=HEAD :/\"\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "misslyckades initiera sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
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:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, 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:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "fjärrtransport rapporterade fel"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -13199,13 +13459,13 @@
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13215,94 +13475,92 @@
"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "kat"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "objektkatalogen där grafen ska lagras"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "okänt argument för --split, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "oväntat icke-hexadecimalt objekt-ID: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "ogiltigt objekt: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "starta traversering vid alla referenser"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "sök paketindex listade på standard in efter incheckningar"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "börja gå genom incheckningar listade på standard in"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "ta med alla incheckningar redan i filen commit-graph"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "aktivera beräkning av ändrade sökvägar"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "tillåt skriva en inkrementell incheckningsgraffil"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "låt tid endast gå ut för filer äldre än givet datum och tid"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Hämtar incheckningar från indata"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "okänt underkommando: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13316,70 +13574,65 @@
msgid "duplicate parent %s ignored"
msgstr "duplicerad förälder %s ignorerades"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: misslyckades öppna \"%s\""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: misslyckades läsa \"%s\""
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: misslyckades stänga \"%s\""
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "förälder"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "id på ett förälderincheckningsobjekt"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "läs incheckningsloggmeddelande från fil"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "måste ange exakt ett träd"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: misslyckades läsa"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13389,7 +13642,7 @@
"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:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13403,15 +13656,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Använd annars \"git rebase --skip\"\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Använd annars \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13433,73 +13686,73 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file med -a ger ingen mening"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
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:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
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:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "kan inte utföra en delvis incheckning under en ombasering."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13507,43 +13760,43 @@
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "kan inte kombinera -m med --fixup:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13552,7 +13805,7 @@
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"%c\" kommer ignoreras.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13562,7 +13815,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13571,7 +13824,7 @@
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13582,7 +13835,7 @@
"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:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13596,7 +13849,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"och försöker igen.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13610,73 +13863,73 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"och försöker igen.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "kan inte sända släprader till --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -13684,101 +13937,101 @@
"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
"interactive/--all/--include/--only"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
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:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
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:1266
+#: builtin/commit.c:1265
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:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Du är i mitten av en ombasering -- kan inte utöka."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
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:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
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:1310
+#: builtin/commit.c:1309
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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "okänd flagga: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "version"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13786,11 +14039,11 @@
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "när"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13798,194 +14051,194 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]incheckning"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa/omformulera angiven "
"incheckning"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
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:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "släprad"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "använd skräddarsydd(a) släprad(er)"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "lägg till Signed-off-by-släprad"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14350,7 +14603,7 @@
msgstr ""
"\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas"
@@ -14551,7 +14804,7 @@
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
@@ -14576,113 +14829,113 @@
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "misslyckades: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "misslyckades: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
-"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
+"låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "sändes till \"diff\""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool kräver en arbetskatalog eller --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff är inkompatibelt med --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
@@ -14690,7 +14943,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "typ"
@@ -14722,95 +14975,95 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "symbolen för --anonymize-map kan inte vara tom"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "dumpa märken till filen"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "importera märken från filen"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "importera märken från filen, om den finns"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "från:till"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "konvertera <från> till <till> i anonymiserad utdata"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "märk taggar med märke-id"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map utan --anonymize ger ingen mening"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
@@ -14868,15 +15121,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kan inte vara negativt"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "ställ in uppström för git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
@@ -14884,7 +15137,7 @@
msgid "use atomic transaction to update references"
msgstr "använd atomiska transaktioner för att uppdatera referenser"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
@@ -14896,7 +15149,7 @@
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
@@ -14914,7 +15167,7 @@
"modifiera referensspecifikationen så att alla referenser hamnar i refs/"
"prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
@@ -14923,7 +15176,7 @@
msgstr ""
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
@@ -14935,7 +15188,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
@@ -14943,16 +15196,16 @@
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
@@ -14968,19 +15221,19 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
@@ -14992,7 +15245,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "kör \"maintenance --auto\" efter hämtning"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
@@ -15008,62 +15261,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15074,7 +15327,7 @@
"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
"\"git config fetch.showForcedUpdates true\"."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15087,22 +15340,22 @@
"showForcedUpdates\n"
"false\" för att undvika testet.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, 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:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15111,56 +15364,61 @@
"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:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, 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:1403
+#: builtin/fetch.c:1417
#, 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:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objektet %s finns inte"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15168,22 +15426,22 @@
"hittade ingen källgren.\n"
"du måste ange exakt en gren med flaggan --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15191,56 +15449,56 @@
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar ska hämtas från."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "måste ange fjärr när --negotiate-only anges"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Protokollet stöder inte --negotiate-only, avslutar."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15248,11 +15506,11 @@
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic kan bara användas vid hämtning från en fjärr"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"
@@ -15320,7 +15578,7 @@
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "använd formatfärger"
@@ -15478,131 +15736,141 @@
msgid "notice: No default references"
msgstr "obs: Inga förvalda referenser"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objektet trasigt eller saknas: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objektet har okänd typ \"%s\": %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objektet kunde inte tolkas: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "ogiltig sha1-fil: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Kontrollerar objektkatalog"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Kontrollerar %s-länk"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pekar på något konstigt (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: frånkopplat HEAD pekar på ingenting"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "obs: %s pekar på en ofödd gren (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Kontrollerar cacheträd"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: ogiltig sha1-pekare i cacheträd"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "icke-träd i cacheträd"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och supplerande objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: objekt saknas"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
@@ -15626,7 +15894,7 @@
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
@@ -15635,13 +15903,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\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"
+"och ta bort %s\n"
"Automatisk städning kommer inte utföras förrän filen tas bort.\n"
"\n"
"%s"
@@ -15721,150 +15989,190 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "okänt argument för --schedule, %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "kunde inte skriva incheckningsgraf"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "kunde inte förhämta fjärrar"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "kunde inte starta \"git pack-objects\"-process"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "kunde inte avsluta \"git pack-objects\"-process"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "kunde inte skriva multi-pack-index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "\"git multi-pack-index expire\" misslyckades"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "\"git multi-pack-index repack\" misslyckades"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
"inaktiverat"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "uppgiften \"%s\" misslyckades"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "\"%s\" är inte en giltig uppgift"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "kör uppgifter baserad på arkivets tillstånd"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "frekvens"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "kör uppgifter baserat på frekvens"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "rapportera inte framgång eller annan information över standard fel"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "uppgift"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "utför en specifik uppgift"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "använd som mest en av --auto och --schedule=<frekvens>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "misslyckades köra \"git config\""
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "misslyckades expandera sökvägen \"%s\""
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "misslyckades starta launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "misslyckades skapa kataloger för \"%s\""
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "misslyckades starta tjänsten %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "misslyckades skapa temporär xml-fil"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "misslyckades starta schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\""
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "misslyckades öppna standard in för \"crontab\""
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "\"crontab\" dog"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "misslyckades starta systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "misslyckades att köra systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "misslyckades ta bort \"%s\""
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "okänt argument för --scheduler, \"%s\""
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "varken systemd-timer eller crontab är tillgänglig"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s-schemaläggare är inte tillgänglig"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "en annan process schemalägger bakgrundsunderhåll"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<schemaläggare>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "schemaläggare"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "misslyckades lägga till arkiv till global konfiguration"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <underkommando> [<flaggor>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "felaktigt underkommando: %s"
@@ -15873,12 +16181,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -15887,262 +16195,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "träffa endast mönster vid ordgränser"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
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:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
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:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
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:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked stöds inte med --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached och --untracked kan inte användas med --no-index"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked kan inte användas med --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
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:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16150,96 +16458,108 @@
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "visa alla tillgängliga kommandon"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "uteslut vägledningar"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "lista användbara vägledningar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "visa namn på alla konfigurationsvariabler"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "visa manualsida"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "visa manual i webbläsare"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "visa info-sida"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "visa kommandobeskrivning"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "lista användbara vägledningar"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "visa namn på alla konfigurationsvariabler"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: \"%s\""
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16248,7 +16568,7 @@
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16257,331 +16577,322 @@
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "felaktig alias.%s-sträng: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "flaggan tar inte några andra argument"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "\"git help config\" för mer information"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "kan inte öppna paketfilen \"%s\""
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "fsck-fel i packat objekt"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "kan inte ta skriva %s-fil \"%s\""
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "kan inte stänga skriven %s-fil \"%s\""
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "kan inte spara paketfil"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "kan inte spara indexfil"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "okänd hashningsalgoritm \"%s\""
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format kan inte användas med --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "fsck-fel i packat objekt"
@@ -17214,129 +17525,133 @@
"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/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "sökvägar avdelas med NUL-tecken"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "exkludera mönster som läses från <fil>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "läs exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "visa felsökningsutdata"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "undertyck dublettposter"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<arkiv> [<referenser>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<arkiv> [<referenser>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "exec"
@@ -17453,7 +17768,7 @@
msgid "use headers in message's body"
msgstr "använd huvuden i brevkroppen"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "tom mbox: \"%s\""
@@ -17569,143 +17884,143 @@
msgid "Merging %s with %s\n"
msgstr "Slår ihop %s med %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort men lämna index och arbetskatalog ensamma"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Redan à jour. (inget att platta till)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
@@ -17720,33 +18035,33 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Felaktig flagga för merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "okänd strategiflagga: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17757,11 +18072,11 @@
"temagren.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17770,73 +18085,73 @@
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit tar inga argument"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17844,7 +18159,7 @@
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17852,88 +18167,84 @@
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
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:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "Du kan inte kombinera --squash med --commit."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
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:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
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:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "Kan inte snabbspola, avbryter."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -17968,15 +18279,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\""
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "taggen på stdin pekar inte på ett giltigt objekt"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
@@ -17997,34 +18308,50 @@
msgstr "tillåt skapa mer än ett träd"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>] [--refs-"
+"snapshot=<sökväg>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<flaggor>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<flaggor>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "föredraget paket"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "paket att återanvända vid beräkning av multipaketsbitkarta"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "skriv flerpaketsbitkarta"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "skriv flerpaketsindex som endast innehåller angivna index"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18032,11 +18359,6 @@
"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
"storlek"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "okänt underkommando: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<flaggor>] <källa>... <mål>"
@@ -18064,72 +18386,72 @@
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "i konflikt"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -18308,47 +18630,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "ange innehåll för anteckningen med antingen -m eller -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "kunde inte läsa objektet \"%s\"."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "felaktig indatarad: \"%s\"."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
@@ -18356,48 +18678,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "för många argument"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18406,29 +18728,29 @@
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "för få argument"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18437,12 +18759,12 @@
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18451,52 +18773,52 @@
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18504,48 +18826,48 @@
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18556,41 +18878,41 @@
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
@@ -18641,82 +18963,86 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "misslyckade skriva bitkarteindex"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "deltabasoffset utanför gränsen i pack för %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "deltabasoffset utanför gränsvärden för %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "kunde inte tolka objekthuvud för %s"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "objektet %s kunde inte läsas"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Deltakomprimering använder upp till %d trådar"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "kan inte packa objekt nåbara från taggen %s"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18725,24 +19051,25 @@
"värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> "
"<paket-hash> <uri>' (fick '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
"objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "kunde inte hämta typ för objektet %s i paketet %s"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "kunde inte hitta paketet \"%s\""
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18751,7 +19078,7 @@
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18760,248 +19087,249 @@
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "lösa objekt på %s kunde inte underökas"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från supplerande objektlager"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till dem som ännu inte packats"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "läs paket från standard in"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som ska packas"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "använd gles-nåbarhetsalgoritmen"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "skriv bitkartindex om möjligt"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protokoll"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
+msgstr ""
+"--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "kan inte använda --filter med --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "kan inte använda intern revisionslista med --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19056,7 +19384,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
@@ -19069,44 +19397,48 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "utför automatiskt stash/stash pop före och efter"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19114,14 +19446,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19129,7 +19461,7 @@
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19140,41 +19472,41 @@
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19183,20 +19515,20 @@
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19208,9 +19540,9 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Det avråds från att göra \"pull\" utan att ange hur avvikande grenar\n"
-"ska förlikas. Du kan ta bort det här meddelandet genom att köra ett av\n"
-"följande kommandon innan du gör \"pull\" nästa gång: \n"
+"Du har avvikande grenar och måste ange hur de skall förlikas.\n"
+"Du kan göra detta genom att köra ett av följande kommando innan du\n"
+"gör \"pull\" nästa gång: \n"
"\n"
" git config pull.rebase false # sammanslagning (förvald strategi)\n"
" git config pull.rebase true # ombasering\n"
@@ -19221,19 +19553,19 @@
"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
"förvalet vid körning.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19244,7 +19576,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19261,15 +19593,23 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kan inte snabbspola till flera grenar."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Måste ange hur avvikande grenar skall förlikas."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -19445,15 +19785,15 @@
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "spegla alla referenser"
@@ -19465,19 +19805,19 @@
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:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<refnamn>:<förvänta>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
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:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "kräv att fjärruppdateringar har integrerats lokalt"
@@ -19485,12 +19825,12 @@
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "program för att ta emot paket"
@@ -19510,11 +19850,11 @@
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
@@ -19625,82 +19965,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-"
+"igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "undertryck återkopplingsmeddelanden"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Du måste lösa ditt befintliga index först"
@@ -19722,193 +20062,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "oanvändbar todo-lista: %s"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "kunde inte skapa temporär %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "kunde inte markera som interaktiv"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "Kunde inte skapa attgöra-lista"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "en basincheckning måste anges med --upstream eller --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<flaggor>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behåller incheckningar som är tomma från början"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "ombasera sammanslagningar"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "flytta incheckningar som inleds med squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signera incheckningar"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "vis diffstat för vad som ändrats uppströms"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "fortsätt ombasering"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "hoppa över incheckning"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "redigera attgöra-listan"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "visa nuvarande patch"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "förkorta inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "utöka inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kontrollera todo-listan"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "ordna om fixup-/squash-rader"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "lägg in exec-kommandon i todo-listan"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ovanpå"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "begränsa revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tryck ihop ovanpå"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "uppströmsincheckningen"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "namn på huvud"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "sammanslagningsstrategi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strategiflaggor"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "gren eller inchecking att checka ut"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "på-namn"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "kmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "kommando att köra"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s kräver \"merge\"-bakändan"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "kunde inte hämta \"onto\": \"%s\""
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "ogiltigt orig-head: \"%s\""
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19922,7 +20113,7 @@
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19941,7 +20132,7 @@
"\n"
"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19949,7 +20140,7 @@
msgstr ""
"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19966,7 +20157,7 @@
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19979,182 +20170,192 @@
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "exec-kommandon kan inte innehålla nyradstecken"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "tomt exec-kommando"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "ombasera mot given grenen istället för uppström"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "vis diffstat för vad som ändrats uppströms"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "sätt incheckningsdatum till författardatum"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "ignorera författardatum och använd nuvarande"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "synonym för --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "ignorera ändringar i blanksteg"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "avbryt men behåll HEAD där det är"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "visa patchen som tillämpas eller slås samman"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "använd appliceringstrategier för ombasering"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för ombasering"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "låt användaren redigera listan över incheckningar att ombasera"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "hur incheckningar som blir tomma ska hanteras"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "behåller incheckningar som är tomma från början"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "applicera alla ändringar, även de som redan finns uppströms"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges har ersatts av --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20162,16 +20363,16 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20192,143 +20393,132 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Okänd rebase-bakända: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
-"\""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Pekar inte på en giltig incheckning: \"%s\""
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
+msgid "no such branch/commit '%s'"
+msgstr "ingen sådan gren/incheckning: \"%s\""
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Kunde inte bestämma HEAD:s incheckning"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "kunde inte växla till %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktuell gren %s är à jour.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Snabbspolade %s till %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20358,7 +20548,7 @@
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20379,11 +20569,11 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@ -20424,7 +20614,7 @@
msgid "%s points nowhere!"
msgstr "%s pekar ingenstans!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "ingen referenslogg att ta bort angavs"
@@ -20579,7 +20769,7 @@
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:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
@@ -20589,25 +20779,30 @@
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ohanterad branch.%s.rebase=%s; antar \"true\""
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(träffande)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "kunde inte ställa in \"%s\""
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20618,17 +20813,17 @@
"\t%s:%d\n"
"anger nu den icke-existerande fjärren \"%s\""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Ingen sådan fjärr: \"%s\""
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20639,17 +20834,17 @@
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20663,118 +20858,118 @@
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, 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:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(ingen URL)"
@@ -20782,184 +20977,188 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, 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:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
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:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
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:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "var pratsam; måste skrivas före ett underkommando"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20968,140 +21167,153 @@
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "kunde inte öppna indexet för %s"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "paketet %s för stort för att tas med i geometriskt förlopp"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "paketet %s för stort att rulla upp"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "kunde inte öppna temporär fil %s för skrivning"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "hitta ett geometrisk förlopp med faktor <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "skriv ett flerpaketsindex för de skapade paketen"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric är inkompatibel med -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "nödvändig fil saknas: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "kunde inte ta bort: \"%s\""
@@ -21411,92 +21623,92 @@
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta trädet för HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta trädet för %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21510,12 +21722,12 @@
"konfigurationsvariabeln\n"
"reset.quiet till true för att göra detta till förval.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
@@ -21696,15 +21908,19 @@
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -21752,70 +21968,70 @@
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> "
-"[<ref>...]\n"
-" --all och explicit angiven <ref> är ömsesidigt uteslutande."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<värd>:]<katalog> (--all | <ref>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
@@ -21829,7 +22045,7 @@
#: builtin/shortlog.c:123
msgid "using multiple --group options with stdin is not supported"
-msgstr "mer än en --group flagga stöds inte med standard in"
+msgstr "mer än en \"--group\"-flagga stöds inte med standard in"
#: builtin/shortlog.c:133
msgid "using --group=trailer with stdin is not supported"
@@ -21872,21 +22088,21 @@
msgid "group by field"
msgstr "gruppera efter fält"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "för många flaggor givna utanför arkivet"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
+" [--current] [--color[=<när>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21899,115 +22115,115 @@
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "inga motsvarande referenser med %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
"base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "--reflog behöver ett namn på en gren"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "maximalt %d poster kan visas samtidigt."
msgstr[1] "maximalt %d poster kan visas samtidigt."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
@@ -22077,70 +22293,84 @@
msgstr ""
"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
+"\"sparse-checkout\""
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "misslyckades ta bort katalogen \"%s\""
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "initiera sparse-checkout i konläge"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "slå på/av använding av glest index"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "misslyckades ändra inställning för sparse-index"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "kunde inte normalisera sökvägen \"%s\""
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "kan inte ta bort citering av C-sträng \"%s\""
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "läs mönster från standard in"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "fel vid uppdatering av arbetskatalog"
@@ -22176,7 +22406,7 @@
" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
" [--] [<sökväg>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22206,6 +22436,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
" [--] [<sökväg>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<meddelande>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22229,7 +22467,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "\"git stash clear\" med argument har inte implementerats"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22240,166 +22478,166 @@
" %s -> %s\n"
" för att lämna plats.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "kunde inte skapa diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "konflikter i indexet. Testa utan --index."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "kunde inte spara indexträd"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "kunde inte återställa ospårade filer från stash-post"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Slår ihop %s med %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits upp ur \"stash\":en"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "kunde inte återställa ospårade filer från stash-post"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "försök återskapa indexet"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Kastade %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Kunde inte kasta \"stash\"-post"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "\"%s\" är inte en \"stash\"-referens"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "misslyckades tolka träd"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "misslyckades packa upp träd"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "visa bara ospårade filer i \"stash\""
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Glömde du använda \"git add\"?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Sparade arbetskatalogen och indexstatus %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "ta med ignorerade filer"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22423,7 +22661,7 @@
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
@@ -22437,27 +22675,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
+"officiella uppström."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Går in i \"%s\"\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22466,7 +22712,7 @@
"run_command returnerade icke-nollstatus för %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22477,76 +22723,67 @@
"undermoduler för %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "dölj utdata från för varje undermodulskommando som startas"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
-"officiella uppström."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, 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:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22554,98 +22791,98 @@
"visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "kunde inte hasha objekt från \"%s\""
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "okänt läge %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "jämför incheckningen i indexet med den i undermodulens HEAD"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\""
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "begränsa översiktsstorleken"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "kunde inte hämta en version för HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached och --files är ömsesidigt uteslutande"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "dölj utdata från synkronisering av undermodul-url"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22654,7 +22891,7 @@
"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
"\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22663,46 +22900,46 @@
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "kunde inte skapa tom undermodulskatalog %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22714,67 +22951,67 @@
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
"med \"--reference-if-able\" istället för \"--reference\"."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "katalogen inte tom: \"%s\""
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen ska klonas till"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "förhindra kloning till icke-tom katalog"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22784,83 +23021,178 @@
"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
"path <sökväg>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
+"hämtning av incheckningen misslyckades."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen ska följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "tvinga utcheckningsuppdateringar"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "hämta inte nya objekt från fjärrplatsen"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "överstyr uppdateringsläge om arkviet är en färsk klon"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "djup för grund hämtning"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 förväntades av överprojekt{"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 för undermodulens \"HEAD\""
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22869,102 +23201,102 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
+msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "se om det är säkert att skriva till .gitmodules-filen"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "ta bort konfigurationen från .gitmodules-filen"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <namn> [<värde>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <namn>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "se till att .gitmodules finns i arbetskatalogen"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "dölj utdata från inställning av url för undermodul"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "välj master som förvald spårad gren"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "välj förvald spårad gren"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch eller --default krävs"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch och --default är ömsesidigt uteslutande"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Om du vill återanvända den lokala git-katalogen istället för att klona på "
"nytt från\n"
@@ -22972,40 +23304,87 @@
"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
"korrekt\n"
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
-"flaggan \"--name\".\n"
+"flaggan \"--name\"."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "Kan inte checka ut undermodulen \"%s\""
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "gren från arkivet att checka ut vid kloning"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Misslyckades lägga till undermodulen \"%s\""
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Misslyckades registrera undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "\"%s\" finns redan i indexet"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "\"%s\" finns redan i indexet och är inte en undermodul"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "gren från arkivet att lägga till som undermodul"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<flaggor>...] --url <url> --path <sökväg> "
-"--name <namn>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "visa endast felmeddelanden"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "låna objekt från referensarkiv"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"sätter undermodulens namn till den angivna strängen istället för att använda "
+"sökvägen"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]"
+
+#: builtin/submodule--helper.c:3297
+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å"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "\"%s\" är inte ett giltigt namn på undermodul"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -23031,21 +23410,21 @@
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "skäl till uppdateringen"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
-"\t\t<taggnamn> [<huvud>]"
+" <taggnamn> [<huvud>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23055,13 +23434,13 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
"<incheckning>] [--points-at <objekt>]\n"
-"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] "
-"[<mönster>...]"
+" [--format=<format>] [--merged <incheckning>] [--no-merged "
+"<incheckning>] [<mönster>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23126,130 +23505,130 @@
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -23263,198 +23642,193 @@
msgid "failed to create directory %s"
msgstr "misslyckades skapa katalogen %s"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "misslyckades skapa filen %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "misslyckades ta bort katalogen %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testar mtime i \"%s\" "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"stat-informationen för en katalog ändras när filer läggs till i en "
"underkatalog"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "rör inte \"endast index\"-poster"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "skriv ut indexet även om det inte angivits som ändrat"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "aktivera eller inaktivera filsystemsövervakning"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "markera filer som \"fsmonitor valid\""
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "töm \"fsmonitor valid\"-bit"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23462,7 +23836,7 @@
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
"vill aktivera delat index"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23470,7 +23844,7 @@
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
"vill inaktivera delat index"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23478,11 +23852,11 @@
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23490,26 +23864,26 @@
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor aktiverat"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor inaktiverat"
@@ -23525,19 +23899,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
@@ -23553,19 +23927,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "presentera info/referenser för git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
@@ -23601,63 +23975,58 @@
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "misslyckades ta bort \"%s\""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Tar bort %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "oanvändbar mål för arbetskatalog \"%s\""
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23667,7 +24036,7 @@
"använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
"\"remove\" för att rensa"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23677,141 +24046,141 @@
"använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att "
"rensa"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "initierar"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
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:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason kräver --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "lagt till med --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "visa utökade annoteringar och grunder, om tillgängliga"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
"lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23820,7 +24189,7 @@
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23828,38 +24197,38 @@
"kan inte flytta en låst arbetskatalog;\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta "
"bort det"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23868,7 +24237,7 @@
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23876,17 +24245,17 @@
"kan inte ta bort en låst arbetskatalog;\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "reparera: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "fel: %s: %s"
@@ -24014,17 +24383,17 @@
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24033,13 +24402,13 @@
"användning: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "misslyckades köra kommandot \"%s\": %s\n"
@@ -24087,66 +24456,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "uttag/rör används redan: \"%s\""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "kunde inte starta server på: \"%s\""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "kunde inte starta serverprocess i bakgrunden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "\"waitpid\" misslyckades"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "serverprocessen ännu inte operativ"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "serverprocessen kunde inte startas"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid är förvirrad"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "serverprocessen har ännu inte avslutats"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<namn>] [<flaggor>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<namn>] [<trådar>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<namn>] [<max-väntetid>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<namn>] [<igenkänningstecken>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<namn>] [<antal-byte>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24154,83 +24489,79 @@
"test-helper simple-ipc multiple [<namn>] [<trådar>] [<antal-byte>] "
"[<buntstorlek>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "namn eller sövkäg till unixdomän-uttag"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "namn på namngivet rör"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "antal trådar i serverns trådpool"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "sekunder att vänta på att serverprocessen startar eller stoppar"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "antal byte"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "antal frågor per tråd"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ballasttecken"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "igenkänningstecken"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "igenkänningstecken för kommando att sända till servern"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer har negativt värde; använder förvalet %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24246,45 +24577,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "felaktig citering på värde för push-option: \"%s\""
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "ogiltigt svar från servern; fick \"%s\""
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "arkivet \"%s\" hittades inte"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autentisering misslyckades \"%s\""
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "borde inte ha EOF när inte försiktig på EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
@@ -24292,83 +24628,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: felaktig radlängdstecken: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: oväntat svarsavslutningspaketet"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC misslyckades; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "kan inte hantera så stora sändningar"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "kan inte packa upp anrop; zlib-slutfel %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "%d byte av längd-huvudet togs emot"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "%d byte av kroppen väntas fortfarande"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "dum http-transport stöder inte grunda arkiv"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "mottagning misslyckades."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "kan inte hämta med sha1 över smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http-transporten stöder inte %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push misslyckades"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: fel vid läsning av kommandoström från git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
@@ -24389,44 +24725,44 @@
msgid "object filtering"
msgstr "objektfiltrering"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "använd <n> siffror för att visa objektnamn"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "läs sökvägsangivelse från fil"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "nyckel"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
@@ -25112,41 +25448,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect-körning misslyckades: inget kommando gavs."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "kör $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"felkod $res från \"$command\" är < 0 eller >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"\"bisect-state $state\" avslutades med felkoden $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "\"bisect\"-körningen lyckades"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25187,51 +25488,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-submodule.sh:179
-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:189
-#, 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:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "\"$sm_path\" finns redan i indexet"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, 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:542
+#: git-submodule.sh:411
#, 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:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25240,396 +25507,11 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
-"direkt:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
-"Direkt hämtning av incheckningen misslyckades."
-
-#: git-submodule.sh:578
-#, 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:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-
-#: git-submodule.sh:589
-#, 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:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Tillämpade autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kan inte spara $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Tillämpning av autostash gav konflikter.\n"
-"Dina ändringar är säkra i stashen.\n"
-"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Ombaserar ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Kommandon:\n"
-"p, pick <incheckning> = använd incheckning\n"
-"r, reword <incheckning> = använd incheckning, men redigera "
-"incheckningsmeddelandet\n"
-"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
-"s, squash <incheckning> = använd incheckning, men infoga i föregående "
-"incheckning\n"
-"f, fixup <incheckning> = som \"squash\", men förkasta "
-"incheckningsmeddelandet\n"
-"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
-"d, drop <incheckning> = ta bort incheckning\n"
-"l, label <etikett> = ge aktuellt HEAD ett namn\n"
-"t, reset <etikett> = återställ HEAD till en etikett\n"
-"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
-". skapa en sammanslagning med ursprungligt meddelande (eller\n"
-". enrads, om inget incheckningsmeddelande angavs). Använd\n"
-". -v <incheckning> för att skriva om meddelandet.\n"
-"\n"
-"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Du kan utöka incheckningen nu, med\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"När du är nöjd med dina ändringar kör du\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: inte en incheckning som kan väljas"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Felaktigt incheckningsnamn: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Snabbspolade till $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kan inte snabbspola till $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kan inte flytta HEAD till $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Kunde inte välja $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Det här är incheckningsmeddelande ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Det här är en kombination av $count incheckning."
-msgstr[1] "Det här är en kombination av $count incheckningar."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kan inte skriva $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Det här är en kombination av 2 incheckningar."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Kunde inte tillämpa $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
-"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
-"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
-"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Stoppade på $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Kör: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Körning misslyckades: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Du kan rätta problemet och sedan köra\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Körningen lyckades: $rest\n"
-"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
-"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Okänt kommando: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Rätta det med \"git rebase --edit-todo\"."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Lyckades ombasera och uppdatera $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Du har köade ändringar i din arbetskatalog.\n"
-"Om det är meningen att ändringarna\n"
-"ska läggas in i föregående incheckning, kör:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Om de ska checkas in i en egen incheckning, kör:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Oavsett vilket, när du är färdig fortsätter du med:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
-"först och kör sedan \"git rebase --continue\" igen."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Kunde inte checka in köade ändringar."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Kunde inte starta textredigerare"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Kunde inte checka ut $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Inget HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Kunde inte skapa temporär $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Kunde inte markera som interaktiv"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
-msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Observera att tomma incheckningar är utkommenterade"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Kunde inte initiera omskrivna incheckningar"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25646,47 +25528,29 @@
msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Kan inte ombasera: Du har oköade ändringar."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Kan inte $action: Du har oköade ändringar."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
@@ -26321,7 +26185,7 @@
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
@@ -26346,30 +26210,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26380,12 +26244,12 @@
"%s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26394,7 +26258,7 @@
"ödesdigert: %s:%d är längre än 998 tecken\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
@@ -26402,11 +26266,528 @@
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
+#~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s"
+
+#~ msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
+#~ msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#~ msgid "unable to rename temporary '*.%s' file to '%s"
+#~ msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
+#~ "motsvarar\n"
+#~ "indexposter utanför den nuvarande glesa utcheckningen:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
+#~ "poster."
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "kunde inte ställa in GIT_DIR till \"%s\""
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "misslyckades öppna /dev/null"
+
+#~ 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 ""
+#~ "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
+#~ "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
+#~ "och checka in resultatet med \"git commit\""
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "försöker använda glest index utan \"cone\"-läge"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning."
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "kunde inte skapa arkivfilen \"%s\""
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> "
+#~ "<eterm>"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check kräver 2 eller 3 argument"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "kunde inte skapa filen på \"%s\""
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: misslyckades öppna \"%s\""
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "kan inte öppna paketfilen \"%s\""
+
+#~ msgid "cannot store pack file"
+#~ msgstr "kan inte spara paketfil"
+
+#~ msgid "cannot store index file"
+#~ msgstr "kan inte spara indexfil"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "exkludera mönster som läses från <fil>"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "oanvändbar todo-lista: %s"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<flaggor>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "ombasera sammanslagningar"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "flytta incheckningar som inleds med squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "signera incheckningar"
+
+#~ msgid "continue rebase"
+#~ msgstr "fortsätt ombasering"
+
+#~ msgid "skip commit"
+#~ msgstr "hoppa över incheckning"
+
+#~ msgid "edit the todo list"
+#~ msgstr "redigera attgöra-listan"
+
+#~ msgid "show the current patch"
+#~ msgstr "visa nuvarande patch"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "förkorta inchecknings-id i todo-listan"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "utöka inchecknings-id i todo-listan"
+
+#~ msgid "check the todo list"
+#~ msgstr "kontrollera todo-listan"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "ordna om fixup-/squash-rader"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "lägg in exec-kommandon i todo-listan"
+
+#~ msgid "onto"
+#~ msgstr "ovanpå"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "begränsa revision"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "tryck ihop ovanpå"
+
+#~ msgid "the upstream commit"
+#~ msgstr "uppströmsincheckningen"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "namn på huvud"
+
+#~ msgid "rebase strategy"
+#~ msgstr "sammanslagningsstrategi"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "strategiflaggor"
+
+#~ msgid "switch-to"
+#~ msgstr "switch-to"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gren eller inchecking att checka ut"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "på-namn"
+
+#~ msgid "cmd"
+#~ msgstr "kmd"
+
+#~ msgid "the command to run"
+#~ msgstr "kommando att köra"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-"
+#~ "exec\""
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<flaggor>...] --url <url> --path "
+#~ "<sökväg> --name <namn>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "misslyckades skapa filen %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "uttag/rör används redan: \"%s\""
+
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "kunde inte starta server på: \"%s\""
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "kunde inte starta serverprocess i bakgrunden"
+
+#~ msgid "waitpid failed"
+#~ msgstr "\"waitpid\" misslyckades"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "serverprocessen ännu inte operativ"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "serverprocessen kunde inte startas"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid är förvirrad"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "serverprocessen har ännu inte avslutats"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "kör $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
+
+#~ msgid "Applied autostash."
+#~ msgstr "Tillämpade autostash."
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Kan inte spara $stash_sha1"
+
+#~ 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 ""
+#~ "Tillämpning av autostash gav konflikter.\n"
+#~ "Dina ändringar är säkra i stashen.\n"
+#~ "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Ombaserar ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kommandon:\n"
+#~ "p, pick <incheckning> = använd incheckning\n"
+#~ "r, reword <incheckning> = använd incheckning, men redigera "
+#~ "incheckningsmeddelandet\n"
+#~ "e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
+#~ "s, squash <incheckning> = använd incheckning, men infoga i föregående "
+#~ "incheckning\n"
+#~ "f, fixup <incheckning> = som \"squash\", men förkasta "
+#~ "incheckningsmeddelandet\n"
+#~ "x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
+#~ "d, drop <incheckning> = ta bort incheckning\n"
+#~ "l, label <etikett> = ge aktuellt HEAD ett namn\n"
+#~ "t, reset <etikett> = återställ HEAD till en etikett\n"
+#~ "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
+#~ ". skapa en sammanslagning med ursprungligt meddelande (eller\n"
+#~ ". enrads, om inget incheckningsmeddelande angavs). Använd\n"
+#~ ". -v <incheckning> för att skriva om meddelandet.\n"
+#~ "\n"
+#~ "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
+
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Du kan utöka incheckningen nu, med\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "När du är nöjd med dina ändringar kör du\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: inte en incheckning som kan väljas"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Felaktigt incheckningsnamn: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Snabbspolade till $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Kan inte snabbspola till $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Kan inte flytta HEAD till $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Fel när sammanslagningen $sha1 skulle göras om"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Kunde inte välja $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Det här är incheckningsmeddelande ${n}:"
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Det här är en kombination av $count incheckning."
+#~ msgstr[1] "Det här är en kombination av $count incheckningar."
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Kan inte skriva $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Det här är en kombination av 2 incheckningar."
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Kunde inte tillämpa $sha1... $rest"
+
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
+#~ "Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
+#~ "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
+#~ "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Stoppade på $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "Kör: $rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Körning misslyckades: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Du kan rätta problemet och sedan köra\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Körningen lyckades: $rest\n"
+#~ "men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
+#~ "Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Okänt kommando: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Rätta det med \"git rebase --edit-todo\"."
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Lyckades ombasera och uppdatera $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
+
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Du har köade ändringar i din arbetskatalog.\n"
+#~ "Om det är meningen att ändringarna\n"
+#~ "ska läggas in i föregående incheckning, kör:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Om de ska checkas in i en egen incheckning, kör:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Oavsett vilket, när du är färdig fortsätter du med:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Fel vid försök att hitta författaridentitet för att utöka incheckning"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
+#~ "först och kör sedan \"git rebase --continue\" igen."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Kunde inte checka in köade ändringar."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Kunde inte starta textredigerare"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Kunde inte checka ut $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Inget HEAD?"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Kunde inte skapa temporär $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Kunde inte markera som interaktiv"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
+#~ msgstr[1] ""
+#~ "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Observera att tomma incheckningar är utkommenterade"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Kunde inte initiera omskrivna incheckningar"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Kan inte ombasera: Du har oköade ändringar."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte hämta med ombasering: Ditt index innehåller oincheckade "
+#~ "ändringar."
+
#~ msgid "unable to write stateless separator packet"
#~ msgstr "kan inte skriva tillståndslöst avdelarpaket"
@@ -27362,9 +27743,6 @@
#~ msgid "Failed to recurse into submodule path '$sm_path'"
#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) tar inte argument"
-
#~ msgid ""
#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
#~ msgstr ""
@@ -27693,9 +28071,6 @@
#~ msgid "Can't cherry-pick into empty head"
#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
-#~ msgid "could not open %s for writing"
-#~ msgstr "kunde inte öppna %s för skrivning"
-
#~ msgid "bug: unhandled unmerged status %x"
#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
@@ -27870,9 +28245,6 @@
#~ msgid "branch '%s' does not point at a commit"
#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
-#~ 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"
diff --git a/po/tr.po b/po/tr.po
index 84b8be3..0687090 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -90,8 +90,8 @@
msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-03 18:00+0300\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-10 18:00+0300\n"
"Last-Translator: Emir SARI <emir_sari@msn.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
@@ -100,213 +100,213 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Pardon (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "indeks okunamadı"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "ikili"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "hiçbir şey"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "değiştirilmemiş"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Güncelle"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "'%s' hazırlanamadı"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "indeks yazılamadı"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d yol güncellendi\n"
msgstr[1] "%d yol güncellendi\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "not: %s artık izlenmiyor.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "'%s' yolu için make_cache_entry başarısız oldu"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Geri al"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "HEAD^{tree} ayrıştırılamadı"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d yol geri alındı\n"
msgstr[1] "%d yol geri alındı\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "İzlenmeyen dosya yok.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "İzlenmeyenleri ekle"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d yol eklendi\n"
msgstr[1] "%d yol eklendi\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "birleştirilmeyenler yok sayılıyor: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Değişiklik yok.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Yama güncellemesi"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "diff'i gözden geçir"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "değiştirilmiş yolları göster"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "hazırlanan değişikliklere çalışma ağacı durumunu ekle"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "hazırlanan değişiklikleri HEAD sürümüne geri al"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "parçaları seç ve seçerek güncelle"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "HEAD ve indeks arasındaki diff'i gör"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "izlenmeyen dosyaların içeriğini hazırlanan değişikliklere ekle"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "İstem yardımı:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "tek bir öge seç"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "bir öge erimi seç"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "birden çok erim seç"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "benzersiz öneke dayanarak öge seç"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "belirtilen ögelerin seçimini kaldır"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "tüm ögeleri seç"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(boş) seçimi bitir"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "numaralandırılmış bir öge seç"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(boş) hiçbir şey seçme"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Komutlar ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Şimdi ne olacak"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "hazırlanmış"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "hazırlanmamış"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "yol"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "indeks yenilenemedi"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Güle güle.\n"
@@ -821,7 +821,7 @@
msgid "'git apply' failed"
msgstr "'git apply' başarısız oldu"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -830,37 +830,37 @@
"\n"
"Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sipucu: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Seç-al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:270
+#: advice.c:196
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."
@@ -868,40 +868,49 @@
"Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n"
"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra işleyin."
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Aşağıdaki yol belirteçleri uygun bir yolla eşleşmediler; ancak geçerli\n"
-"aralıklı çıkışın dışındaki girdilerle eşleşiyorlar:\n"
+"Aşağıdaki yollar ve/veya yol belirteçleri, aralıklı çıkış\n"
+"tanımınızın dışında kalan yollarla eşleştiğinden dolayı\n"
+"indeksinizde güncellenmeyecek:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını devre "
-"dışı bırakın veya değiştirin."
+"Eğer böyle girdileri güncellemek istiyorsanız, aşağıdakilerden\n"
+"birini deneyin:\n"
+"* --sparse seçeneğini kullanın.\n"
+"* Aralıklandırma kurallarını devre dışı bırakın veya değiştirin."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -966,7 +975,7 @@
#: apply.c:139
msgid "--3way outside a repository"
-msgstr "-3way bir depo dışında"
+msgstr "--3way bir depo dışında"
#: apply.c:150
msgid "--index outside a repository"
@@ -1080,50 +1089,50 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "hasarlı ikili yama, %d. satır: %.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "tanımlanamayan ikili yama, %d. satır"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "yalnızca anlamsız veri içeren yama, %d. satır"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "%s sembolik bağı okunamıyor"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "%s açılamıyor veya okunamıyor"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "geçersiz satır başlangıcı: '%c'"
-#: apply.c:3056
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Parça #%d başarılı oldu, %d (%d satır ofset)."
msgstr[1] "Parça #%d başarılı oldu, %d (%d satır ofset)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Bağlam şuna indirildi: (%ld/%ld) (%d konumundaki parçacığı uygulamak için)"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1132,439 +1141,440 @@
"şunu ararken:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s' için ikili yama verisi eksik"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "'%s' parçası geri alınmadan bir ikili yama reverse-apply yapılamıyor"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "tam indeks satırı olmadan '%s' üzerine bir ikili yama uygulanamıyor"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "Bu yama geçerli içerik ile eşleşmeyen '%s' üzerine uygulanır (%s)."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "yama boş bir '%s' üzerine uygulanır; ancak o boş değil"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "gereken songörüntü %s ('%s' için) okunamıyor"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "ikili yama '%s' üzerine uygulanamıyor"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s' üzerine ikili yama yanlış sonuç doğuruyor (%s bekleniyordu, %s alındı)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "yama başarısız oldu: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "%s çıkışı yapılamıyor"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "%s okunamadı"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s yolu yeniden adlandırıldı/silindi"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: indekste bulunmuyor"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: indeks ile eşleşmiyor"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "Depo, 3 yönlü birleştirme için gereken ikili nesneye iye değil."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "kaldırma yaması dosya içeriğini bırakır"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: yanlış tür"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s, %o türüne iye, %o bekleniyordu"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "geçersiz yol '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: indekste halihazırda var"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: çalışma dizininde halihazırda var"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor "
-#: apply.c:3981
+#: apply.c:4003
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: yama uygulanamıyor"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "%s yaması denetleniyor..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "geçerli HEAD'de olmayan %s için kip değişimi"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 bilgisi eksik veya yararsız (%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "%s geçici indekse eklenemedi"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "geçici indeks şuraya yazılamadı: %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "%s indeksten kaldırılamıyor"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "%s altmodülü için hasarlı yama"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s için önbellek girdisi eklenemiyor"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "'%s' dosyası kapatılıyor"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' dosyası yazılamıyor, %o kipi"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s yaması sorunsuzca uygulandı."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "iç hata"
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..."
msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Parça #%d sorunsuzca uygulandı."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Parça %d geri çevrildi."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "'%s' yaması atlandı."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "tanımlanamayan girdi"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "indeks dosyası okunamıyor"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' yaması açılamıyor: %s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d boşluk hatası susturuldu"
msgstr[1] "%d boşluk hatası susturuldu"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d satır boşluk hatası ekliyor."
msgstr[1] "%d satır boşluk hatası ekliyor."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "Yeni indeks dosyası yazılamıyor"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygulama"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygula"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "sayı"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "yamanın yaptığı eklemeleri yok say"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "eklenen ve silinen satırların sayısını onluk birimde göster"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "çalışma ağacına dokunmadan bir yama uygula"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "yollar NUL karakteri ile ayrılır"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "en az <n> bağlam satırının eşleştiğinden emin ol"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "eylem"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "bağlam bulurken boşluk değişikliklerini yok say"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "yamayı tersten uygula"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "en az bir satır bağlam bekleme"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "üst üste binen parçalara izin ver"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "ayrıntı ver"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "parça üstbilgisindeki satır sayımına güvenme"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "kök"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "tüm dosya adlarının başına <kök> ekle"
@@ -1635,152 +1645,151 @@
msgid "cannot read %s"
msgstr "%s okunamıyor"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "'%s' okunamadı"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "böyle bir başvuru yok: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "geçerli bir nesne adı değil: %s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "bir ağaç nesnesi değil: %s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "geçerli çalışma dizini izlenmiyor"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Dosya bulunamadı: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Normal bir dosya değil: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "biçim"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "arşiv biçimi"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "önek"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "dosya"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "izlenmeyen dosyaları arşive ekle"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "arşivi bu dosyaya yaz"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "çalışma dizinindeki .gitattributes'u oku"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "arşivlenmiş dosyaları stderr'de raporla"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "sıkıştırma düzeyini ayarla"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "desteklenen arşiv biçimlerini listele"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "depo"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "arşivi uzak konum deposu <depo>'dan al"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "komut"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "uzak konum komutu git-upload-archive'e olan yol"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Beklenmedik seçenek --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Beklenmedik seçenek --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Bilinmeyen arşiv biçimi '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "'%s' biçimi için desteklenmeyen argüman: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s geçerli bir öznitelik adı değil"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s izin verilmiyor: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1788,22 +1797,22 @@
"Negatif dizgiler git özniteliklerinde yok sayılır.\n"
"Gerçek öncü ünlem için '\\!' kullanın."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Daha fazla ikili arama yapılamıyor!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Geçerli bir işleme adı değil: %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1812,7 +1821,7 @@
"Birleştirme temeli %s hatalı.\n"
"Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1821,7 +1830,7 @@
"Birleştirme temeli %s yeni.\n"
"Özellik %s ve [%s] arasında değişmiş.\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1830,7 +1839,7 @@
"Birleştirme temeli %s, %s.\n"
"Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1841,7 +1850,7 @@
"git bisect bu durumda düzgünce çalışamaz.\n"
"%s ve %s revizyonlarını birbirine mi karıştırdınız?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1852,36 +1861,36 @@
"%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
"Yine de sürdüreceğiz."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "bir %s revizyonu gerekiyor"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' dosyası oluşturulamadı"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' dosyası okunamadı"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "ikili arama başvurularını okuma başarısız oldu"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s hem %s hem %s idi\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1890,7 +1899,7 @@
"Sınanabilir bir işleme bulunamadı.\n"
"Hatalı yol argümanları ile mi başladınız?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1900,7 +1909,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1921,11 +1930,12 @@
"--reverse ve --first-parent birlikte en son işlemenin belirtilmesini "
"gerektiriyor"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "revizyonda gezinme ayarlaması başarısız oldu"
@@ -2109,8 +2119,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "'%s' açılamadı"
@@ -2168,7 +2178,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "tanımlanamayan argüman: %s"
@@ -2210,7 +2220,7 @@
msgid "invalid color value: %.*s"
msgstr "geçersiz renk değeri: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "geçersiz sağlama sürümü"
@@ -2255,190 +2265,190 @@
msgid "unable to find all commit-graph files"
msgstr "tüm commit-graph dosyaları bulunamıyor"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "geçersiz işleme konumu. commit-graph büyük olasılıkla hasar görmüş."
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "%s işlemesi bulunamadı"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "%s işlemesi ayrıştırılamıyor"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "%s nesnesinin türü alınamıyor"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr ""
"Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Başvurulmuş işlemeler toplanıyor"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "%d pakette işleme grafiği için işlemeler bulunuyor"
msgstr[1] "%d pakette işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "%s paketi eklenirken hata"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "%s için indeks açılırken hata"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "temel grafiği numaralarının doğru sayısı yazılamadı"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "%s öncü dizinleri oluşturulamıyor"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "geçici grafik katmanı oluşturulamıyor"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "İşleme grafiği %d geçişte yazılıyor"
msgstr[1] "İşleme grafiği %d geçişte yazılıyor"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "commit-graph zincir dosyası açılamıyor"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Birleştirilen işlemeler taranıyor"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "commit-graph birleştiriliyor"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "grafik yazımı için çok fazla işleme"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar "
"görmüş"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s için olan commit-graph üst ögesi %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2446,7 +2456,7 @@
"%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde "
"sıfırdan farklı"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2454,29 +2464,29 @@
"%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka "
"yerlerde sıfır"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "%s ayrıştırılamadı"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s bir işleme değil!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2496,28 +2506,28 @@
"\"git config advice.graftFileDeprecated false\"\n"
"kullanarak bu iletiyi kapatabilirsiniz."
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s işlemesinin bir GPG imzası yok."
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2532,7 +2542,7 @@
msgid "memory exhausted"
msgstr "bellek tükendi"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2547,35 +2557,35 @@
"\t%s\n"
"Bu dairesel içermelerden dolayı olabilir."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "içerme yolu '%s' genişletilemedi"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "geçersiz yapılandırma biçimi: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "'%.*s' yapılandırması için ortam değişkeni adı eksik"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "şu yapılandırma için '%s' ortam değişkeni eksik: '%.*s'"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "anahtar, bir bölüm içermiyor: %s"
@@ -2585,303 +2595,303 @@
msgid "key does not contain variable name: %s"
msgstr "anahtar, bir değişken adı içermiyor: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "geçersiz anahtar: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "geçersiz anahtar (yenisatır): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "boş yapılandırma anahtarı"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "düzmece yapılandırma parametresi: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "%s içinde düzmece biçim"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "%s içinde düzmece sayım"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "%s içinde çok fazla girdi"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "%s yapılandırma anahtarı eksik"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "%s yapılandırma değeri eksik"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "hatalı yapılandırma satırı %d, %s altmodül ikili nesnesi içinde"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "hatalı yapılandırma satırı %d (%s içinde)"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "erim dışı"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "geçersiz birim"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s ikili nesnesi içinde: "
"%s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s dosyası içinde: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, standart girdi içinde: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s altmodül ikili "
"nesnesi içinde: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s komut satırı içinde: "
"%s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için (%s içinde): %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "%s', '%s' için geçerli bir zaman damgası değil"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "kısaltma uzunluğu erim dışında: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "hatalı zlib sıkıştırma düzeyi %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar yalnızca bir karakter olmalı"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nesne oluşturma için geçersiz kip: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "%s için hatalı oluşturulmuş değer"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s için hatalı oluşturulmuş değer: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "%s ayrıştırılamadı"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Geçersiz %s: '%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "geçersiz bölüm adı '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s birden çok değere iye"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "yeni yapılandırma dosyası %s yazılamadı"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "%s yapılandırma dosyası kilitlenemedi"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "%s açılıyor"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "geçersiz dizgi: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "geçersiz yapılandırma dosyası %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "%s üzerinde fstat başarısız oldu"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "'%s'%s mmap yapılamıyor"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "%s üzerinde chmod başarısız oldu"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "%s yapılandırma dosyası yazılamadı"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s', '%s' olarak ayarlanamadı"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' ayarı kapatılamadı"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "geçersiz bölüm adı: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "'%s' için değer eksik"
@@ -2916,72 +2926,72 @@
msgid "expected flush after capabilities"
msgstr "yeteneklerden sonra floş bekleniyordu"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "protokol hatası: beklenmedik yetenekler^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "diğer uçtaki depo sığ olamaz"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "geçersiz paket"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokol hatası: beklenmedik '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "geçersiz ls-refs yanıtı: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "başvuru listelemesinden sonra floş bekleniyordu"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "'%s' protokolü desteklenmiyor"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "%s adresi aranıyor..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "%s aranamıyor (kapı %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2990,7 +3000,7 @@
"bitti.\n"
"%s adresine bağlanılıyor (kapı %s)..."
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -3000,77 +3010,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "bitti."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "%s aranamıyor (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "bilinmeyen kapı %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "garip makine adı '%s' engellendi"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "garip kapı '%s' engellendi"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "vekil %s başlatılamıyor"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "garip yol adı '%s' engellendi"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "çatallanamıyor"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Bağlantı denetleniyor"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list' çalıştırılamadı"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "rev-list yazılamadı"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "rev-list'in stdin'i kapatılamadı"
@@ -3214,17 +3224,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url, kendisinin %s bileşeninde bir yenisatır içeriyor: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "url'nin şeması yok: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "yetki url'si ayrıştırılamıyor: %s"
@@ -3328,23 +3338,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "--diff-merges için bilinmeyen değer: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base erimlerle çalışmaz"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base yalnızca işlemelerle çalışır"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "HEAD alınamıyor"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "bir birleştirme temeli bulunamadı"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "birden çok birleştirme temeli bulundu"
@@ -3360,17 +3370,17 @@
"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
"için --no-index kullanın."
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Bilinmeyen dirstat parametresi '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3378,7 +3388,7 @@
"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
"'plain' seçeneklerinden biri olmalıdır"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3387,7 +3397,7 @@
"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3395,12 +3405,12 @@
"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
"kullanılamaz"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3409,27 +3419,27 @@
"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "dış diff sonlandı, %s konumunda durdu"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S ve --find-object birlikte kullanılmaz"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile "
"kullanın"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3437,22 +3447,22 @@
"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -"
"S ile kullanın"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "geçersiz --stat değeri: %s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s bir sayısal değer bekliyor"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3461,42 +3471,42 @@
"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "'%s' çözülemiyor"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s <n>/<m> biçimi bekliyor"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s bir karakter bekliyor, '%s' aldı"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "hatalı --color-moved argümanı: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws içinde geçersiz kip '%s'"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3504,162 +3514,162 @@
"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
"\"patience\" ve \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "%s için geçersiz argüman"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "hatalı --word-diff argümanı: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Diff çıktısı biçimlendirme seçenekleri"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "yama oluştur"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "diff çıktısını gizle"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "diff'leri <n> satır bağlamlı oluştur"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "diff'i ham biçimde oluştur"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "'-p --raw eşanlamlısı"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "'-p --stat eşanlamlısı"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "makinede okunabilen --stat"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "--stat'ın yalnızca son satırını çıktı ver"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "--dirstat=cumulative eşanlamlısı"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "diffstat oluştur"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<genişlik>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<sayım>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "diffstat içinde ufak özet oluştur"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "uygulanabilir bir ikili diff çıktısı ver"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "renkli diff göster"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<çeşit>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3667,88 +3677,88 @@
"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
"sonlandırıcıları olarak NUL'ları kullan"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<önek>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "çıktının her satırının başına ek bir önek ekle"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "hiçbir kaynak ve hedef önekini gösterme"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Diff yeniden adlandırma seçenekleri"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "yeniden adlandırmaları algıla"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "silmeler için öngörüntüyü atla"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "kopyaları algıla"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr ""
"bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3756,234 +3766,234 @@
"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
"yeniden adlandırma/kopyalama algılamasını önle"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Diff algoritma seçenekleri"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "olabilecek en küçük diff'i üret"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "satırları karşılaştırırken boşlukları yok say"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "boşluk sayısındaki değişiklikleri yok say"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "satır sonundaki boşluk değişikliklerini yok say"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "satır sonundaki satırbaşı karakterini yok say"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "satırlarının tümü boş olan değişiklikleri yok say"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<ifade>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "bir diff algoritması seç"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<metin>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<kip>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak "
"göster"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "taşınan kod satırları farklı renklendirilir"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Diğer diff seçenekleri"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve "
"göreceli yolları göster"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "tüm dosyaları metin olarak varsay"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "tüm program çıktısını devre dışı bırak"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<ne-zaman>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<biçim>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "indeksten 'git add -N' girdilerini gizle"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<dizi>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<yol>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "öncelikle belirtilen yoldaki değişikliği göster"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "belirtilen yola olan çıktıyı atla"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<nesne-no>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "dosyaları diff türüne göre seç"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<dosya>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "belirli bir dosyaya çıktı ver"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr ""
"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
"dolayı atlandı."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar "
"bulundu."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3996,7 +4006,7 @@
msgid "failed to read orderfile '%s'"
msgstr "orderfile '%s' okunamadı"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
@@ -4034,337 +4044,418 @@
msgid "cannot use %s as an exclude file"
msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "'%s' dizini açılamadı"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "çekirdek adı ve bilgisi alınamadı"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Bir dizin adı tahmin edilemedi.\n"
+"Lütfen komut satırında bir dizin belirtin."
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "%s deposundaki indeks dosyası hasarlı"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "%s için dizinler oluşturulamadı"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "İçerik süzülüyor"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "hatalı git ad alanı yolu \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR şuna ayarlanamadı: '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "%s çalıştırmak için çok fazla argüman"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "uzak konuma yazılamıyor"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "geçersiz sığ satır: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "geçersiz sığ olmayan satır: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "nesne bulunamadı: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "nesne içinde hata: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "sığ bulunamadı: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s alındı"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "geçersiz işleme %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "vazgeçiliyor"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "bitti"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s alındı"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "%s tamam olarak imleniyor"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "%s halihazırda var (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "protokol hatası: hatalı paket üstbilgisi"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s ayrı çatallanamıyor"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: geçersiz index-pack çıktısı"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s başarısız oldu"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "yanbant çoğullama çözücüsünde hata"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Sunucu sürümü %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Sunucu %s destekliyor"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Sunucu sığ istemcileri desteklemiyor"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Sunucu --shallow-since desteklemiyor"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Sunucu --shallow-exclude desteklemiyor"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Sunucu --deepen desteklemiyor"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "ortak işleme yok"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "kaynak depo sığ, klonlama için reddet"
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: getirme başarısız"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "eşleşmeyen algoritmalar: istemci %s; sunucu %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "sunucu '%s' algoritmasını desteklemiyor"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Sunucu sığ istekleri desteklemiyor"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Sunucu süzgeç destekliyor"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "uzak konuma istek yazılamıyor"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "bölüm üstbilgisi '%s' okunurken hata"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "beklenmedik alındı satırı: '%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "alındılar işlenirken hata: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "sığ bilgi işlenirken hata: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "beklenmedik wanted-ref: '%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "aranan başvurular işlenirken hata: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "eşleşen uzak dal ucu yok"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "uzak konum gereken tüm nesneleri göndermedi"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "uzak konumdan beklenmedik 'ready'"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "böyle bir uzak başvuru yok: %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "geçici dosya oluşturulamadı"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "şuna ayrık imza yazılamadı: '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile'ın ssh imza doğrulaması için yapılandırılması ve "
+"var olması gerekiyor"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify, ssh imza doğrulaması için gerekli "
+"(openssh 8.21p1+ sürümünde mevcut)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "ssh imza geri alım dosyası yapılandırıldı; ancak bulunamadı: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "hatalı/uyumsuz imza '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "'%s' anahtarı için ssh parmak izi alınamadı"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"ya user.signingkey ya da gpg.ssh.defaultKeyCommand'in yapılandırılması "
+"gerekiyor"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand başarılı oldu; ancak herhangi bir anahtar "
+"döndürmedi: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg veriyi imzalayamadı"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey'in ssh imzalaması için ayarlanması gerekiyor"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde "
+"mevcut)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4372,110 +4463,110 @@
"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
"PCRE v2 altında -P ile desteklenir"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s okunamıyor"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s': kısa okuma"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "bir çalışma alanı başlatın (ayrıca bkz: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "güncel değişiklikler üzerinde çalışın (ayrıca bkz: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr ""
"geçmişi ve geçerli durumu gözden geçirin (ayrıca bkz: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Ana Komutlar"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Yan Komutlar / Yönlendiriciler"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Yan Komutlar / Sorgucular"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Başkaları ile Etkileşim"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Düşük Düzeyli Komutlar / Sorgucular"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "'%s' içindeki kullanılabilir git komutları"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "En çok kullanılan temel Git komutlarının bir listesi aşağıdadır:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "desteklenmeyen komut listeleme türü '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Git konsept kılavuzları şunlardır:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Belirli bir altkomut üzerine okumak için 'git help <komut>' kullanın"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Dış komutlar"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Komut armaları"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4484,32 +4575,37 @@
"'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
"çalıştıramadık. git-%s bozuk olabilir mi?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' bir git komutu değil. Yardım için: 'git --help'."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"UYARI: '%s' adında bir Git komutunu çağırdınız; ancak böyle bir komut yok."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Bunun yerine '%s' çalıştır? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "%0.1f saniye içinde sürdürülüyor, '%s' demek istediğiniz varsayılacak."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4523,16 +4619,16 @@
"\n"
"Buna en yakın komutlar:"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<seçenekler>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4546,6 +4642,15 @@
"\n"
"Şunlardan birini mi demek istediniz?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
+"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Yazar kimliği bilinmiyor\n"
@@ -4609,7 +4714,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "geçersiz tarih biçimi: %s"
@@ -4705,7 +4810,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "lsrefs.unborn için '%s' geçersiz değeri"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "beklenmedik satır: '%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
@@ -4713,37 +4823,37 @@
msgid "quoted CRLF detected"
msgstr "alıntılanmış CRLF algılandı"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "hatalı eylem '%s', '%s' için"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "'%s' altmodülünü birleştirilemedi"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4752,7 +4862,7 @@
"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4768,7 +4878,7 @@
"\n"
"komutu bu öneriyi kabul edecektir.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4778,21 +4888,21 @@
"mevcut:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "İç birleştirme çalıştırılamadı"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "%s veritabanına eklenemedi"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "%s kendiliğinden birleştiriliyor"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4802,7 +4912,7 @@
"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
"%s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4812,7 +4922,7 @@
"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
"koymayı denedi: %s."
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4823,7 +4933,7 @@
"adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan "
"birden çok başka dizine yeniden adlandırılmıştı."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4832,7 +4942,7 @@
"UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, "
"çünkü %s ögesinin kendisi yeniden adlandırıldı."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4841,7 +4951,7 @@
"Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir "
"dizinde; onu %s konumuna taşıdı."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4850,7 +4960,7 @@
"Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde "
"yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4859,7 +4969,7 @@
"ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden "
"adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4868,14 +4978,14 @@
"ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s "
"içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve "
"ek olarak %s olarak da adlandırıldı (%s içinde)."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4886,24 +4996,24 @@
"içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
"çakışmaimleyicilerine neden olabilir."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); "
"ancak %s içinde silindi."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "%s nesnesi okunamıyor"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "%s nesnesi ikili bir nesne değil"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4912,7 +5022,7 @@
"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
"konumuna taşınıyor."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4922,7 +5032,7 @@
"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
"yazılabilir."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4932,24 +5042,24 @@
"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
"kayıtları yazılabilir."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "içerik"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "ekle/ekle"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "altmodül"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4958,7 +5068,7 @@
"ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s "
"sürümü (şunun: %s) ağaçta bırakıldı."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4970,12 +5080,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4985,107 +5095,107 @@
"yazılacak:\n"
"\t%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Tümü güncel."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(hatalı işleme)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "'%s'%s yolu oluşturulamadı"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Altdizine yer açmak için %s kaldırılıyor\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": bir D/F çakışması olabilir mi?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "%s '%s' nesnesi okunamıyor"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' için ikili nesne bekleniyordu"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "'%s' açılamadı: %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "%s altmodülü şu işlemeye ileri sarılıyor:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "%s altmodülü ileri sarılıyor"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine "
"%s konumuna yazılacak."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5094,7 +5204,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
"ağaçta bırakıldı."
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5103,7 +5213,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
"(%s) sürümü ağaçta bırakıldı."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5112,7 +5222,7 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
"ağaçta %s konumunda bırakıldı."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5121,45 +5231,45 @@
"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
"(%s) sürümü ağaçta %s konumunda bırakıldı."
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "yeniden adlandır"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "yeniden adlandırıldı"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s "
"eklendi (%s içinde)."
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s "
"olarak ekleniyor"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5168,18 +5278,18 @@
"ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" "
"dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (çözülmeden bırakıldı)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->"
"%s olarak adlandır (%s içinde)"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5190,7 +5300,7 @@
"yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden "
"adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5199,80 +5309,80 @@
"ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s "
"içinde). Dizini %s->%s olarak adlandır (%s içinde)."
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "değiştir"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "değiştirilmiş"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Bunun yerine %s olarak ekleniyor"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "%s kaldırılıyor"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "dosya/dizin"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "dizin/dosya"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor."
-#: merge-recursive.c:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "%s ekleniyor"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Birleştiriliyor:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ortak ata bulundu:"
msgstr[1] "%u ortak ata bulundu:"
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "birleştirme herhangi bir işleme döndürmedi"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' nesnesi ayrıştırılamadı"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "İndeks yazılamıyor."
@@ -5280,189 +5390,221 @@
msgid "failed to read the cache"
msgstr "önbellek okunamadı"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "yeni indeks dosyası yazılamıyor"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index dosyası %s pek küçük"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index sürümü %d tanımlanamıyor"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index sağlama sürümü %u, %u sürümü ile eşleşmiyor"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "hatalı pack-int-id: %u (%u toplam paket)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "paket dosyası '%s' eklenemedi"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "pack-index '%s' açılamadı"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "%d nesnesi paket dosyasında bulunamadı"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "ters indeks dosyası depolanamıyor"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "satır ayrıştırılamadı: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "hatalı oluşturulmuş satır: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "paket yüklenemedi"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "%s için indeks açılamadı"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "bırakılacak pack-file %s görülmedi"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "bilinmeyen tercih edilen paket: '%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "bırakılacak pack-file %s görülmedi"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "tercih edilen '%s' paketinin süresi geçmiş"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "indekslenecek paket dosyası yok."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "çoklu paket biteşlem yazılamadı"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "%s kaldırılamadı"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "multi-pack-index %s konumunda temizlenemedi"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "yanlış sağlama toplamı"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Başvurulmuş paket dosyaları aranıyor"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx bir oid içermiyor"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Nesneler paket dosyasına göre sıralanıyor"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Nesne ofsetleri doğrulanıyor"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "paket dosyası %s için pack-index yüklenemedi"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Başvurulmuş nesneler sayılıyor"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "pack-objects başlatılamadı"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "pack-objects bitirilemedi"
@@ -5521,258 +5663,258 @@
msgid "Bad %s value: '%s'"
msgstr "Hatalı %s değeri: '%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "nesne dizini olağanlaştırılamıyor: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "alternatifler dosyası okunamıyor"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' diye bir yol yok"
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Başvuru deposu '%s' yerel bir depo değil."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "başvuru deposu '%s' sığ"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "başvuru deposu '%s' aşılı"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap başarısız%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "nesne dosyası %s boş"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "hasar görmüş gevşek nesne '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "geçersiz nesne türü"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "%s üstbilgisi açılamıyor"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "geçersiz nesne türü"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "%s üstbilgisi açılamıyor"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "%s nesnesi okunamadı"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s yedeği %s için bulunamadı"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "%s dosyası yazılamıyor"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "'%s' ögesine izin ayarlanamıyor"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "dosya yazım hatası"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "gevşek nesne dosyası kapatılırken hata"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "geçici dosya oluşturulamıyor"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "gevşek nesne dosyası yazılamıyor"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "yeni nesne %s söndürülemiyor (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "%s üzerinde utime() başarısız"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "%s için nesne okunamıyor"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "hasar görmüş işleme"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "hasar görmüş etiket"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "%s indekslenirken okuma hatası"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "%s indekslenirken kısa read"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: veritabanına ekleme başarısız"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: desteklenmeyen dosya türü"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s geçerli bir nesne değil"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s geçerli bir '%s' nesnesi değil"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "%s açılamıyor"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "%s mmap yapılamadı"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "%s üstbilgisi açılamıyor"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "%s üstbilgisi ayrıştırılamıyor"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "%s içeriği açılamıyor"
@@ -5900,12 +6042,25 @@
msgid "hash mismatch %s"
msgstr "sağlama uyuşmazlığı %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: paket açılamadı"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "%s boyutu alınamıyor"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "%s ögesinin disk kullanımı alınamıyor"
@@ -5935,45 +6090,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "dosya bilgileri alınamadı: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "%s, yazılabilir yapılamadı"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "vaat dosyası '%s' yazılamadı"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "paket dosyası %s eşlemlenemiyor%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "'%s' seçeneği sayısal bir değer bekliyor"
@@ -5993,71 +6148,71 @@
msgid "malformed object name '%s'"
msgstr "hatalı oluşturulmuş nesne adı '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s bir değer gerektiriyor"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s, %s ile uyumsuz"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: başka bir şeyle uyumsuz"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s bir değer almıyor"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s kullanılabilir değil"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "şunun arması: --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "bilinmeyen seçenek '%s'"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "bilinmeyen anahtar '%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "kullanım: %s"
@@ -6065,47 +6220,71 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " veya: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-SAYI"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "%s grup ile yazılabilir yapılamadı"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
-msgstr "attr belirteci boş olmamalı"
+msgstr "attr belirteci boş bırakılmamalı"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "geçersiz öznitelik adı %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6113,51 +6292,51 @@
"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
"ayarlarıyla uyumsuz"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s', '%s' konumunda depo dışında"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (belleten: '%c')"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: yol belirteci sihri bu komut tarafından desteklenmiyor: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "satırda hatalı tırnaklar: %s"
@@ -6178,7 +6357,7 @@
msgid "flush packet write failed"
msgstr "floş paketi yazımı başarısız"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "protokol hatası: olanaksız uzun satır"
@@ -6186,7 +6365,7 @@
msgid "packet write with format failed"
msgstr "biçimlendirilmiş paket yazımı başarısız"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aşıyor"
@@ -6195,25 +6374,25 @@
msgid "packet write failed: %s"
msgstr "paket yazımı başarısız: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "okuma hatası"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokol hatası: hatalı satır uzunluğu %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "uzak konum hatası: %s"
@@ -6227,7 +6406,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "--pretty biçimi ayrıştırılamıyor"
@@ -6256,20 +6435,20 @@
msgid "Removing duplicate objects"
msgstr "Yinelenmiş nesneler kaldırılıyor"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "'log' başlatılamadı"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "'log' çıktısı okunamadı"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "'%s' işlemesi ayrıştırılamadı"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6277,12 +6456,12 @@
msgstr ""
"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "diff oluşturulamadı"
@@ -6310,7 +6489,7 @@
msgstr ""
"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
@@ -6330,16 +6509,16 @@
msgid "unable to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamıyor"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "İndeks yenileniyor"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6348,7 +6527,7 @@
"index.version ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6357,143 +6536,143 @@
"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "hatalı imza 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "hatalı indeks sürümü %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "hatalı indeks dosyası sha1 imzası"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "%.4s uzantısı yok sayılıyor"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "indekste sırasız hazırlama alanı girdileri"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' için sırasız hazırlama alanı girdileri"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "indeks dosyası hasar görmüş"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: indeks dosyası açılamadı"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: açık indeksin bilgileri alınamıyor"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indeks dosyası beklenenden daha küçük"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: indeks dosyası eşlemlenemiyor%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "paylaşılan indeks '%s' tazelenemedi"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "'%s' kapatılamadı"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "bir sparse-index'e dönüştürülemedi"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "'%s' bilgileri alınamadı"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "git dizini açılamıyor: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "bağlantı kesilemiyor: %s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
@@ -6570,7 +6749,7 @@
msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6579,7 +6758,7 @@
"Hiçbir satırı kaldırmayın. Bir işlemeyi kaldırmak için 'drop'u açıkça "
"kullanın.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6587,7 +6766,7 @@
"\n"
"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6602,7 +6781,7 @@
"\tgit rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6612,14 +6791,14 @@
"Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "'%s' yazılamadı"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "'%s' yazılamadı."
@@ -6650,12 +6829,10 @@
"Kullanılabilir davranışlar: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "'%s' okunamadı."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve'in yerini 'merges' aldı"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6676,258 +6853,278 @@
msgid "ahead %d, behind %d"
msgstr "%d önünde, %d arkasında"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "beklenen biçim: %%(color:<renk>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "tanımlanamayan renk: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "tanımlanamayan %%(%s) argümanı: %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) argüman almıyor"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) argüman almıyor"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) argüman almıyor"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "tanımlanamayan %%(subject) argümanı: %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "%%(trailers:key=<değer>) bekleniyordu"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "bilinmeyen %%(trailers) argümanı: %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "tanımlanamayan %%(contents) argümanı: %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "tanımlanamayan %%(raw) argüman: %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "tanımlanamayan e-posta seçeneği: %s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "tanımlanamayan konum:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "tanımlanamayan genişlik:%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "tanımlanamayan %%(align) argümanı: %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "tanımlanamayan %%(if) argümanı: %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) argüman almıyor"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "hatalı oluşturulmuş alan adı: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "bilinmeyen alan adı: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "hatalı oluşturulmuş biçim dizisi %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "bu komut atom %%(%.*s) reddediyor"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(dal yok, %s yeniden temellendiriliyor)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(dal yok, ikili arama %s üzerinde başladı)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD, %s konumunda ayrıldı)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD, %s ögesinden ayrıldı)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(dal yok)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "eksik nesne %s (%s için)"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "bozuk başvuru %s yok sayılıyor"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "biçim: %%(end) ögeciği eksik"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "hatalı oluşturulmuş nesne adı %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "'%s' bir işlemeye işaret etmeli"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s geçerli bir nesneye işaret etmiyor!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6952,82 +7149,82 @@
"\n"
"\tgit branch -m <ad>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "'%s' alınamadı"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "geçersiz dal adı: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "sarkan sembolik başvuru %s yok sayılıyor"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
"%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "%s için olan günlük boş"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' mevcut; '%s' oluşturulamıyor"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "'%s' ve '%s' aynı anda işlenemiyor"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "%s başvurusu kaldırılamadı"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s başvurusu silinemedi: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "başvurular silinemedi: %s"
@@ -7328,7 +7525,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "'%s' yazılırken hatalar vardı (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "'%s' floş yapılamadı"
@@ -7373,8 +7570,8 @@
msgid "Recorded preimage for '%s'"
msgstr "'%s' için öngörüntü kaydedildi"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
@@ -7412,46 +7609,41 @@
msgid "could not determine HEAD revision"
msgstr "HEAD revizyonu saptanamadı"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "%s ögesinin ağacı bulunamadı"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input, --no-walk ile uyumsuz"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk, --unsorted-input ile uyumsuz"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "geçerli dalınız bozuk gibi görünüyor"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok"
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "/dev/null açılamadı"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "async iş parçacığı oluşturulamadı: %s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
-"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
@@ -7470,23 +7662,23 @@
msgid "failed to sign the push certificate"
msgstr "itme sertifikası imzalanamadı"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: getirme altişlemi çatallanamıyor"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "alıcı uç --signed itmeyi desteklemiyor"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7494,47 +7686,48 @@
"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
"gönderilmiyor"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "alıcı uç --atomic itmeyi desteklemiyor"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "alıcı uç itme seçeneklerini desteklemiyor"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "'%s' silinemedi"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "'%s' kaldırılamadı"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "geri al"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "seç-al"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "yeniden temellendirme"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "bilinmeyen eylem: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7542,53 +7735,75 @@
"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
"veya 'git rm <yollar>' ile imleyin"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
-"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n"
-"'git commit' ile işleyin"
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git cherry-pick --continue\".\n"
+"Bunun yerine bu işlemeyi \"git cherry-pick --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git cherry-pick\" öncesine\n"
+"geri dönmek için \"git cherry-pick --abort\" çalıştırın."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git revert --continue\".\n"
+"Bunun yerine bu işlemeyi \"git revert --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git revert\" öncesine\n"
+"geri dönmek için \"git revert --abort\" çalıştırın."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "'%s' kilitlenemedi"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "satır sonu şuraya yazılamadı: '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "'%s' tamamlanamadı"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: ileri sar"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Geçersiz temizlik kipi %s"
@@ -7596,65 +7811,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "önbellek ağacı güncellenemiyor"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "HEAD işlemesi çözülemedi"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "'%.*s' içinde bir anahtar yok"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s' okuma için açılamadı"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "bilinmeyen değişken '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' eksik"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' eksik"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' eksik"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7684,11 +7899,11 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' başarısız oldu"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7714,7 +7929,7 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7738,343 +7953,348 @@
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "yeni yapılan işleme aranamadı"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "yeni yapılan işleme ayrıştırılamadı"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "ayrık HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (kök işleme)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "HEAD ayrıştırılamadı"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s bir işleme değil"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "HEAD işlemesi ayrıştırılamadı"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "işleme yazarı ayrıştırılamıyor"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree bir ağaca yazamadı"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "'%s' konumundan işleme iletisi okunamıyor"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "geçersiz yazar kimliği '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "hasar görmüş yazar: tarih bilgisi eksik"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "işleme nesnesi yazılamadı"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "%s güncellenemedi"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "%s işlemesi ayrıştırılamadı"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "üst işleme %s ayrıştırılamadı"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "bilinmeyen komut: %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Birinci işleme iletisi bu:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "İşleme iletisi #%d bu:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "Birinci işlemenin iletisi atlanacak:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "İşleme iletisi #%d atlanacak:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Bu %d işlemenin bir birleşimi."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "'%s' yazılamıyor"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "düzeltmek için bir HEAD gerekiyor"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "HEAD okunamadı"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "HEAD'in işleme iletisi okunamadı"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "%s işleme iletisi okunamadı"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "indeks dosyanız birleştirilmemiş"
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "kök işleme düzeltilemiyor"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s işlemesinin %d diye bir üst ögesi yok"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "%s işlemesinin iletisi alınamıyor"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: üst işleme %s ayrıştırılamıyor"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "%s geri alınamadı... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "%s uygulanamadı... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: indeks okunamadı"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: indeks yenilenemedi"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s argüman kabul etmiyor: '%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "%s için eksik argüman"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "'%s' ayrıştırılamadı"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "geçersiz satır %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadı."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "sürmekte olan bir seç-al iptal ediliyor"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "sürmekte olan bir geri al iptal ediliyor"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "Hiçbir işleme ayrıştırılmadı."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "bir geri al sırasında seç-al yapılamıyor"
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "bir seç-al sırasında geri al yapılamıyor"
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s için geçersiz değer: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "kullanılabilir olmayan squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "boş işleme seti aktarıldı"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "geri al halihazırda sürüyor"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "seç-al halihazırda sürüyor"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "HEAD kilitlenemedi"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "süren bir seç-al veya geri al yok"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "HEAD çözülemiyor"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "daha doğmamış bir daldan iptal edilemiyor"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "'%s' açılamıyor"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s' okunamıyor: %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "beklenmedik dosya sonu"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "süren bir geri al yok"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "süren bir seç-al yok"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "işleme atlanamadı"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "atlanacak bir şey yok"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8083,16 +8303,16 @@
"İşlemeyi yaptınız mı?\n"
"\"git %s --continue\" deneyin.\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamıyor"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8111,27 +8331,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "%s uygulanamıyor... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "%.*s birleştirilemedi"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamadı"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Çalıştırılıyor: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8146,11 +8366,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8167,90 +8387,90 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "izin verilmeyen etiket adı: '%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "sahte kök işlemesi yazılıyor"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "squash-onto yazılıyor"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "'%s' çözülemedi"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "'%.*s' ayrıştırılamıyor"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "birleştirilecek bir şey yok: '%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "'%s' işlemesinin işleme iletisi alınamadı"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "merge: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Kendiliğinden zulalanamıyor"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Beklenmedik zula yanıtı: '%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "'%s' için dizin oluşturulamadı"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Zula kendiliğinden oluşturuldu: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "'reset --hard' yapılamadı"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Kendiliğinden zulalama uygulandı.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "%s depolanamıyor"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8261,29 +8481,29 @@
"Değişiklikleriniz zulada güvende.\n"
"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "HEAD'de duruldu\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "%s konumunda duruldu\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8304,58 +8524,58 @@
"\tgit rebase --edit-todo\n"
"\tgit rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "%s konumunda durdu... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "bilinmeyen komut %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "orig-head okunamadı"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "'onto' okunamadı"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "HEAD şu konuma güncellenemedi: %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "var olmayan işleme değiştirilemiyor"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "geçersiz dosya: '%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "geçersiz içerik: '%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8365,50 +8585,59 @@
"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n"
"onları işleyin ve ardından 'git rebase --continue' yapın."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "dosya yazılamadı: '%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "Hazırlanmış değişiklikler işlenemedi."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Bir %s seçip alınamıyor"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s hatalı revizyon"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "ilk işleme geri alınamaz"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "daha önce uygulanan %s işlemesi atlandı"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: ele alınmayan seçenekler"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: revizyonlar hazırlanırken hata"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "yapılacak bir şey yok"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "gerekli olmayan seçim komutları atlanamadı"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "betik halihazırda yeniden düzenlenmişti"
@@ -8566,27 +8795,15 @@
"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "/dev/null açılması veya açıklayıcı çoğaltılması başarısız"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "çatallama başarısız"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid başarısız"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
@@ -8643,13 +8860,13 @@
msgstr[0] "%u bayt/sn"
msgstr[1] "%u bayt/sn"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "'%s' yazma için açılamadı"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "'%s' düzenlenemedi"
@@ -8674,7 +8891,7 @@
msgid "invalid value for %s"
msgstr "%s için geçersiz değer"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ".gitmodules girdisi %s güncellenemedi"
@@ -8699,22 +8916,22 @@
msgid "staging updated .gitmodules failed"
msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "içi doldurulmamış '%s' altmodülünde"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "hatalı --ignore-submodules argümanı: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8723,12 +8940,12 @@
"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
"çarpışıyor. Atlanıyor."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8737,36 +8954,36 @@
"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
"çalıştırılamadı"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "'%s' altmodülü için işlem başarısız oldu"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "'%s' altmodülü itiliyor\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "'%s' altmodülü itilemiyor\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "%s%s altmodülü getiriliyor\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "'%s' altmodülüne erişilemedi\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8775,78 +8992,78 @@
"Altmodül getirilirken hata:\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' bir git deposu olarak tanımlanamadı"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "altmodül indeksi sıfırlanamadı"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "'%s' altmodülü indeksi kirli"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "'%s' altmodülü güncellenemedi."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "'%s' altmodülü adı aranamadı"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8857,11 +9074,11 @@
"şuradan: '%s'\n"
"şuraya: '%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "ls-files şurada başlatılamadı .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
@@ -8883,7 +9100,7 @@
msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "birden çok %s"
@@ -8898,11 +9115,11 @@
msgid "could not read input file '%s'"
msgstr "'%s' girdi dosyası okunamadı"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "stdin'den okunamadı"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "%s dosya bilgileri alınamadı"
@@ -8970,7 +9187,7 @@
msgid "error while running fast-import"
msgstr "fast-import çalıştırılırken hata"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "%s başvurusu okunamadı"
@@ -8988,7 +9205,7 @@
msgid "invalid remote service path"
msgstr "geçersiz uzak konum servis yolu"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "işlem protokol tarafından desteklenmiyor"
@@ -8997,7 +9214,7 @@
msgid "can't connect to subservice %s"
msgstr "%s altservisine bağlanılamıyor"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
@@ -9010,59 +9227,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "yardımcı %s beklenmedik durumu bildirdi"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "%s yardımcısı 'dry-run' desteklemiyor"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "%s yardımcısı --signed desteklemiyor"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "%s yardımcısı --atomic desteklemiyor"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "%s yardımcısı --%s desteklemiyor"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "%s yardımcısı 'push-option' desteklemiyor"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "%s yardımcısı 'force' desteklemiyor"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "fast-export çalıştırılamadı"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "fast-export çalıştırılırken hata"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9071,52 +9288,52 @@
"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
"Belki de bir dal belirtmelisiniz.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "desteklenmeyen nesne biçimi '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) başarısız oldu"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) başarısız oldu"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "%s iş parçacığı başarısız oldu"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s iş parçacığı eklenemedi: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "%s işlemi bekleyemedi"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "%s işlemi başarısız oldu"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
@@ -9130,46 +9347,46 @@
msgid "could not read bundle '%s'"
msgstr "'%s' demeti okunamadı"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: Geçersiz derinlik seçeneği '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "Sunucu, wait-for-done desteklemiyor"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "transport.color.* yapılandırması ayrıştırılamadı"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "protokol v2 desteği henüz yerine getirilmedi"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "'%s' taşıyıcısına izin verilmiyor"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync artık desteklenmiyor"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9178,7 +9395,7 @@
"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
"değişiklikler içeriyor:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9205,11 +9422,11 @@
"kullanın.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "İptal ediliyor"
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "gereken tüm altmodüller itilemedi"
@@ -9480,16 +9697,16 @@
"olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n"
"gruptan yalnızca bir tanesi çalışma ağacında:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "İndeks bayrakları güncelleniyor"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "getir argümanlarından sonra floş bekleniyordu"
@@ -9526,7 +9743,7 @@
msgid "Fetching objects"
msgstr "Nesneler getiriliyor"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "'%s' okunamadı"
@@ -9622,17 +9839,27 @@
msgid "gitdir file points to non-existent location"
msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "setenv '%s' yapılamadı"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "'%s' okuma ve yazma için açılamadı"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "'%s' erişilemiyor"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "geçerli çalışma dizini alınamıyor"
@@ -10175,25 +10402,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "IPC komutu gönderilemedi"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "IPC yanıtı okunamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "accept_thread '%s' başlatılamadı"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "'%s' için worker[0] başlatılamadı"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' bağlantısı kesilemedi"
@@ -10202,135 +10429,134 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "%cx '%s' chmod yapılamıyor"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "beklenmedik diff durumu %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "dosyaları güncelleme başarısız"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "kaldır: '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "İndeks okunamadı"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "'%s' yazım için açılamadı."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Yama yazılamadı"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "yamayı düzenleme başarısız"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s' dosya bilgileri alınamadı"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Boş yama. İptal edildi."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s' uygulanamadı"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok "
"sayılıyor:\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "sınama turu"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "etkileşimli seçim"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "parçaları etkileşimli olarak seç"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "geçerli diff'i düzenle ve uygula"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "izlenen dosyaları güncelle"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "ekleme, yalnızca indeksi yenile"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını "
"denetle"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "aralıklı çıkış konisi dışındaki girdileri güncellemeye izin ver"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "gömülü bir depo eklenirken uyar"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "'git stash -p' için arka uç"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10361,12 +10587,12 @@
"\n"
"Ek bilgi için: \"git help submodule\"."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "gömülü git deposu ekleniyor: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10376,53 +10602,53 @@
"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
"kullanarak kapatabilirsiniz."
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "dosya ekleme başarısız"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run, --interactive/--patch ile uyumsuz"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file, --edit ile uyumsuz"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A ve -u karşılıklı olarak uyumlu"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte "
"kullanılabilir"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10432,111 +10658,111 @@
"Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
"yaparak kapatabilirsiniz."
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "yazar betiği ayrıştırılamadı"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' applypatch-msg kancası tarafından silindi"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek başarısız oldu"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' yaması ayrıştırılamadı"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "geçersiz zaman damgası"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "geçersiz tarih satırı"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "geçersiz zaman dilimi ofseti"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Yama biçimi algılaması başarısız."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Yamalar parçalanıp bölünemedi."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın."
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın."
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" "
"çalıştır."
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş "
"olabilir."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Yama boş."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "%s işlemesinde yazar satırı eksik"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "geçersiz tanımlama satırı: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye "
"değil."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10544,24 +10770,24 @@
"Yamanızı elle mi düzenlediniz?\n"
"Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Değişiklikler birleştirilemedi."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "boş bir geçmişe uygulanıyor"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "sürdürülemiyor: %s yok"
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "İşleme gövdesi:"
@@ -10569,36 +10795,36 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "indeks dosyası yazılamıyor"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Uygulanıyor: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Yama şurada başarısız oldu: %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın"
@@ -10626,17 +10852,17 @@
"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
"yapabilirsiniz."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' nesnesi ayrıştırılamadı."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "indeks temizlenemedi"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10644,160 +10870,160 @@
"Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n"
"ORIG_HEAD'e geri sarılmıyor."
-#: builtin/am.c:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Geçersiz --patch-format değeri: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "--show-current-patch için geçersiz değer: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "etkileşimli olarak çalıştır"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "tarihi seçenek -- no-op"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "sessiz ol"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "işleme iletisine bir Signed-off-by satırı ekle"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "utf8 olarak yeniden kodla (öntanımlı)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "'git-mailinfo'ya -k bayrağını geçir"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "'git-mailinfo'ya -b bayrağını geçir"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "'git-mailinfo'ya -m bayrağını geçir"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "git-mailinfo içerisinden geçir"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "git-apply aracılığıyla geçir"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "biçim"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "yama biçimi"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "--continue eşanlamlıları"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "geçerli yamayı atla"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "uygulanmakta olan yamayı göster"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "işleyici tarihi hakkında yalan söyle"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "yazar tarihi için geçerli zaman damgasını kullan"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "GPG imzalı işlemeler"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(git-rebase için iç kullanım)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10805,17 +11031,17 @@
"-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n"
"yakında kaldırılacak. Lütfen artık kullanmayın."
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "indeks okunamadı"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi."
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10824,11 +11050,11 @@
"Başıboş %s dizini bulundu.\n"
"Kaldırmak için \"git am --abort\" kullanın."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
@@ -10836,45 +11062,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<seçenekler>] [<yama>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "arşiv dosyası '%s' oluşturulamadı"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "çıktı yeniden yönlendirilemedi"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: URL'si olmayan uzak konum"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK bekleniyordu, floş paketi alındı"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: Protokol hatası"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: Floş bekleniyordu"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<işleme>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <iyi_terim> <kötü_terim> [<terim>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10913,73 +11129,86 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <komut>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "'%s' dosyası '%s' kipinde açılamıyor"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "'%s' dosyasına yazılamadı"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "'%s' dosyası okuma için açılamıyor"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' geçerli bir terim değil"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "'%s' teriminin anlamı değiştirilemiyor"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "lütfen iki değişik terim kullanın"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "İkili arama yapılmıyor.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' geçerli bir işleme değil"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Hatalı bisect_write argümanı: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "'%s' revizyonunun oid'si alınamadı"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "'%s' dosyası açılamadı"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10988,7 +11217,7 @@
"Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10999,7 +11228,7 @@
"Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
@@ -11008,15 +11237,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Emin misiniz [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "hiçbir terim tanımlanmadı"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11025,7 +11254,7 @@
"Mevcut terimleriniz eski durum için %s ve\n"
"yeni durum için %s.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11034,52 +11263,52 @@
"'git bisect terms' için geçersiz argüman %s.\n"
"Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "revizyonda gezinme ayarlaması başarısız oldu\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "'%s' iliştirme için açılamadı"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' geçerli bir terim değil"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tanımlanamayan seçenek: '%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' geçerli bir revizyon değil gibi görünüyor"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "hatalı HEAD - Bana bir HEAD gerek"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "hatalı HEAD - tuhaf sembolik başvuru"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "geçersiz başvuru: '%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "\"git bisect start\" ile başlamalısınız\n"
@@ -11087,104 +11316,151 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Lütfen '--bisect-state'i en az bir argümanla çağırın"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' yalnızca bir argüman alabilir."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Hatalı revizyon girdisi: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Hatalı revizyon girdisi (bir işleme değil): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "İkili arama yapmıyoruz."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? ney ney?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "'%s' dosyası yeniden oynatım için okunamıyor"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "ikili arama başarısız: Komut verilmedi."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "%s çalıştırılıyor\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"bisect çalıştırılamadı: çıkış kodu %d, '%s' konumundan, < 0 veya >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "'%s' dosyası yazma için açılamadı"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "ikili arama artık çalışmayı sürdüremiyor"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "ikili arama başarılı"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "ikili arama ilk hatalı işlemeyi buldu"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata "
+"koduyla çıktı"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "ikili arama durumunu sıfırla"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "ikili arama terimlerini yazdır"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "ikili arama oturumunu başlat"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "bir sonraki ikili arama işlemesini bul"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "başvurunun (veya başvuruların) durumunu imle"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "şu ana kadarki ikili arama durumunu listele"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "verilen dosyadan ikili arama işlemini yeniden oynat"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "çıkış için birkaç işlemeyi atla"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "ikili aramayı görselleştir"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "kendiliğinden ikili aramak için <komut>... kullan"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE için günlük yok"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 0 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 0 argüman gerektiriyor"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "hiçbir günlük dosyası verilmedi"
@@ -11196,150 +11472,152 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-sçnk>, git-rev-list(1) içinde belgelendirilmiştir"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "bir renk bekleniyor: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "bir renk ile bitmeli"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "blame.coloring için geçersiz değer"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "yok saymak için %s revizyonu bulunamıyor"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "genel bakış girdilerini biz buldukça artan biçimde göster"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "sınır işlemeleri için nesne adlarını gösterme (Öntanımlı: Kapalı)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı)"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "iş maliyet istatistiklerini göster"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "durum belirtmeyi zorla"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "genel bakış girdileri için çıktı skorunu göster"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "makine işlemesi için tasarlanmış bir biçimde göster"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "okunabilir biçimde her satır için işleme bilgisi ile göster"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "git-annotate ile aynı çıktı kipini kullan (Öntanımlı: Kapalı)"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "boşluk ayrımlarını yok say"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "revizyon"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "suçlarken <revizyon>'u yok say"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "<dosya>'dan olan revizyonları yok say"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "satırları yaşına göre renklendir"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "daha iyi eşleşme bulmak için ek döngüler harca"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "git-rev-list çağırma yerine <dosya>'dan olan revizyonları kullan"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "<dosya>'nın içeriğini son görüntü olarak kullan"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "skor"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "satır kopyalarını dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "erim"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
"Yalnızca <başlangıç>,<bitiş> satır erimini veya :<işlevadı> işlevini işle"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
@@ -11351,18 +11629,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 yıl 11 ay önce"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "%s dosyasında yalnızca %lu satır var"
msgstr[1] "%s dosyasında yalnızca %lu satır var"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Genel bakış satırları"
@@ -11463,74 +11741,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "%s dalı silindi (%s idi).\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "biçim dizisi ayrıştırılamıyor"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "HEAD çözülemedi"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s dalı %s konumunda ikili aranıyor"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz"
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz"
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Geçersiz dal adı: '%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Dal yeniden adlandırması başarısız"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Dal kopyalaması başarısız"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11541,180 +11819,180 @@
"\t%s\n"
"'%c' ile başlayan satırlar çıkarılacaktır.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Genel seçenekler"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "bilgi iletilerini gizle"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "kullanma"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "üstkaynak"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "üstkaynak bilgisini değiştir"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "üstkaynak bilgisini kaldır"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "renklendirilmiş çıktı kullan"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "uzak izleme dallarında iş yap"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "yalnızca işlemeyi içeren dalları yazdır"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Özel git-branch eylemleri:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "hem uzak izleme hem de yerel dalları listele"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "tümüyle birleştirilen dalı sil"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "dalı sil (birleştirilmemiş olsa bile)"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "bir dalı kopyala, hedef var olsa bile"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "dal adlarını listele"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "geçerli dal adını göster"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "dalın başvuru günlüğünü oluştur"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "dalın açıklamasını düzenle"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "yalnızca birleştirilen dalları yazdır"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "yalnızca birleştirilmeyen dalları yazdır"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "dalları sütunlarla listele"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "nesne"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "yalnızca nesnenin dallarını yazdır"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "çıktı için kullanılacak biçim"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD, refs/heads altında bulunamadı!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column ve --verbose birbiriyle uyumsuz"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "dal adı gerekli"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "birden çok dalın açıklaması düzenlenemiyor"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "'%s' dalında henüz bir işleme yok."
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "'%s' adında bir dal yok."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "bir kopyalama işlemi için çok fazla dal"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11722,31 +12000,31 @@
"HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
"etmiyor."
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "'%s' diye bir dal yok"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' diye bir dal mevcut değil"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "üst kaynağı kaldırmak için çok fazla argüman"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEAD'in üst kaynağı kaldırılamadı; çünkü herhangi bir dala işaret etmiyor."
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' dalının üstkaynak bilgisi yok"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11754,7 +12032,7 @@
"'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n"
"Şunu mu demek istediniz: -a|-r --list <dizgi>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11762,32 +12040,32 @@
"--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-"
"upstream-to kullanın."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git sürümü:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "derleyici bilgisi: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc bilgisi: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "bir git deposundan çalıştırılmadı - gösterilecek kanca yok\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11822,38 +12100,33 @@
"Aşağıda hata raporunun geri kalanına bir göz atın.\n"
"Paylaşmak istemediğiniz satırları silebilirsiniz.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "hata raporu dosyası için bir konum belirtin"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "dosya adı için bir strftime biçimli ek belirtin"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "'%s' için öncü dizinler oluşturulamadı"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Sistem Bilgisi"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Etkin Kancalar"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "'%s' hata raporu dosyası oluşturulamadı"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "%s dosyasına yazılamıyor"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
@@ -11874,53 +12147,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "ilerleme çubuğunu gösterme"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "ilerleme çubuğunu göster"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "demet biçim sürümünü belirt"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Bir demet oluşturmak için bir depo gerekli."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "demet ayrıntılarını gösterme"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s tamam\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Demeti çözmek için bir depo gerekli"
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Nesneler demetten çıkarılıyor"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Bilinmeyen altkomut: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11928,7 +12201,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11936,72 +12209,72 @@
"git cat-file (--batch[=<biçim>] | --batch-check[=<biçim>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "yalnızca bir toplu iş seçeneği belirtilebilir"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tür> yalnızca şunlardan biri olabilir: blob, tree, commit, tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "nesne türünü göster"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "nesne boyutunu göster"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "hata yoksa sıfır koduyla çık"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "nesne içeriğini okunabilir biçimde göster"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "ikili nesneler için nesne içeriği üzerinde textconv çalıştır"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "ikili nesneler için nesne içeriği üzerinde süzgeçler çalıştır"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "ikili nesne"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "--textconv/--filters için belirli bir yol kullan"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s ve -t'nin bozuk/hasar görmüş nesnelerle çalışmasına izin ver"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "--batch çıktısını arabelleğe al"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "standart girdi'den beslenen nesnelerin bilgisini ve içeriğini göster"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "standart girdi'den beslenen nesneler hakkında bilgi göster"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"ağaç içi sembolik bağları izle (--batch veya --batch-check ile kullanılır)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "--batch veya --batch-check ile olan tüm nesneleri göster"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "--batch-all-objects çıktısını sıralama"
@@ -12021,7 +12294,7 @@
msgid "use .gitattributes only from the index"
msgstr "yalnızca indeksteki .gitattributes'u kullan"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "dosya adlarını stdin'den oku"
@@ -12029,8 +12302,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "ilerleme bildirimini gizle"
@@ -12088,11 +12361,10 @@
msgstr "git checkout--worker [<seçenekler>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "dizi"
@@ -12243,11 +12515,11 @@
msgid "path '%s' is unmerged"
msgstr "'%s' yolu birleştirilmemiş"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "önce geçerli indeksinizi çözmelisiniz"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12256,50 +12528,50 @@
"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD konumu:"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "HEAD güncellenemiyor"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' dalı sıfırlandı.\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Halihazırda '%s' üzerinde\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Yeni '%s' dalına geçildi.\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' dalına geçildi.\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr "... ve %d daha.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12322,7 +12594,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12349,19 +12621,19 @@
"\tgit branch <yeni-dal-adı> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "revizyonlarda gezinirken iç hata"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Önceki HEAD konumu şuydu:"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "Henüz doğmamış bir dal üzerindesiniz"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12370,7 +12642,7 @@
"'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
"Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin."
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12390,51 +12662,51 @@
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
"ayarını yapmayı düşünün."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "yalnızca bir başvuru bekleniyordu"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "geçersiz başvuru: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "başvuru bir ağaca değil: %s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "bir dal bekleniyordu, '%s' alındı"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12442,7 +12714,7 @@
"Birleştirme yaparken dal değiştirilemiyor.\n"
"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12450,7 +12722,7 @@
"Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
"\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12458,7 +12730,7 @@
"Yeniden temellendirme yaparken dal değiştirilemiyor.\n"
"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12466,7 +12738,7 @@
"Seç-al yaparken dal değiştirilemiyor.\n"
"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12474,138 +12746,138 @@
"Geriye al yaparken dal değiştirilemiyor.\n"
"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "ikili arama yaparken dal değiştiriyorsunuz"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "dal değiştirilirken yollar kullanılamaz"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "dal değiştirilirken '%s' kullanılamaz"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile birlikte kullanılamaz"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s', <başlama-noktası> alamaz"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "dal veya işleme argümanı eksik"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "çakışma stili (birleştirme veya diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "adı verilen işlemede HEAD'i ayır"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "yeni dal için üstkaynak bilgisi ayarla"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "yeni dal"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "yeni üst ögesi olmayan dal"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p ve --overlay birlikte kullanılmaz"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track için bir dal adı gerekli"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "eksik dal adı; -%c deneyin"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "%s çözülemedi"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "geçersiz yol belirtimi"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach bir '%s' yol argümanı almıyor"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file, --detach ile uyumsuz"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file, --patch ile uyumsuz"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12613,71 +12885,71 @@
"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
"birlikte kullanılamaz"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "dal"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "yeni bir dal oluştur ve çıkış yap"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "bir dal oluştur/sıfırla ve çıkış yap"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "yeni dal için başvuru günlüğü oluştur"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "yerpaylaşım kipini kullan (öntanımlı)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "yeni bir dal oluştur ve ona geç"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "bir dal oluştur/sıfırla ve ona geç"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "yerel değişiklikleri çöpe at"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "çıkış yapılacak ağacımsı"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "indeksi eski durumuna getir"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "çalışma ağacını eski durumuna getir"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "birleştirilmemiş girdileri yok say"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "yerpaylaşım kipini kullan"
@@ -12816,8 +13088,8 @@
msgstr "dizinleri tümüyle kaldır"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "dizgi"
@@ -12906,19 +13178,20 @@
msgid "directory from which templates will be used"
msgstr "şablonların kullanılacağı dizin"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "başvuru deposu"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "--reference'ı yalnızca klonlarken kullan"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "ad"
@@ -12934,8 +13207,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "uzak konumdaki git-upload-pack'e olan yol"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "derinlik"
@@ -12943,8 +13216,8 @@
msgid "create a shallow clone of that depth"
msgstr "verilen derinlikte sığ bir depo oluştur"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "zaman"
@@ -12953,16 +13226,16 @@
msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "revizyon"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "yalnızca bir dal klonla, HEAD veya --branch"
@@ -12991,21 +13264,21 @@
msgstr "yapılandırmayı yeni deponun içinde ayarla"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "sunucuya özel"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "iletme seçeneği"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "yalnızca IPv4 adresleri kullan"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "yalnızca IPv6 adresleri kullan"
@@ -13020,50 +13293,42 @@
"sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde "
"ilklendir"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Bir dizin adı tahmin edilemedi.\n"
-"Lütfen komut satırında bir dizin belirtin."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: '%s' için alternatif eklenemedi: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s var ve bir dizin değil"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' bağı oluşturulamadı"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "dosya şuraya kopyalanamadı: '%s'"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "'%s' üzerinde yinelenemedi"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "bitti.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13073,151 +13338,151 @@
"Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n"
"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Klonlanacak %s uzak dal bulunamadı."
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "%s güncellenemiyor"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "sparse-checkout ilklendirilemedi"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "çalışma ağacı çıkış yapılamıyor"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "parametreler yapılandırma dosyasına yazılamıyor"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "temizlik için yeniden paketlenemiyor"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Çok fazla argüman."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "Klonlamak için bir depo belirtmelisiniz."
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz."
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' deposu mevcut değil"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "%s derinliği pozitif bir sayı değil"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil."
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "Çalışma ağacı '%s' halihazırda mevcut."
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "'%s' çıplak deposuna klonlanıyor...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonlama konumu: '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive hem --reference hem --reference-if-able ile uyumlu değil"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' geçerli bir uzak konum adı değil"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "kaynak depo sığ, --local yok sayılıyor"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local yok sayıldı"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "uzak konum taşıması hata bildirdi"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
@@ -13253,13 +13518,13 @@
msgid "--command must be the first argument"
msgstr "--command ilk argüman olmalı"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13269,97 +13534,95 @@
"split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "dizin"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "Grafiğin depolanacağı nesne dizini"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "commit-graph parçalara bölünmüşse yalnızca uç dosyayı doğrula"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "commit-graph '%s' açılamadı"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "tanımlanamayan --split argümanı, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "beklenmedik onaltılık olmayan nesne kimliği: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "geçersiz nesne: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "tüm başvurularda gezinmeyi başlat"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "stdin tarafından listelenen paket indekslerini tara"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "stdin tarafından listelenen tüm işlemelerde gezinmeyi başlat"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "halihazırda commit-graph dosyasında bulunan tüm işlemeleri içer"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "artan bir commit-graph dosyasının yazımına izin ver"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"bir temel olmayan parçalara bölünmüş commit-graph içinde en çok olabilecek "
"işleme sayısı"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
"bölünmüş bir commit-graph'ın iki düzeyi arasında olabilecek en büyük oran"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "yalnızca verilen bir tarihten daha eski dosyaların hükmünü kaldır"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "Hesaplanacak en çok değiştirilen yollar için Bloom süzgeçleri sayısı"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"--reachable, --stdin-commits veya --stdin-packs'ten en çok birini kullan"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Girdiden işlemeler toplanıyor"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "tanımlanamayan altkomut: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13373,70 +13636,65 @@
msgid "duplicate parent %s ignored"
msgstr "yinelenmiş üst öge %s yok sayıldı"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "%s geçerli bir nesne adı değil"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: '%s' açılamadı"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: '%s' okunamadı"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: '%s' kapatılamadı"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "üst öge"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "bir üst işleme ögesinin no'su"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "ileti"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "işleme iletisi"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "işleme günlük iletisini dosyadan oku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "işlemeyi GPG ile imzala"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "bir tam ağaç vermeli"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: okunamadı"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13446,7 +13704,7 @@
"boş yapacaktır. Komutunuzu --allow-empty ile yineleyebilir veya\n"
"işlemeyi \"git reset HEAD^\" ile tümüyle kaldırabilirsiniz.\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13460,15 +13718,15 @@
"\tgit commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Aksi durumda, lütfen 'git rebase --skip' kullanın.\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Aksi durumda, lütfen 'git cherry-pick --skip' kullanın.\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13490,73 +13748,73 @@
"\tgit cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "HEAD ağaç nesnesi açılamadı"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "geçici indeks oluşturulamıyor"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "etkileşimli ekleme başarısız"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "geçici indeks güncellenemiyor"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "Ana önbellek ağacı güncellenemedi"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "new_index dosyası yazılamıyor"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "Bir seç-al sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "indeks okunamıyor"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "geçici indeks dosyası yazılamıyor"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' işlemesinde yazar üstbilgisi yok"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "hatalı oluşturulmuş --author parametresi"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13564,43 +13822,43 @@
"mevcut işleme iletisinde kullanılmayan bir yorum\n"
"karakteri seçilemiyor"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "%s işlemesi aranamadı"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "günlük standart girdi'den okunamadı"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "günlük dosyası '%s' okunamadı"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "--fixup:%s ile -m birlikte kullanılamaz"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG okunamadı"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG okunamadı"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "işleme şablonu yazılamadı"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13609,7 +13867,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar yok sayılacaktır.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13618,7 +13876,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13627,7 +13885,7 @@
"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13638,7 +13896,7 @@
"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
"Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13652,7 +13910,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13666,74 +13924,74 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"ve yeniden deneyin.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sYazar: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sTarih: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sİşleyici: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "İndeks okunamıyor"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "--trailers'a artbilgiler geçirilemiyor"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Ağaçlar yapılırken hata"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla "
"eşleşmiyor"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Geçersiz yok sayılanları göster kipi '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long ve -z birbiriyle uyumsuz"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -13741,106 +13999,106 @@
"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/--"
"only ile birlikte kullanılamaz"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Değiştirecek bir şeyiniz yok."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
"Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir."
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi "
"kullanılabilir."
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "bilinmeyen seçenek: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "durumu kısaca göster"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "dal bilgisini göster"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "zula bilgisini göster"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "tam önünde/arkasında değerlerini hesapla"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "sürüm"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "makine tarafından okunabilir çıktı"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "durumu uzun biçimde göster (öntanımlı)"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "girdileri NUL ile sonlandır"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "kip"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: "
"all)"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13848,11 +14106,11 @@
"yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) "
"matching (eşleşen), no (hayır) (Öntanımlı: traditional)."
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "ne zaman"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13860,198 +14118,198 @@
"altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all "
"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)."
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "izlenmeyen dosyaları sütunlarla göster"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "yeniden adlandırmaları algılama"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr ""
"yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte "
"kullanımı"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "başarılı işlemenin ardından özeti gizle"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "diff'i işleme iletisi şablonunda göster"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "İşleme iletisi seçenekleri"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "iletiyi dosyadan oku"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "yazar"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "işleme yazarını geçersiz kıl"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "tarih"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "işleme tarihini geçersiz kıl"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "işleme"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "belirtilen işlemenin iletisini yeniden kullan"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]işleme"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden "
"tıkıştırma tarafından biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
"biçimlendirilen iletiyi kullan"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "artbilgi"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "özel artbilgiler ekle"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "bir Signed-off-by artbilgisi ekle"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "belirtilen şablon dosyasını kullan"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "işlemeyi zorla düzenle"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "işleme iletisi şablonunda durumu içer"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "İşleme içeriği seçenekleri"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "değiştirilen tüm dosyaları gönder"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "belirtilen dosyaları işleme için indekse ekle"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "dosyaları etkileşimli olarak ekle"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "değişiklikleri etkileşimli olarak ekle"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "yalnızca belirtilen dosyaları gönder"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "pre-commit ve commit-msg kancalarını atla"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "neyin işleneceğini göster"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "önceki işlemeyi değiştir"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "post-rewrite kancasını atla"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "boş bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "boş iletili bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE okunamadı"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "işleme iletisi okunamadı: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
-msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14417,7 +14675,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon kullanılamıyor; unix soket desteği yok"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache kullanılamıyor; unix soket desteği yok"
@@ -14618,7 +14876,7 @@
msgid "Not a git repository"
msgstr "Bir git deposu değil"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "geçersiz nesne '%s' verildi"
@@ -14642,113 +14900,114 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "başarısız: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "%s sembolik bağı okunamadı"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "%s sembolik bağ dosyası okunamadı"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "%s nesnesi %s sembolik bağı için okunamadı"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n"
-"(-d ve --dir-diff) desteklenmiyor."
+"Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
+"('-d' ve '--dir-diff') desteklenmiyor."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "Çalışma ağacı dosyası bırakıldı."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "'%s' konumunda geçici dosyalar var."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "başarısız: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "'diff.tool' yerine 'diff.guitool' kullan"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "bir tam dizin diff'i gerçekleştir"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "bir diff aracı çalıştırmadan önce sorma"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff kipinde sembolik bağlar kullan"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "araç"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "belirtilen diff aracını kullan"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
+msgstr ""
+"'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr ""
"çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-"
"difftool'un çıkış yapmasını sağla"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "diff'leri görüntülemek için özel bir komut belirle"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "'diff'e aktarıldı"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff, --no-index ile uyumsuz"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<araç> için bir <araç> verilmedi"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<komut> için bir <komut> verilmedi"
@@ -14756,7 +15015,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dğşkn>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "tür"
@@ -14788,98 +15047,98 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Hata: İç içe geçmiş etiketler --mark-tags belirtilmediği sürece dışa "
"aktarılamaz."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map jetonu boş olamaz"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "<n> nesneden sonra ilerlemeyi göster"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "nesnelerce süzülen etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"başka bir kodlamaya iye işleme iletilerinin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "imleri bu dosyaya boşalt"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "imleri bu dosyadan içe aktar"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "eğer varsa bu dosyadan imleri içe aktar"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "her işleme için tüm ağacın çıktısını ver"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "ikili nesne verisi çıktısını atla"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "başvuru belirteci"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "çıktı kimliğini gizle"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "kimden:kime"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "<kimden> ve <kime>'yi anonimleştirilmiş çıktıda dönüştür"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "etiketleri im numaralarıyla adlandır"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı"
@@ -14937,15 +15196,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel negatif olamaz"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "tüm uzak konumlardan getir"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "git pull/fetch için üstkaynak ayarla"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
@@ -14953,7 +15212,7 @@
msgid "use atomic transaction to update references"
msgstr "başvuruları güncellemek için atomsal işlem kullan"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "uzak uçtaki yükleme paketine olan yol"
@@ -14965,7 +15224,7 @@
msgid "fetch from multiple remotes"
msgstr "birden çok uzak konumdan getir"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
@@ -14983,7 +15242,7 @@
"başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
"değiştir"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
@@ -14993,7 +15252,7 @@
"artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri "
"güncelle"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "istek üzerine"
@@ -15005,7 +15264,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "indirilen paketi tut"
@@ -15013,16 +15272,16 @@
msgid "allow updating of HEAD ref"
msgstr "HEAD başvurusunun güncellenmesine izin ver"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "sığ klonun geçmişini derinleştir"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "tam bir depoya dönüştür"
@@ -15038,19 +15297,19 @@
"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
"dosyalarından daha az önceliğe iye)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "ilgili başvuru"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "getirme ile ilgili başvuruları belirt"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir"
@@ -15064,7 +15323,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle"
@@ -15080,62 +15339,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Uzak HEAD başvurusu bulunamadı"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "%s nesnesi bulunamadı"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[güncel]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[reddedildi]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[etiket güncellemesi]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[yeni etiket]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[yeni dal]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[yeni başvuru]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "zorlanmış güncelleme"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "ileri sarım değil"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15145,7 +15404,7 @@
"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n"
"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15157,22 +15416,22 @@
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
"bu denetlemeden kaçınabilirsiniz.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tüm gerekli nesneleri göndermedi\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Şu konumdan: %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15181,56 +15440,61 @@
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sarkacak)"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[silindi]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(hiçbiri)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "%s diye bir nesne yok"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "bilinmeyen dal türü"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15238,22 +15502,22 @@
"Kaynak dal bulunamadı.\n"
"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "%s getiriliyor\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "%s getirilemedi"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15261,58 +15525,58 @@
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
"alınacağı bir URL veya uzak konum adı belirtin."
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Bir etiket adı belirtmeniz gerekiyor."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr ""
"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen için negatif derinlik desteklenmiyor"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen ve --depth birlikte kullanılamaz"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth ve --unshallow birlikte kullanılamaz"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all bir depo argümanı almıyor"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15320,11 +15584,11 @@
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir."
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
@@ -15391,7 +15655,7 @@
msgid "show only <n> matched refs"
msgstr "yalnızca <n> eşleşen başvuruyu göster"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "biçim renklerine uy"
@@ -15547,129 +15811,139 @@
msgid "notice: No default references"
msgstr "Uyarı: Öntanımlı başvurular yok"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: nesne hasar görmüş veya kayıp: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nesne ayrıştırılamadı: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "hatalı sha1 dosyası: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Nesne dizini denetleniyor"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Nesne dizinleri denetleniyor"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "%s bağ denetleniyor"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "geçersiz %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s garip bir şeye işaret ediyor (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Önbellek ağacı denetleniyor"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "cache-tree içinde ağaç olmayan öge"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<seçenekler>] [<nesne>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "ulaşılamayan nesneleri göster"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "sarkan nesneleri göster"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "etiketleri bildir"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "kök düğümleri bildir"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "indeks nesnelerini dal ucu düğümü yap"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "yalnızca bağlanabilirliği denetle"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "daha kesin denetlemeyi etkinleştir"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "sarkan nesneleri .git/lost-found'a yaz"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "ilerlemeyi göster"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Nesneler denetleniyor"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: nesne kayıp"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
@@ -15693,7 +15967,7 @@
msgid "cannot stat '%s'"
msgstr "'%s' bilgileri alınamıyor"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "'%s' okunamıyor"
@@ -15702,14 +15976,14 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"En son yapılan 'gc' işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
-"nedenini düzeltin ve %s ögesini kaldırın.\n"
-"Kendiliğinden temizlik dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
+"En son yapılan gc işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
+"nedenini düzeltin ve %s ögesini kaldırın. Kendiliğinden temizlik\n"
+"dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
"\n"
"%s"
@@ -15787,148 +16061,188 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "tanımlanamayan --schedule argümanı, %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "commit-graph yazılamadı"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "uzak konumlar önden getirilemedi"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "'git pack-objects' işlemi başlatılamadı"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "'git pack-objects' işlemi bitirilemedi"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "multi-pack-index yazılamadı"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' başarısız oldu"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' başarısız oldu"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
"incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "'%s' görevi başarısız oldu"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' geçerli bir görev değil"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "'%s' görevi birden çok kez seçilemez"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "görevleri deponun durumuna göre çalıştır"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "sıklık"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "görevleri sıklığa göre çalıştır"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "görev"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "belirli bir görevi çalıştır"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "'git config' çalıştırılamadı"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "'%s' yolu oluşturulamadı"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "launchctl başlatılamadı"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "'%s' için dizinler oluşturulamadı"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "%s servisi özyüklenemedi"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "geçici xml dosyası oluşturulamadı"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "schtasks başlatılamadı"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "'crontab' stdin'i açılamadı"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' beklenmedik bir biçimde sonlandı"
-#: builtin/gc.c:1976
-msgid "another process is scheduling background maintenance"
-msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor"
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "systemctl başlatılamadı"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "systemctl çalıştırılamadı"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "'%s' silinemedi"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "tanımlanamayan --scheduler argümanı, '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planlayıcısı mevcut değil"
+
+#: builtin/gc.c:2432
+msgid "another process is scheduling background maintenance"
+msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
+
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "görev planlayıcı"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "git bakımını tetikleyecek görev planlayıcı"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "depo, global yapılandırmaya eklenemedi"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <altkomut> [<seçenekler>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "geçersiz altkomut: %s"
@@ -15937,12 +16251,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: iş parçacığı oluşturulamadı: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
@@ -15951,263 +16265,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "iş parçacığı desteği yok, %s yok sayılıyor"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "ağaç okunamıyor (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "%s türündeki bir nesneden grep yapılamıyor"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "'%c' anahtarı sayısal bir değer bekliyor"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "çalışma ağacı yerine indekste ara"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "git tarafından yönetilmeyen içerikte bul"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'da belirtilen dosyaları yok say"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "her altmodülde özyineli olarak ara"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "eşleşmeyen satırları göster"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "ikili dosyaları metin olarak işle"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "ikili dosyalardaki dizgileri eşleştirme"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "ikili dosyaları textconv süzgeçleri ile işle"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "altdizinlerde ara (öntanımlı)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "en çok <derinlik> düzey in"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "dizgileri sabit diziler olarak yorumla"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "Perl uyumlu düzenli ifadeler kullan"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "satır numaralarını göster"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "ilk eşleşmenin sütun numarasını göster"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "dosya adlarını gösterme"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "dosya adlarını göster"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "dosya adlarını en üst dizine göreceli olarak göster"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches eşanlamlısı"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "dosya adlarından sonra NUL yazdır"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "yalnızca bir satırın eşleşen kısımlarını göster"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "eşleşen satırlar yerine eşleşme sayısını göster"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "eşleşmeleri vurgula"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr ""
"aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "eşleşmelerden önce <n> satır bağlam göster"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "eşleşmelerden sonra <n> satır bağlam göster"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "<n> iş parçacığı kullan"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "-C NUM için kısayol"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "çevresindeki işlevi göster"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "dizgileri dosyadan oku"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "<dizgi> ile eşleş"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "-e ile belirtilen dizgileri birleştir"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "sayfalayıcı"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "sayfalayıcıda eşleşen dosyaları göster"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "bir dizgi verilmedi"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "revizyon çözülemiyor: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked, --cached ile birlikte kullanılamıyor"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "hem --cached hem ağaçlar verilmiş"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16215,97 +16529,109 @@
"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
"[--] <dosya>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "nesne türü"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "nesneyi nesne veritabanına yaz"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "nesneyi stdin'den oku"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "dosyayı süzgeçler olmadan olduğu gibi depola"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Git hata ayıklamasında kullanmak için çer çöp toplayarak hasarlı nesneler "
"oluştur"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "dosyayı sanki bu yoldanmış gibi işle"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "tüm kullanılabilir komutları yazdır"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "kılavuzları hariç tut"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "kullanışlı kılavuzların listesini çıkar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "man sayfasını göster"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "kılavuzu web tarayıcısında göster"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "bilgi sayfasını göster"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "komut açıklamasını yazdır"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "kullanışlı kılavuzların listesini çıkar"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<komut>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "tanımlanamayan yardım biçimi '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "emacsclient başlatılamadı."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "emacsclient sürümü ayrıştırılamadı."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient sürümü '%d' pek eski (<22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "'%s' çalıştırılamadı"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16314,7 +16640,7 @@
"'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16323,331 +16649,322 @@
"'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
"Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': Bilinmeyen man görüntüleyicisi."
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s', '%s' olarak armalanmış"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "hatalı alias.%s dizisi: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "bu seçenek başka bir argüman daha almıyor"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "kullanım: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "ek bilgi için: 'git help config'"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s konumunda nesne türü uyuşmazlığı"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "beklenen nesne %s alınmadı"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "nesne %s: beklenen tür %s, bulunan %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d bayt doldurulamıyor"
msgstr[1] "%d bayt doldurulamıyor"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "erken dosya sonu"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "girdide okuma hatası"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "kullanılabilir olandan daha çok bayt kullanıldı"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "paket off_t'nin geçerli tanımı için çok büyük"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paket izin verilen en büyük boyutu aşıyor"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "'%s' oluşturulamıyor"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "'%s' paket dosyası açılamıyor"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "paket imzası uyuşmazlığı"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paket sürümü %<PRIu32> desteklenmiyor"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "şişirme programı %d döndürdü"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "delta tabanı nesnesi için ofset değeri taşımı"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "delta tabanı ofseti sınırlar dışında"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "bilinmeyen nesne türü %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "paket dosyası 'pread' yapılamıyor"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "ciddi şişirme programı tutarsızlığı"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "%s okunamıyor"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "mevcut %s nesne bilgisi okunamıyor"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "mevcut %s nesnesi okunamıyor"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "geçersiz %s ikili nesnesi"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "paketlenmiş nesne içinde fsck hatası"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "delta uygulanamadı"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Nesneler alınıyor"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Nesneler indeksleniyor"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "paket dosyası fstat yapılamıyor"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "paket sonunda döküntüler var"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Deltalar çözülüyor"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "iş parçacığı oluşturulamadı: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "karmaşa akıl almaz düzeyde"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "%d yerel nesneyle tamamlandı"
msgstr[1] "%d yerel nesneyle tamamlandı"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketin %d çözülmemiş deltası var"
msgstr[1] "paketin %d çözülmemiş deltası var"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "iliştirilen nesne söndürülemedi (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "yerel nesne %s hasarlı"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "%s dosyası '%s' yazılamıyor"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "yazılmış %s dosyası '%s' kapatılamıyor"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "geçici '*.%s' dosyası '%s' olarak yeniden adlandırılamıyor"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "paket dosyası kapatılırken hata"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "paket dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "indeks dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "hatalı pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Mevcut paket dosyası '%s' açılamıyor"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s' için mevcut paket idx dosyası açılamıyor"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "delta değil: %d nesne"
msgstr[1] "delta değil: %d nesne"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "zincir uzunluğu = %d: %lu nesne"
msgstr[1] "zincir uzunluğu = %d: %lu nesne"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Şu anki çalışma dizinine geri gelinemiyor"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "hatalı %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "bilinmeyen sağlama algoritması '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin bir git dizini gerektirir"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format, --stdin olmadan kullanılamaz"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify ile bir paket dosyası adı verilmedi"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "paket nesnelerinde fsck hatası"
@@ -17283,129 +17600,133 @@
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<seçenekler>] [<dosya>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "yolları NUL karakteri ile ayır"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "dosya durumunu etiketlerle tanımla"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "silinen dosyaları çıktıda göster"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "değiştirilen dosyaları çıktıda göster"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "diğer dosyaları çıktıda göster"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "yok sayılan dosyaları çıktıda göster"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "hazırlanan içeriğin nesne adını çıktıda göster"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "'diğer' dizinlerin yalnızca adını göster"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "dosyaların satır sonlarını göster"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "boş dizinleri gösterme"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "birleştirilmemiş dosyaları çıktıda göster"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "'resolve-undo' bilgisini göster"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "dizgi ile eşleşen dosyaları atla"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "hariç tutma dizgileri <dosya>'dan okunuyor"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "standart git hariç tutmalarını ekle"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "çıktıyı en üst proje dizinine göreceli olarak yap"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "altmodüller içinden özyinele"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "ağacımsı"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "hata ayıklama verisini göster"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "yinelenen girdileri sustur"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<depo> [<başvurular>...]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<çlştr>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<depo> [<başvurular>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "uzak konum URL'sini yazdırma"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "çalıştır"
@@ -17522,7 +17843,7 @@
msgid "use headers in message's body"
msgstr "ileti gövdesinde üstbilgi kullan"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "boş mbox: '%s'"
@@ -17638,144 +17959,144 @@
msgid "Merging %s with %s\n"
msgstr "%s, %s ile birleştiriliyor\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<seçenekler>] [<işleme>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "'m' anahtarı bir değer gerektiriyor"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "'%s' seçeneği bir değer gerektiriyor"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Kullanılabilir stratejiler:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Kullanılabilir özel stratejiler:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat gösterme"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "birleştirmenin sonunda bir diffstat göster"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(--stat eşanlamlısı)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "birleştirme yerine tek bir işleme oluştur"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "birleştirme başarılı olursa bir işleme gerçekleştir (öntanımlı)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "göndermeden önce iletiyi düzenle"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "ileri sarıma izin ver (öntanımlı)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "ileri sarım olanaklı değilse iptal et"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "adı verilen işlemenin geçerli bir GPG imzası olduğunu doğrula"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "strateji"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "kullanılacak birleştirme stratejisi"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "seçenek=değer"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "seçili birleştirme stratejisi için seçenekler"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"birleştirme işlemesi iletisi (ileri sarım olmayan bir birleştirme için)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort; ancak indeksi ve çalışma ağacını değiştirmeden bırakın"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "pre-merge-commit ve commit-msg kancalarını atla"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "zula yapılamadı"
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "zulalama başarısız oldu"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "geçerli bir nesne değil: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree başarısız oldu"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Tümü güncel (tıkıştırılacak bir şey yok)."
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
@@ -17790,31 +18111,31 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive için geçersiz seçenek: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "bilinmeyen strateji seçeneği: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "%s yazılamıyor"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Şu konumdan okunamadı: '%s'"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17824,11 +18145,11 @@
"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17837,72 +18158,72 @@
"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
"iptal eder.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Boş işleme iletisi."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Harika.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Geçerli dal yok."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Geçerli dal için uzak konum yok."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "%s için %s konumundan uzak izleme dalı yok"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Hatalı değer '%s', '%s' ortamında"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort bir argüman beklemez"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit bir argüman beklemez"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue bir argüman beklemez"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17910,7 +18231,7 @@
"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17918,89 +18239,85 @@
"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n"
"Lütfen birleştirmeden önce değişikliklerinizi işleyin."
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)."
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash ile --no-ff birlikte kullanılamaz."
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "--squash ile --commit birlikte kullanılamaz."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - birleştirebileceğimiz bir şey değil"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Güncelleniyor: %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Yok.\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "İleri sarma olanaklı değil, iptal ediliyor."
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "%s birleştirme stratejisi deneniyor...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18035,15 +18352,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "'%s' nesnesi '%s' olarak etiketlenmiş; ancak bir '%s' türü"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "stdin üzerindeki etiket bizim sıkı fsck denetimimizi geçemedi"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "etiket dosyası yazılamıyor"
@@ -18064,34 +18381,50 @@
msgstr "birden çok ağacın oluşturulmasına izin ver"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>][--refs-"
+"snapshot=<yol>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<seçenekler>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<seçenekler>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<seçenekler>] repack [--batch-size=<boyut>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "nesne dizini paket dosyası seti ve pack-index eşleri içeriyor"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "preferred-pack"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "çoklu paket biteşlemi yaz"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "biteşlem işlemeleri seçmek için başvuruların anlık görüntüsünü al"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18099,11 +18432,6 @@
"yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan "
"daha büyük bir toplu iş olarak toplayın"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "tanımlanamayan altkomut: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<seçenekler>] <kaynak>... <hedef>"
@@ -18132,72 +18460,72 @@
msgid "skip move/rename errors"
msgstr "taşı/yeniden adlandır hatalarını atla"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "'%s' hedefi bir dizin değil"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "hatalı kaynak"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "dizin kendi içine taşınamıyor"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "dizin dosya üzerinden taşınamıyor"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "kaynak dizin boş"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "sürüm denetimi altında değil"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "çakışmalı"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "hedef mevcut"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "üzerine yazılıyor: '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Üzerine yazılamıyor"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "aynı hedef için birden çok kaynak"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "hedef dizin mevcut değil"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, kaynak=%s, hedef:%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "%s, %s olarak yeniden adlandırılıyor\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s' yeniden adlandırılamadı"
@@ -18374,47 +18702,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "'%s' nesnesi için 'show' bitirilemedi"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "not içeriğini lütfen -m veya -F seçeneğini kullanarak sağlayın"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "not nesnesi yazılamıyor"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "not içeriği %s içinde bırakıldı"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s' açılamadı veya okunamadı"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "'%s' nesnesi okunamadı."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "hatalı oluşturulmuş girdi satırı: '%s'"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
@@ -18422,48 +18750,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "çok fazla argüman"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "%s nesnesi için not bulunamadı."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "not içeriği dizi olarak"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "not içeriği bir dosyada"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "belirtilen not nesnesini düzenle ve yeniden kullan"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "belirtilen not nesnesini yeniden kullan"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "boş not depolamasına izin ver"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "var olan notları başkalarıyla değiştir"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18472,29 +18800,29 @@
"Not eklenemiyor. %s nesnesi için halihazırda var olan notlar bulundu. Bu "
"notların üzerine yazmak için '-f' kullanın."
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s nesnesi için var olan notların üzerine yazılıyor\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s nesnesi için olan not kaldırılıyor\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "nesneleri stdin'den oku"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<komut> için yapılandırma yeniden yazımını yükle (--stdin ima eder)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "pek az argüman"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18503,12 +18831,12 @@
"Notlar kopyalanamıyor. %s nesnesi için halihazırda var olan notlar bulundu. "
"Bu notların üzerine yazmak için '-f' kullanın."
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "%s kaynak nesnesi için not eksik. Kopyalanamıyor."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18517,52 +18845,52 @@
"'edit' altkomutunun -m/-F/-c/-C seçenekleri artık eski ve kullanılmamalı.\n"
"Lütfen bunun yerine 'git notes add -f -m/-F/-c/-C' kullanın.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL başvurusu silinemedi"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF başvurusu silinemedi"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "'git remove merge' çalışma ağacı kaldırılamadı"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF çözülemedi"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "not birleştirilmesi tamamlanamadı"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "bilinmeyen not birleştirme stratejisi %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Genel seçenekler"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Birleştirme seçenekleri"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18570,46 +18898,46 @@
"not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/"
"birlik olmuş/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Birleştirilmemiş notlar işleniyor"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "birleştirilmemiş notları işleyerek not birleştirmesini tamamla"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Notlar birleştirmesi çözümü iptal ediliyor"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "not birleştirmesini iptal et"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort veya -s/--strategy karıştırılamıyor"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "birleştirmek için bir not başvurusu belirtilmeli"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "bilinmeyen -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s konumuna bir not birleştirmesi halihazırda %s konumunda sürüyor"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "geçerli not başvurusuna bağlantı depolanamadı (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18620,41 +18948,41 @@
"çözün ve sonucu 'git notes merge --commit' ile işleyin. Birleştirmeyi iptal "
"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "%s nesnesinin notu yok\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "var olmayan notu kaldırma denemesi bir hata değil"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "nesne adlarını standart girdi'den oku"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "kaldırma, yalnızca göster"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "budanmış notları kaldır"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "not başvurusu"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "notları <not-bşvr>'ndan kullan"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "bilinmeyen altkomut: %s"
@@ -18706,83 +19034,87 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "şu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"biteşlem yazımı kapatılıyor, paketler pack.packSizeLimit dolayısıyla "
"parçalara ayrılmış"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Nesneler yazılıyor"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "%s bilgileri alınamıyor"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "biteşlem indeksi yazılamadı"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s için paket içinde delta taban ofset taşımı"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s için delta taban ofseti sınırların dışında"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Nesneler sayılıyor"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "%s nesnesi okunamıyor"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "standart altı paket - bellek yetersiz"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Nesneler sıkıştırılıyor"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "delta sayımında tutarsızlık"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18791,7 +19123,7 @@
"uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> "
"biçiminde olmalıdır ('%s' alındı)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18799,17 +19131,18 @@
"nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı "
"('%s' alındı)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "%s nesnesinin türü alınamıyor (%s paketinde)"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "'%s' paketi bulunamadı"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18818,7 +19151,7 @@
"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18827,249 +19160,249 @@
"nesne numarası bekleniyordu, anlamsız veri alındı:\n"
"%s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "--missing için geçersiz değer"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "paket indeksi açılamıyor"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "%s konumundaki gevşek nesne incelenemedi"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "gevşek nesne zorlanamıyor"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "bir revizyon değil: '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "hatalı revizyon: '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "en son nesneler eklenemiyor"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "desteklenmeyen indeks sürümü %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "hatalı indeks sürümü '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<sürüm>[,<ofset>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "paketlenmiş nesneleri yok say"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "paket penceresini nesnelerle sınırla"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "var olan deltaları yeniden kullan"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "var olan nesneleri yeniden kullan"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA nesneleri kullan"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "boş bir paket çıktısı oluşturma"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "revizyon argümanlarını standart girdi'den oku"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "indeks tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "paketleri stdin'den oku"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "paketi stdout'a çıktı ver"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "ulaşılamayan nesneleri tut"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "ulaşılamayan gevşek nesneleri paketle"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "ince paketler oluştur"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "sığ getirmelere uygun paketler oluştur"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "bu paketi yok say"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "paket sıkıştırma düzeyi"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "aşılarla gelen işlemeleri gizleme"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "eksik nesneler için işlem"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "delta sıkıştırması sırasında adalara uy"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "protokol"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
"bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri "
"ögesini hariç tut"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "--filter, --stdout olmadan kullanılamaz"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Nesneler ortaya dökülüyor"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19126,7 +19459,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "bir precious-objects deposu içinde budama yapılamıyor"
@@ -19139,56 +19472,60 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesi için denetleme"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Birleştirme ile ilgili seçenekler"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "ileri sarıma izin ver"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Getirme ile ilgili seçenekler"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "zorla yerel dalın üzerine yaz"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "paralelde çekilen altmodüllerin sayısı"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff için geçersiz değer: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
"Az önce getirdiğiniz başvurular arasında yeniden temellendirme için aday yok."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Az önce getirdiğiniz başvurular arasında birleştirme için aday yok."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19196,7 +19533,7 @@
"Genellikle bu, uzak uçta eşleşmesi olmayan bir joker başvuru belirteci\n"
"sağladığınız anlamına gelir."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19207,43 +19544,43 @@
"Bu, geçerli dalınız için öntanımlı yapılandırılmış uzak konum olmadığından,\n"
"komut satırında bir dal belirtmeniz gerekir."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Şu anda bir dal üzerinde değilsiniz."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Lütfen hangi dala karşı yeniden temellendirme yapmak istediğinizi belirtin."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Ayrıntılar için: git-pull(1)"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<uzak-konum>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<dal>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Geçerli dal için izleme bilgisi yok."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Eğer bu dal için izleme bilgisi ayarlamak isterseniz şununla yapabilirsiniz:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19252,20 +19589,20 @@
"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi belirtiyor,\n"
"ancak böyle bir başvuru getirilmedi."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "%s işlemesine erişilemedi"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19277,31 +19614,32 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Iraksak dalların nasıl uzlaştırılacağını belirtmeden çekme\n"
-"yapılması önerilmez. Bu iletiyi bir sonraki çekimden önce\n"
-"aşağıdaki komutlardan birini çalıştırarak susturabilirsiniz:\n"
+"Iraksak dallarınız mevcut ve onların nasıl uzlaştırılacağını\n"
+"belirtmeniz gerekiyor. Bunu bir sonraki çekimden önce\n"
+"aşağıdaki komutlardan birini çalıştırarak yapabilirsiniz:\n"
"\n"
"\tgit config pull.rebase false # birleştir (öntanımlı strateji)\n"
"\tgit config pull.rebase true # yeniden temellendir\n"
"\tgit config pull.ff only # yalnızca ileri sarım\n"
"\n"
-"Ayarı global kılmak için \"git config\"i \"git config --global\" ile\n"
-"değiştirin. Öntanımlı yapılandırmayı yürütme sırasında --rebase,\n"
-"--no-rebase veya --ff-only ile geçersiz kılabilirsiniz.\n"
+"Tüm depolar için global bir tercih ayarlamak için \"git config\"i\n"
+"\"git config --global\" ile değiştirebilirsiniz. Öntanımlı\n"
+"yapılandırmayı yürütme sırasında --rebase, --no-rebase veya\n"
+"--ff-only ile bir kerelik geçersiz kılabilirsiniz.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "yeniden temellendirme ile çekim"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19312,7 +19650,7 @@
"Çalışma ağacınız %s işlemesinden\n"
"ileri sarılıyor."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19329,15 +19667,23 @@
"$ git reset --hard\n"
"komutunu çalıştırın."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Boş dal ucuna birden çok dal birleştirilemez."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Birden çok dala yeniden temellendirme yapılamaz."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Birden çok dala ileri sarım yapılamaz."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Iraksak dalların nasıl uzlaştırılacağının belirtilmesi gerekiyor."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -19512,15 +19858,15 @@
msgid "failed to push some refs to '%s'"
msgstr "bazı başvurular '%s' konumuna itilemedi"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "depo"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "tüm başvuruları it"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "tüm başvuruları yansıla"
@@ -19532,19 +19878,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "zorla güncelle"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<başvuruadı>:<bekle>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "başvurunun eski değerinin bu değerde olmasını gerektir"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
@@ -19552,12 +19898,12 @@
msgid "control recursive pushing of submodules"
msgstr "altmodüllerin özyineli itilmesini denetle"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "ince paket kullan"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "paket programını al"
@@ -19577,11 +19923,11 @@
msgid "push missing but relevant tags"
msgstr "eksik; ancak ilgili etiketleri it"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "itmeyi GPG ile imzala"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "uzak tarafta atomsal işlem iste"
@@ -19693,82 +20039,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<dosya>] (--empty | <ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<dosya>] (--empty | "
+"<ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "ortaya çıkan indeksi <dosya>'ya yaz"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "yalnızca indeksi boşalt"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Birleştiriliyor"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "bir okumaya ek olarak bir birleştirme gerçekleştir"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "dosya düzeyinde birleştirme gerekmiyorsa 3 yönlü birleştir"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "eklemeler ve kaldırmalar varlığında 3 yönlü birleştir"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<altdizin>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "ağacı indekse <altdizin>/ altında oku"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "açıkça yok sayılan dosyaların üzerine yazılmasına izin ver"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "birleştirmeden sonra çalışma ağacını denetleme"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "indeksi veya çalışma ağacını güncelleme"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "aralıklı çıkış süzgeci uygulamayı atla"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "unpack-trees hatalarını ayıkla"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "geribildirim iletilerini gizle"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
@@ -19791,194 +20137,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "kullanılamaz yapılacaklar listesi: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "geçici %s oluşturulamadı"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "etkileşimli olarak imlenemedi"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "yapılacaklar listesi oluşturulamadı"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "bir taban işlemesi --upstream veya --onto ile sağlanmalıdır"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<seçenekler>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "boş başlayan işlemeleri tut"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "boş iletili işlemelere izin ver"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "birleştirme işlemelerini yeniden temellendir"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "kuzenlerin orijinal dal noktalarını tut"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "squash!/fixup! ile başlayan işlemeleri taşı"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "işlemeleri imzala"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "yeniden temellendirmeyi sürdür"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "işlemeyi atla"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "yapılacaklar listesini düzenle"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "geçerli yamayı göster"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını kısalt"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını genişlet"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "yapılacaklar listesini denetle"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash satırlarını yeniden düzenle"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "yapılacaklar listesine 'exec' komutları ekle"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "üzerine"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "revizyonu sınırla"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tıkıştır"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "üstkaynak işlemesi"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "dal ucu adı"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "yeniden temellendirme stratejisi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strateji seçenekleri"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "çıkış yapılacak dal veya işleme"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "'onto' adı:"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "komut"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "çalıştırılacak komut"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-"--[no-]rebase-cousins seçeneğinin --rebase-merges olmadan hiçbir etkisi yok"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s birleştirme arka ucunu gerektiriyor"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "'onto' alınamadı: '%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "geçersiz orig-head: '%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19992,7 +20188,7 @@
"İptal edip \"git rebase\" öncesine geri dönmek için \"git rebase --abort\"\n"
"çalıştırın."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20011,7 +20207,7 @@
"\n"
"Bunun sonucu olarak git onları yeniden temellendiremiyor."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20019,7 +20215,7 @@
msgstr ""
"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20036,7 +20232,7 @@
"\tgit rebase '<dal>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20049,189 +20245,199 @@
"\tgit branch --set-upstream-to=%s/<dal> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "'exec' komutları yenisatırlar içeremez"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "boş 'exec' komutu"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "üstkaynağın birleştirme temelini ve dalını geçerli temel olarak kullan"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "pre-rebase kancasının çalışmasına izin ver"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "sessiz ol (--no-stat ima eder)"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "her işlemeye bir Signed-off-by artbilgisi ekle"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "işleyici tarihi ile yazar tarihini aynı yap"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "--reset-author-date eşanlamlısı"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "'git apply'a aktarıldı"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "boşluk değişikliklerini yok say"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "sürdür"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "geçerli yamayı atla ve sürdür"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "iptal et ve orijinal dalı çıkış yap"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr ""
"bir etkileşimli yeniden temellendirme sırasında yapılacaklar listesini "
"düzenle"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr ""
"yeniden temellendirilecek işlemelerin listesini kullanıcının düzenlemesine "
"izin ver"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden "
"oluşturmaya çalış"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "boşalan işlemelerin nasıl ele alınacağı"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "boş başlayan işlemeleri tut"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "boş iletili işlemelerin yeniden temellendirilmesine izin ver"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "üstkaynağı arılaştırmak için 'merge-base --fork-point' kullan"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "verilen birleştirme stratejisini kullan"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "seçenek"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "argümanı birleştirme stratejisine aktar"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "ulaşılabilir tüm işlemeleri kök(ler)e kadar yeniden temellendir"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' artık eski. Yerine --rebase-merges kullanın."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges, --rebase-merges olarak değiştirildi"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "--keep-base ile --onto birlikte kullanılamaz"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "--keep-base ile --root birlikte kullanılamaz"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "--root ile --fork-point birlikte kullanılamaz"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Sürmekte olan bir yeniden temellendirme yok"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında "
"kullanılabilir."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20239,16 +20445,16 @@
"Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
"git add kullanarak tamamlandı olarak imlemelisiniz."
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "çalışma ağacı değişiklikleri atılamadı"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "%s konumuna geri taşınamadı"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20269,143 +20475,133 @@
"yapın ve beni yeniden çalıştırın. Ben sizi belki orada hâlâ değerli bir\n"
"şeyler olabilir diye durdurdum.\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "'C' anahtarı sayısal bir değer bekliyor"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Bilinmeyen kip: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy, --merge veya --interactive gerektiriyor"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanılamıyor"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "geçersiz üstkaynak '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Yeni kök işleme oluşturulamadı"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' geçerli bir işlemeye işaret etmiyor"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "onulmaz: böyle bir dal/işleme yok: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "böyle bir dal/işleme yok: '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Böyle bir başvuru yok: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "HEAD bir revizyona çözülemedi"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "şuraya geçilemedi: %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD güncel."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Geçerli dal %s güncel.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Geçerli dal %s güncel, yeniden temellendirme zorla yapıldı.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "%s için olan değişiklikler:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "%s -> %s değişiklikleri:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Öncelikle dal ucu üzerindeki çalışmanızı yeniden oynatmak için geri "
"sarılıyor...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "%s, %s konumuna ileri sarıldı.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dizini>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20434,7 +20630,7 @@
"denyCurrentBranch'\n"
"yapılandırma değişkenini 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20454,11 +20650,11 @@
"değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
"Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "sessiz"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Bir dizin belirtmelisiniz."
@@ -20499,7 +20695,7 @@
msgid "%s points nowhere!"
msgstr "%s hiçbir yere işaret etmiyor!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "silmek için bir başvuru günlüğü belirtilmedi"
@@ -20657,7 +20853,7 @@
msgstr ""
"izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "%s uzak konumu halihazırda var."
@@ -20667,25 +20863,30 @@
msgid "Could not setup master '%s'"
msgstr "'%s' ana dalı ayarlanamadı"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ilgilenilmemiş branch.%s.rebase=%s, 'true' olduğu var sayılıyor"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "%s başvuru belirteci için getirme haritası alınamadı"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(eşleşiyor)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(sil)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "'%s' ayarlanamadı"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20696,17 +20897,17 @@
"\t%s:%d\n"
"artık var olmayan '%s' uzak konumunu adlandırıyor."
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Böyle bir uzak konum yok: '%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20717,17 +20918,17 @@
"\t%s\n"
"\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' silinmesi başarısız"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' oluşturulması başarısız"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20741,120 +20942,120 @@
"Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n"
"onları silmek için şunu kullanın:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " izlendi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "geçersiz branch.%s.merge; birden çok dala yeniden temellendirilemiyor"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "%s uzak konumuna etkileşimli olarak yeniden temellendirir"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"%s uzak konumuna etkileşimli olarak (birleştirmelerle birlikte) yeniden "
"temellendirir"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "%s uzak konumuna yeniden temellendirir"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " %s uzak konumu ile birleştirir"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "%s uzak konumu ile birleştirir"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s ve %s uzak konumu ile birlikte\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "oluştur"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "sil"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "güncel"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "ileri sarılabilir"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "yerelin tarihi geçmiş"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s şuna zorluyor: %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s şuna itiyor: %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s şuna zorluyor: %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s şuna itiyor: %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "uzak konumları sorgulama"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* uzak konum %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL'yi getir: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(URL yok)"
@@ -20862,185 +21063,189 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL'yi it: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD dalı: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(sorgulanmadı"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(bilinmiyor)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" HEAD dalı (uzak konum HEAD'i belirsiz, aşağıdakilerden biri olabilir):\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Uzak dal:%s"
msgstr[1] " Uzak dallar:%s"
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (durum sorgulanmadı)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull' için yapılandırılan yerel dal:"
msgstr[1] " 'git pull' için yapılandırılan yerel dallar:"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " Yerel başvurular 'git pull' tarafından yansılanacak"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 'git push'%s için yapılandırılan yerel başvuru:"
msgstr[1] " 'git push'%s için yapılandırılan yerel başvurular:"
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "refs/remotes/<ad>/HEAD'i sil"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Uzak konum HEAD'i belirlenemiyor"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Birden çok uzak konum HEAD dalı. Lütfen birini açıkça seçin:"
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "%s silinemedi"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Geçerli bir başvuru değil: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "%s ayarlanamadı"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s sarkacak!"
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s sarkmaya başladı!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "%s budanıyor"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * %s [budanacak]"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * %s [budandı]"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "getirme sonrasında uzak konumları buda"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Böyle bir uzak konum yok '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "dal ekle"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "uzak konum belirtilmedi"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "tüm URL'leri döndür"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' uzak konumu için URL yapılandırılmamış"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "itme URL'lerini değiştir"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "URL ekle"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "URL'leri sil"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete bir anlam ifade etmiyor"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Geçersiz eski URL dizgisi: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Böyle bir URL bulunamadı: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Tüm itme olmayan URL'ler silinmeyecek"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<seçenekler>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21049,140 +21254,153 @@
"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n"
"devre dışı bırakın."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "%s için indeks açılamıyor"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s paketi, sarmak için pek büyük"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "geçici dosya '%s', yazma için açılamadı"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "her şeyi tek bir pakete sığdır"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-delta geçir"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-object geçir"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "--local'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "biteşlem indeksi yaz"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "yaklaşık tarih"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "-A ile, bundan daha eski nesneleri bırakma"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "baytlar"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "yukarıdakiyle aynı; ancak girdi sayısı yerine bellek boyutunu kısıtla"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "olabilecek en büyük delta derinliğini kısıtlar"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "her paket dosyasının olabilecek en büyük boyutu"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "bu paketi yeniden paketleme"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "<N> faktörlü bir geometrik ilerleme bul"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "bir precious-objects deposundaki paketler silinemiyor"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric, -A ve -a ile uyumsuz"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Paketlenecek yeni bir şey yok."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "gereken dosya eksik: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "bağlantı kaldırılamadı: %s"
@@ -21492,94 +21710,94 @@
msgid "keep"
msgstr "tut"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Geçerli bir HEAD'iniz yok."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "HEAD ağacı bulunamadı."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s ağacı bulunamadı."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD şimdi şurada: %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "sessiz ol, yalnızca hataları bildir"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "HEAD'i ve indeksi sıfırla"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "yalnızca HEAD'i sıfırla"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr ""
"yalnızca kaldırılan yolların daha sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "'%s' geçerli bir ağaç olarak çözülemedi."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"belirtilmiş yol ile --mixed artık eski; yerine 'git reset -- <yollar>' "
"kullanın."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s sıfırlamasına çıplak bir depoda izin verilmiyor"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21592,12 +21810,12 @@
"sürdü. Bundan kaçınmak için --quiet kullanabilir, öntanımlı yapmak içinse\n"
"reset.quiet yapılandırma değişkenini 'true' olarak değiştirebilirsiniz.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Yeni indeks dosyası yazılamadı."
@@ -21777,15 +21995,19 @@
msgid "preserve initially empty commits"
msgstr "başlangıçta boş olan işlemeleri koru"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "boş iletili işlemelere izin ver"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "gereksiz, boş işlemeleri tut"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "geri al başarısız"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "seç-al başarısız"
@@ -21835,71 +22057,71 @@
msgstr[0] "Aşağıdaki dosyanın yerel değişiklikleri var:"
msgstr[1] "Aşağıdaki dosyaların yerel değişiklikleri var:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "kaldırılan dosyaları listeleme"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "yalnızca indeksten kaldır"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "güncellik denetlemesini geçersiz kıl"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "özyineli kaldırmaya izin ver"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "hiçbir şey eşleşmemiş olsa bile sıfır koduyla çık"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"ilerlemek için lütfen değişikliklerinizi .gitmodules'a hazırlayın veya "
"zulalayın"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: %s kaldırılamadı"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<makine>:]<dizin> "
-"[<başvuru>...]\n"
-" --all ve açık <başvuru> tanımlaması birlikte kullanılamaz."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<makine>:]<dizin> (--all | <başvurular>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "uzak konum adı"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "durumsuz RPC protokolünü kullan"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "başvuruları stdin'den oku"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "uzak konum yardımcısından durum yazdır"
@@ -21956,21 +22178,21 @@
msgid "group by field"
msgstr "alan ile grupla"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "depo dışında çok fazla argüman verildi"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+" [--current] [--color[=<nezaman>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<bşvr> | <glob>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21983,114 +22205,114 @@
msgstr[0] "%s yok sayılıyor; %d başvurudan fazlası ele alınamıyor"
msgstr[1] "%s yok sayılıyor; %d başvurudan fazlası ele alınamıyor"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "%s ile eşleşen başvuru yok"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "uzak izleme dallarını ve yerel dalları göster"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "uzak izleme dallarını göster"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-'i dala göre renklendir"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "ortak atadan sonra <n> işleme daha göster"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "more=-+ eşanlamlısı"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "adlandırma dizilerini gizle"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "geçerli dalı içer"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "işlemeleri kendi nesne adlarıyla adlandır"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "olası birleştirme temellerini göster"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "başka başvurudan erişilemeyen başvuruları göster"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "işlemeleri ilingesel sırada göster"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "yalnızca birinci dalda olmayan işlemeleri göster"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "yalnızca bir uçtan ulaşılabilir olan birleştirmeleri göster"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "olabildiğince tarih sırasını koruyarak ilingesel biçimde sırala"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<temel>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "tabanda başlayarak en yeni <n> başvuru günlüğü girdilerini göster"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "dal verilmedi ve HEAD geçersiz"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "--reflog seçeneği için bir dal adı gerekli"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "aynı anda yalnızca %d girdi gösterilebilir"
msgstr[1] "aynı anda yalnızca %d girdi gösterilebilir"
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "böyle bir başvuru yok: %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "%d revizyondan başkası ele alınamıyor."
msgstr[1] "%d revizyondan başkası ele alınamıyor."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' geçerli bir başvuru değil."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "%s işlemesi bulunamıyor (%s)"
@@ -22160,70 +22382,84 @@
msgstr ""
"bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
+"değil"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "'%s' dizini kaldırılamadı"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "aralıklı çıkışı koni kipinde ilklendir"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "bir aralıklı indeksin kullanımını aç/kapa"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "sparse-index yapılandırması değiştirilemedi"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "'%s' açılamadı"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "'%s' yolu olağanlaştırılamadı"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "dizgileri stdin'den oku"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "çalışma dizini yenilenirken hata"
@@ -22259,7 +22495,7 @@
" [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
" [--] [<yol-blrtç>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22289,6 +22525,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
" [--] [<yol-blrtç>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<ileti>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22312,7 +22556,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "parametreli git stash clear henüz kullanılabilir değil"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22324,166 +22568,166 @@
" %s -> %s\n"
" yeniden adlandırılıyor.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "bir birleştirmenin ortasında zula uygulanamıyor"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "diff oluşturulamadı: %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "İndekste çakışmalar var. --index olmadan deneyin."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "indeks ağacı kaydedilemedi"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "%s, %s ile birleştiriliyor"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "İndeks zuladan çıkartılmamıştı."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "indeks yeniden oluşturulmaya çalışılıyor"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s bırakıldı (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Zula girdisi bırakılamadı"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bir zula başvurusu değil"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Dal adı belirtilmedi"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "ağaç ayrıştırılamadı"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "ağaçların paketi açılamadı"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "zulada yalnızca izlenmeyen dosyaları göster"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "%s, %s ile güncellenemiyor"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "zula iletisi"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Değişiklik seçilmedi"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Henüz ilk işleme yapılmamış"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Geçerli indeks durumu kaydedilemiyor"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "İzlenmeyen dosyalar kaydedilemiyor"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "'git add' yapmayı mı unuttunuz?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Kaydedilecek yerel değişiklik yok"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Zula ilklendirilemiyor"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Geçerli durum kaydedilemiyor"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "indeksi tut"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "yama kipinde zula"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "sessiz kip"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "yok sayma dosyalarını içer"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22507,7 +22751,7 @@
msgid "prepend comment character and space to each line"
msgstr "her satırın başına yorum karakteri ve boşluk koy"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
@@ -22521,27 +22765,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
+"varsayılıyor."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "göreceli yollar için alternatif tutturucu"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Giriliyor: '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22550,7 +22802,7 @@
"run_command, %s için sıfır olmayan durum döndürdü\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22560,76 +22812,67 @@
"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
"sıfır olmayan durum döndürdü"
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "her bir altmodül komutu girişinin çıktısını gizle"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "iç içe geçmiş altmodüle özyinele"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
-"varsayılıyor."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "bir altmodül ilklendirmesi çıktısını gizle"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "altmodül durum çıktısını gizle"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22637,96 +22880,96 @@
"altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
"kullan"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <yol>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(ikili nesne)->%s(altmodül)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(altmodül)->%s(ikili nesne)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "'%s' üzerinden nesne sağlaması yapılamadı"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "beklenmedik kip %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "indeksteki işlemeyi altmodül HEAD'inde olan ile karşılaştır"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "'ignore_config' değeri 'all' olan altmodülleri atla"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "özet boyutunu sınırla"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "HEAD için bir revizyon getirilemedi"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached ve --files birlikte kullanılamaz"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "'%s' için altmodül url'si eşitleniyor\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "'%s' altmodülü yolu için url kaydı yapılamadı"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "'%s' altmodülü için uzak konum güncellenemedi"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "altmodül url'si eşitleme çıktısını gizle"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22735,7 +22978,7 @@
"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil "
"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22744,47 +22987,47 @@
"Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
"'-f' kullanın"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "'%s' dizini temizlendi\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "boş altmodül dizini %s oluşturulamadı"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "tüm altmodüllerin kaydını kaldır"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
"kullanın"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22796,68 +23039,68 @@
"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
"--reference yerine --reference-if-able kullanarak klonlayın."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "dizin boş değil: '%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s' için altmodül dizini alınamadı"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "yeni altmodülün nereye klonlanacağı"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "yeni altmodülün adı"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "altmodülün klonlanacağı url konumu"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "sığ klonların derinliği"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "zorla klonla"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "boş olmayan dizine klonlamaya izin verme"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22866,82 +23109,180 @@
"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Altmodül yolu '%s' ilklendirilmedi"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init' mi kullanmak istersiniz?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Birleştirilmemiş altmodül %s atlanıyor"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "'%s' altmodülü atlanıyor"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' çıkışı yapılamadı: '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' yeniden temellendirilemedi: '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Şu altmodül yolunda '%s %s' çalıştırılamadı: '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' çıkışı yapıldı\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' üzerine yeniden temellendirildi\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Altmodül yolu '%s': '%s' içinde birleştirildi\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Altmodül yolu '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"'%s' altmodül yolunda getirme yapılamadı; %s doğrudan getirilmeye "
+"çalışılıyor:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"'%s' altmodül yolunda getirme yapıldı; ancak %s içermiyor. Bu işlemenin "
+"doğrudan getirilmesi başarısız oldu."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "çalışma ağacına giden yol"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout veya none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "paralel işler"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "klonlama işlemini yazdırma"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "güncelleme parametresi için hatalı değer"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "güncelleme çıktısını yeniden temellendirme veya birleştirme ile sustur"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "güncellemeleri zorla çıkış yap"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "yeni nesneleri uzak konumdan getirme"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"deponun taze bir klon olması durumunda güncelleme kipini geçersiz kılar"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "sığ getirme derinliği"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "superproject tarafından SHA1 bekleniyordu"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "altmodülün HEAD'inin SHA1'i"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<seçenekler>] [<yol>]"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22950,142 +23291,189 @@
"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak "
"süperproje herhangi bir dalda değil"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "'%s' altmodülü için depo tutacağı alınamadı"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "altmodüllere özyinele"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <ad> [<değer>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <ad>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "bir altmodül url ayarlanması çıktısını gizle"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "öntanımlı izleme dalını master olarak ayarla"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "öntanımlı izleme dalını ayarla"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "--branch veya --default gerekli"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch ve --default birlikte kullanılamaz"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"Eğer bu yerel git dizinini\n"
" %s\n"
-"konumundan yeniden klonlama yerine kullanmak isterseniz '--force'\n"
-"seçeneğini kullanın. Eğer bu yerel git dizini doğru depo değilse veya bunun\n"
-"ne anlama geldiğinden emin değilseniz '--name' seçeneği ile başka bir ad\n"
-"seçin.\n"
+"konumundan yeniden klonlama yerine yeniden kullanmak isterseniz\n"
+"'--force' seçeneğini kullanın. Eğer bu yerel git dizini doğru\n"
+"depo değilse veya bunun ne anlama geldiğinden emin değilseniz\n"
+"'--name' seçeneği ile başka bir ad seçin."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "'%s' altmodülü çıkış yapılamıyor"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "klonlamada çıkış yapılacak depo dalı"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "'%s' altmodülü eklenemedi"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "'%s' altmodülü kaydı yapılamadı"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' indekste halihazırda var"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' indekste halihazırda var ve bir altmodül değil"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "altmodül olarak eklenecek depo dalı"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "başka bir durumda yok sayılan altmodül yolunun eklenmesine izin ver"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<seçenekler>...] --url <url> --path <yol> --"
-"name <ad>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "yalnızca hata iletilerini yazdır"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "nesneleri başvuru depolarından ödünç al"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"altmodülün adını kendi yoluna öntanımlamak yerine verilen dizi olarak ayarlar"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' geçerli bir altmodül adı değil"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s, --super-prefix desteklemiyor"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
@@ -23110,21 +23498,21 @@
msgid "shorten ref output"
msgstr "başvuru çıktısını kısalt"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "neden"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "güncelleme nedeni"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n"
-"\t\t<etiket-adı> [<dal-ucu>]"
+"git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>]\n"
+" <etiket-adı> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23134,13 +23522,12 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
-"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>] [--"
-"points-at <nesne>]\n"
-"\t\t[--format=<biçim>] [--merged <işleme>] [--no-merged <işleme>] "
-"[<dizgi>...]"
+"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>]\n"
+" [-- points-at <nesne>] [--format=<biçim>] [--merged <işleme>]\n"
+" [--no-merged <işleme>] [<dizgi>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23205,131 +23592,131 @@
msgid "bad object type."
msgstr "hatalı nesne türü"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "etiket iletisi yok mu?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Etiket iletisi %s içinde bırakıldı\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "etiket adlarını listele"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "her etiket iletisinin <n> satırını listele"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "etiketleri sil"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "etiketleri doğrula"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Etiket oluşturma seçenekleri"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "açıklama eklenmiş etiket için bir ileti gerek"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "etiket iletisi"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "etiket iletisini zorla düzenle"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "açıklama eklenmiş ve GPG imzalı etiket"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "etiketi imzalamak için başka bir anahtar kullanın"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "eğer varsa etiketi başkasıyla değiştir"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "bir başvuru günlüğü oluştur"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Etiket listeleme seçenekleri"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "etiket listesini sütunlarla göster"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "yalnızca işlemeyi içeren etiketleri yazdır"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "yalnızca işleme içermeyen etiketleri yazdır"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "yalnızca birleştirilen etiketleri yazdır"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "yalnızca nesnenin etiketlerini yazdır"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column ve -n birbiriyle uyumsuz"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' geçerli bir etiket adı değil."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "'%s' etiketi halihazırda var"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "'%s' etiketi güncellendi (%s idi)\n"
@@ -23343,195 +23730,190 @@
msgid "failed to create directory %s"
msgstr "%s dizini oluşturulamadı"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "%s dosyası oluşturulamadı"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "%s dosyası silinemedi"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "%s dizini silinemedi"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "'%s' içindeki mtime sınanıyor "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "dizin bilgileri yeni bir dosya ekledikten sonra değişmez"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "dizin bilgileri yeni bir dizin ekledikten sonra değişmez"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "dizin bilgileri bir dosya güncellemesinden sonra değişir"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "dizin bilgileri altdizin içine yeni bir dosya ekledikten sonra değişir"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "dizin bilgileri bir dosya sildikten sonra değişmez"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "dizin bilgileri bir dizin sildikten sonra değişmez"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Tamam"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<seçenekler>] [--] [<dosya>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "refresh: altmodülleri yok say"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "yeni dosyaları yok sayma"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "çalışma ağacından eksik olan dosyaları fark et"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "indekste birleştirilmemiş girdiler olsa bile yenile"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "dosya durum bilgisini yenile"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<kip>,<nesne>,<yol>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "belirtilen girdiyi indekse ekle"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "dosyaları \"not changing\" olarak imle"
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "assumed-unchanged kısmını temizle"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "dosyaları \"index-only\" olarak imle"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "skip-worktree kısmını atla"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "'index-only' girdilerine dokunma"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "güncellenecek yol listelerini standart girdi'den oku"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "indekse standart girdi'den girdiler ekle"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "#2 ve #3 numaralı adımları listelenmiş yollar için yeniden doldur"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "yalnızca HEAD'den farklı olan girdileri güncelle"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "çalışma ağacından eksik olan dosyaları yok say"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "eylemleri standart çıktı'ya bildir"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "indeksi bu biçimle yaz"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "değiştirilmiş olarak imlenmese bile indeksi yaz"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "dosya sistemi monitöründe geçerli kısmını temizle"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23539,7 +23921,7 @@
"core.splitIndex 'false' olarak ayarlanmış; bölünmüş indeksi etkinleştirmeyi "
"gerçekten istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23547,7 +23929,7 @@
"core.splitIndex 'true' olarak ayarlanmış; bölünmüş indeksi devre dışı "
"bırakmayı gerçekten istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23555,11 +23937,11 @@
"core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleği gerçekten "
"devre dışı bırakmayı istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "İzlenmeyen önbellek devre dışı bırakıldı"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23567,29 +23949,29 @@
"core.untrackedCache 'false' olarak ayarlanmış; izlenmeyen önbelleği "
"gerçekten etkinleştirmek istiyorsanız bunu kaldırın veya değiştirin"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor ayarlanmamış; dosya sistemin monitörünü gerçekten "
"etkinleştirmek istiyorsanız onu ayarlayın"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "dosya sistemi monitörü etkin"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor ayarlanmış; dosya sistemi monitörünü gerçekten devre dışı "
"bırakmak istiyorsanız onu kaldırın"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "dosya sistemi monitörü devre dışı"
@@ -23606,19 +23988,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<seçenekler>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "başvuruyu sil"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "güncellemeleri stdin'den oku"
@@ -23634,19 +24016,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<seçenekler>] <dizin>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "tek bir istek/yanıt değiş tokuşundan sonra çık"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "ilk başvuru tanıtımından sonra hemen çık"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "git-http-backend için info/refs'i sun"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "eğer <dizin> bir Git dizini değilse <dizin>/.git/ deneme"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "aktarımı <n> saniye hareketsizlikten sonra kes"
@@ -23682,63 +24064,58 @@
msgid "print tag contents"
msgstr "etiket içeriğini yazdır"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<seçenekler>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<seçenekler>] <yol>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <ç-ağacı> <yeni-yol>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<seçenekler>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <yol>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "'%s' silinemedi"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "%s/%s kaldırılıyor: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "budanan çalışma ağaçlarını bildir"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' halihazırda var"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "kullanılamayan çalışma ağacı konumu '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23748,7 +24125,7 @@
"geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya "
"'remove' kullanın"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23757,139 +24134,139 @@
"'%s' eksik; ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n"
"geçersiz kılmak için '%s -f', temizlemek için 'prune' veya 'remove' kullanın"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "ilklendiriliyor"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "yeni bir dal oluştur"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "yeni bir dal oluştur veya sıfırla"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "yeni çalışma ağacını doldur"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "yeni çalışma ağacını kilitli tut"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "kilitleme nedeni"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "izleme kipini ayarla (bkz: git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B ve --detach birlikte kullanılamaz"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason, --lock gerektiriyor"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "--lock ile eklendi"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose ve --porcelain birlikte kullanılamaz"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' bir çalışma ağacı değil"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' halihazırda kilitli, nedeni: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' halihazırda kilitli"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' kilitli değil"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' bir ana çalışma ağacı"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "hedef adı şuradan anlaşılamadı: '%s'"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23898,7 +24275,7 @@
"kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23906,38 +24283,38 @@
"kilitli bir çalışma ağacı taşınamıyor;\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "'%s' -> '%s' taşıması başarısız"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force "
"kullanın"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23946,7 +24323,7 @@
"kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23954,17 +24331,17 @@
"kilitli bir çalışma ağacı kaldırılamıyor;\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "şunu onar %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "hata: %s: %s"
@@ -24091,17 +24468,17 @@
msgid "close failed on standard output"
msgstr "standart çıktı'da kapatma başarısız"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "%s bir yerleşik olarak ele alınamıyor"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24110,13 +24487,13 @@
"kullanım: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "'%s' komutu çalıştırılamadı: %s\n"
@@ -24163,66 +24540,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "becerileri gösterdikten hemen sonra çık"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "soket/boru halihazırda kullanımda: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "sunucu şurada başlatılamadı: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "arka plan servisi oluşturulup çalıştırılamadı"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid başarısız"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "arka plan servisi henüz çevrimiçi değil"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "arka plan servisi başlatılamadı"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid'in kafası karışmış"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "arka plan servisi henüz kapanmadı"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<ad>] [<seçenekler>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<ad>] [<iş-parçacıkları>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<ad>] [<iş-parçacıkları>] [<maks-bekl>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<ad>] [<maks-bekle>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<ad>] [<jeton>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<ad>] [<bayt-sayısı>] [<bayt>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24230,84 +24573,80 @@
"test-helper simple-ipc multiple [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
"[<parti-boyutu>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "unix ad alanının adı veya yol adı"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "named-pipe adı"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "sunucu iş parçacığı havuzundaki iş parçacığı sayısı"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "arka plan servisinin başlaaması veya durması için beklenecek saniye"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "bayt sayısı"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "iş parçacığı başına düşen istek sayısı"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "bayt"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "dengeleyici karakter"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "jeton"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "sunucuya gönderilecek komut jetonu"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer için negatif değer; %d olarak varsayılıyor"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Ortak anahtar iğnelemesi cURL < 7.44.0 tarafından desteklenmiyor"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Ortak anahtar iğnelemesi cURL < 7.39.0 tarafından desteklenmiyor"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokol sınırlamaları cURL < 7.19.4 tarafından desteklenmiyor"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"SSL arka ucu '%s' olarak ayarlanamadı: cURL, SSL arka uçları olmadan yapılmış"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24323,45 +24662,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "geçersiz sunucu yanıtı; '%s' alındı"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "'%s' deposu bulunamadı"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' için kimlik doğrulaması başarısız"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "'%s', http.pinnedPubkey yapılandırması ile erişilemiyor: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "'%s' erişilemiyor: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "şuraya yeniden yönlendiriliyor: %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
@@ -24370,83 +24714,83 @@
msgstr ""
"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: beklenmedik yanıt sonu paketi"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC başarısız oldu; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "bu kadar büyük itmeler ele alınamıyor"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "üstbilginin %d baytı alındı"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "gövdenin %d baytı hâlâ bekleniyor"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "getirme başarısız."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http taşıyıcısı %s desteklemiyor"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push başarısız"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: git'ten komut akışı okunurken hata"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
@@ -24467,45 +24811,45 @@
msgid "object filtering"
msgstr "nesne süzümü"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "son kullanım tarihi"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "işlem yok (geriye dönük uyumluluk için)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "daha ayrıntılı anlat"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "daha sessiz ol"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "iletiden boşlukları ve #yorumları çıkart"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "yol belirtecini dosyadan oku"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "anahtar"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "üzerine sıralanacak alan adı"
@@ -25192,41 +25536,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Önerilen Git çalışma akışlarına genel bakış"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ikili arama başarısız: Komut verilmedi."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "$command çalıştırılıyor"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect çalıştırılamadı:\n"
-"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect daha fazla çalıştırılamıyor"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"ikili arama başarısız oldu:\n"
-"'bisect-state $state' $res hata koduyla çıktı"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "ikili arama başarılı"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25267,52 +25576,17 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor"
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "depo URL'si: '$repo' kesin olmalı veya ./|../ ile başlamalıdır"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' indekste halihazırda var"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' çıkış yapılan bir işlemeye iye değil"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü eklenemedi"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü kaydı yapılamadı"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı"
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "'$sm_path' altmodül yolunda getirme yapılamadı"
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25321,395 +25595,11 @@
"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
"bulunamadı"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan "
-"getirilmeye çalışılıyor"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"'$displaypath' altmodül yolunda getirme tamamlandı; ancak $sha1 içermiyor. "
-"Bu işlemenin doğrudan getirilmesi başarısız oldu."
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda '$command $sha1' çalıştırılamadı"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Kendiliğinden zulalama uygulandı."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "$stash_sha1 depolanamıyor"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Kendiliğinden zulalama uygulaması çakışmalara neden oldu.\n"
-"Değişiklikleriniz zula içerisinde güvende.\n"
-"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Yeniden temellendiriliyor ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Komutlar:\n"
-"p, pick <işleme> = işlemeyi kullan\n"
-"r, reword <işleme> = işlemeyi kullan; ancak işleme iletisini düzenle\n"
-"e, edit <işleme> = işlemeyi kullan; ancak değiştirme için dur\n"
-"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
-"f, fixup <işleme> = \"squash\" gibi; ancak bu işlemenin günlük iletisini at\n"
-"x, exec <işleme> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
-"d, drop <işleme> = işlemeyi kaldır\n"
-"l, label <etiket> = geçerli HEAD'i bir ad ile etiketle\n"
-"t, reset <etiket> = HEAD'i bir etikete sıfırla\n"
-"m, merge [-C <işleme> | -c <işleme>] <etiket> [# <tek-satır>]\n"
-". orijinal birleştirme işlemesi iletisini kullanarak bir\n"
-". birleştirme işlemesi oluştur (veya teksatır, eğer bir orijinal\n"
-". birleştirme işlemesi belirtilmemişse). İşleme iletisini yeniden\n"
-". yazmak için -c <işleme> kullanın.\n"
-"\n"
-"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: seçilebilecek bir işleme değil"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Geçersiz işleme adı: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Geçerli işlemenin yerine geçecek sha1 yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Şuraya ileri sar: $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Şuraya ileri sarılamıyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "HEAD şuraya taşınamıyor: $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Bir birleştirmeyi tıkıştırma reddediliyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "$sha1 birleştirmesi yeniden yapılırken hata"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "$sha1 seçilemedi"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "İşleme iletisi #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "İşleme iletisi #${n} atlanacak:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Bu $count işlemenin bir birleşimidir."
-msgstr[1] "Bu $count işlemenin bir birleşimidir."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "$fixup_msg yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Bu 2 işlemenin bir birleşimidir."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "$sha1... $rest uygulanamadı"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"$sha1... $rest başarıyla seçildikten sonra işleme değiştirilemedi.\n"
-"Bu büyük olasılıkla boş bir işleme iletisinden veya pre-commit kancasının\n"
-"başarısız olmasından kaynaklıdır. Eğer pre-commit kancası başarısız olduysa\n"
-"işlemeyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Şurada duruldu: $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Öncesinde bir işleme olmadan '$squash_style' yapılamıyor"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Çalıştırılıyor: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Çalıştırma başarısız: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yaptı"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sorunu çözüp sürdürmek için şunu çalıştırın\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Çalıştırma başarılı: $rest\n"
-"ancak indekse ve/veya çalışma ağacına değişiklikler bıraktı.\n"
-"Değişikliklerinizi işleyin veya zulalayın, ardından şunu çalıştırın:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Bilinmeyen komut: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name başarıyla yeniden temellendirildi ve güncellendi."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
-"Eğer bu değişiklikleri bir önceki işlemeye eklenmesi\n"
-"gerekiyorsa şu komutu çalıştırın:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Eğer yeni bir işleme içinse şunu çalıştırın:\n"
-"\n"
-"\tgit commit $gpg_sign_opt_quoted\n"
-"\n"
-"Her iki durumda da işinizi bitirdikten sonra şununla sürdürün:\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "İşlemeyi değiştirmek için yazar kimliğini bulmaya çalışırken hata"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce onları\n"
-"işleyin ve ardından yeniden 'git rebase --continue' çalıştırın."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Hazırlanan değişiklikler işlenemedi."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Düzenleyici çalıştırılamadı"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "$switch_to çıkışı yapılamadı"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "HEAD yok mu?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Geçici $state_dir oluşturulamadı"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Etkileşimli olarak imlenemedi"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-msgstr[1] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Boş işlemelerin yorum olarak varsayıldığını kenara yazın."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Yeniden yazılan işlemeler ilklendirilemedi"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25726,49 +25616,28 @@
msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz"
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz "
-"var."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: İndeksinizde işlenmemiş "
-"değişiklikleriniz var."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "$action yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "Ek olarak, indeksinizde işlenmemiş değişiklikleriniz var."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bu komutu çalışma ağacının en üst düzeyinden çalıştırmanız gerekiyor."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Git dizininin kesin yolu algılanamıyor"
@@ -26403,7 +26272,7 @@
msgid "Result: OK\n"
msgstr "Sonuç: Tamam\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "%s dosyası açılamıyor"
@@ -26428,30 +26297,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s' çalıştırılamadı"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "ileti 7 bit olarak gönderilemiyor"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "geçersiz aktarım kodlaması"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26462,12 +26331,12 @@
"%s\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "%s açılamıyor: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26476,28 +26345,13 @@
"onulmaz: %s:%d, 998 karakterden uzun\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s, yedek sonek '%s' ile atlanıyor.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
-
-#~ msgid "unable to write stateless separator packet"
-#~ msgstr "durumsuz ayırıcı paketi yazılamıyor"
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "uzak sunucu durumsuz ayırıcı gönderdi"
diff --git a/po/vi.po b/po/vi.po
index 40b9996..be197ab 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.33.0-rc2\n"
+"Project-Id-Version: git v2.34.0 round 3\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 14:53+0700\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-11 13:18+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"
@@ -21,216 +21,216 @@
"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"X-Generator: Poedit 3.0\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "nhị phân"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "không có gì"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "không thay đổi"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "Cập nhật"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "không thể đưa “%s” lên bệ phóng"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "không thể ghi bảng mục lục"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "đã cập nhật %d đường dẫn\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, 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”"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "Hoàn nguyên"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "Không thể phân tích cú pháp HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "đã hoàn nguyên %d đường dẫn\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Không có tập tin nào chưa được theo dõi.\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Thêm các cái chưa được theo dõi"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "đã thêm %d đường dẫn\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Xem xét lại diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "hiển thị đường dẫn với các thay đổi"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr ""
"thêm trạng thái cây làm việc vào tập hợp các thay đổi đã được đưa lên bệ "
"phóng"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr ""
"hoàn nguyên lại tập hợp các thay đổi đã được đưa lên bệ phóng trở lại phiên "
"bản HEAD"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "chọn các “khúc” và cập nhật có tuyển chọn"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "xem khác biệt giữa HEAD và mục lục"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
"thêm nội dung của các tập tin chưa được theo dõi vào tập hợp các thay đổi đã "
"được đưa lên bệ phóng"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "Trợ giúp về nhắc:"
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "chọn một mục đơn"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "chọn một vùng các mục"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "chọn nhiều vùng"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "chọn mục dựa trên tiền tố duy nhất"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "bỏ chọn các mục đã cho"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "chọn tất cả các mục"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "(để trống) hoàn tất chọn lựa"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "tùy chọn mục bằng số"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "(để trống) không chọn gì"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "Giờ thì sao"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "đã đưa lên bệ phóng"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "đường-dẫn"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "không thể đọc lại bảng mục lục"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
@@ -604,7 +604,7 @@
"Lines starting with %c will be removed.\n"
msgstr ""
"---\n"
-"Để gỡ bỏ dòng “%c”, sửa chúng thành những dòng ' ' (ngữ cảnh).\n"
+"Để gỡ bỏ dòng “%c”, sửa chúng thành những dòng “ ” (ngữ cảnh).\n"
"Để gõ bỏ dòng “%c”, xóa chúng đi.\n"
"Những dòng bắt đầu bằng %c sẽ bị loại bỏ.\n"
@@ -745,7 +745,7 @@
msgid "'git apply' failed"
msgstr "“git apply” gặp lỗi"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -754,45 +754,47 @@
"\n"
"Tắt lời nhắn này bằng \"git config advice.%s false\""
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sgợi ý: %.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện chuyển giao được bởi vì bạn có những tập tin chưa được "
+"hòa trộn."
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hòa trộn bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện kéo về bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hoàn nguyên bởi vì bạn có những tập tin chưa được hòa "
+"trộn."
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:270
+#: advice.c:196
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."
@@ -800,41 +802,49 @@
"Sửa chúng trong cây làm việc, 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:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
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:285
+#: advice.c:211
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:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
-#: advice.c:296
+#: advice.c:217
+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."
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"Các đặc tả đường dẫn sau đây không khớp với bất kỳ đường dẫn thích hợp nào,\n"
-"nhưng chúng khớp với các mục mục lục bên ngoài \"sparse checkout\" hiện "
-"tại:\n"
+"Các đường dẫn và/hoặc đặc tả đường dẫn sau đây khớp với các đường dẫn tồn "
+"tại\n"
+"bên ngoài định nghĩa “sparse-checkout” của bạn, vì vậy sẽ không\n"
+"cập nhật trong chỉ mục:\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
msgstr ""
-"Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật các "
-"mục như vậy."
+"Nếu bạn có ý định cập nhật các mục như vậy, hãy thử một trong các mục sau:\n"
+"* Sử dụng tùy chọn --sparse.\n"
+"* Vô hiệu hóa hoặc sửa đổi các quy tắc thưa thớt."
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1013,48 +1023,48 @@
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"
-#: apply.c:1977
+#: apply.c:1978
#, 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"
-#: apply.c:2014
+#: apply.c:2015
#, 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"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác” tại dòng %d"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay đọc %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%c”"
-#: apply.c:3056
+#: apply.c:3057
#, 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)."
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Ngữ cảnh bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1063,448 +1073,449 @@
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, 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”"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành "
"“%s”"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy "
"đủ"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại."
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "không thể đọc postimage %s cần thiết cho “%s”"
-#: apply.c:3201
+#: apply.c:3202
#, 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”"
-#: apply.c:3208
+#: apply.c:3209
#, 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)"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
-#: apply.c:3412
+#: apply.c:3413
#, 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"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "kho thiếu đối tượng blob cần thiết để thực hiện hòa trộn “3-way”."
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "Đang thực hiện hòa trộn “3-đường”…\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "không thể đọc nội dung hiện hành của “%s”"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "Gặp lỗi khi thực hiện hòa trộn kiểu “three-way”…\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Đã áp dụng miếng vá %s với các xung đột.\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "Đang trở lại ứng dụng chi phối…\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "loại bỏ miếng vá để lại nội dung tập tin"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "đường dẫn không hợp lệ “%s”"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: apply.c:3976
+#: apply.c:3998
#, 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)"
-#: apply.c:3981
+#: apply.c:4003
#, 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"
-#: apply.c:4001
+#: apply.c:4023
#, 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"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "không thể ghi mục lục tạm vào %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4319
+#: apply.c:4341
#, 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"
-#: apply.c:4327
+#: apply.c:4349
#, 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"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4559
+#: apply.c:4581
#, 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…"
-#: apply.c:4570
+#: apply.c:4592
#, 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"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "Đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "Bỏ qua đường dẫn “%s”."
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4937
+#: apply.c:4959
#, 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"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
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"
-#: apply.c:4995
+#: apply.c:5017
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"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "số"
-#: apply.c:5001
+#: apply.c:5023
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"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:5006
+#: apply.c:5028
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"
-#: apply.c:5010
+#: apply.c:5032
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"
-#: apply.c:5012
+#: apply.c:5034
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"
-#: apply.c:5014
+#: apply.c:5036
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"
-#: apply.c:5016
+#: apply.c:5038
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"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”"
-#: apply.c:5020
+#: apply.c:5042
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"
-#: apply.c:5022
+#: apply.c:5044
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"
-#: apply.c:5025
+#: apply.c:5047
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)"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr ""
"thử hòa trộn kiểu three-way, quay lại dán bình thường nếu không thể thực "
"hiện được"
-#: apply.c:5029
+#: apply.c:5051
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"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "hành động"
-#: apply.c:5036
+#: apply.c:5058
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"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng ngữ cảnh"
-#: apply.c:5049
+#: apply.c:5071
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"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "chi tiết"
-#: apply.c:5054
+#: apply.c:5076
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"
-#: apply.c:5057
+#: apply.c:5079
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"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "gốc"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
@@ -1516,7 +1527,7 @@
#: archive-tar.c:265 archive-zip.c:358
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "chế độ tập tin lục không được hỗ trợ: 0%o (SHA1: %s)"
+msgstr "chế độ tập tin không được hỗ trợ: 0%o (SHA1: %s)"
#: archive-tar.c:450
#, c-format
@@ -1576,152 +1587,151 @@
msgid "cannot read %s"
msgstr "không thể đọc %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "không thể đọc “%s”"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, 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:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "không có tham chiếu nào như thế: %.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "không phải là đối tượng cây: “%s”"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "thư mục làm việc hiện hành chưa được theo dõi"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "Không tìm thấy tập tin: %s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "Không phải một tập tin thường: %s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:554
+#: archive.c:553
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:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "tập_tin"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "thêm các tập tin không được theo dõi vào kho lưu"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:562
+#: archive.c:561
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:564
+#: archive.c:563
msgid "set compression level"
msgstr "đặt mức nén"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "kho"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
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:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "lệnh"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-archive trên máy chủ"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "Gặp tùy chọn không cần --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "Các tùy chọn --add-file và --remote không thể sử dụng cùng với nhau"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s không phải tên thuộc tính hợp lệ"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s không được phép: %s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1729,22 +1739,22 @@
"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."
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Nội dung được trích dẫn sai trong tập tin “%s”: %s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1753,7 +1763,7 @@
"Hòa trộn trên %s là sai.\n"
"Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1762,7 +1772,7 @@
"Hòa trộn trên %s là mới.\n"
"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1771,7 +1781,7 @@
"Hòa trộn trên %s là %s.\n"
"Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1782,7 +1792,7 @@
"git bisect không thể làm việc đúng đắn trong trường hợp này.\n"
"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1794,36 +1804,36 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s là cả %s và %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1832,7 +1842,7 @@
"Không tìm thấy lần chuyển giao kiểm tra được nào.\n"
"Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1841,7 +1851,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1860,11 +1870,12 @@
msgstr ""
"cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
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"
@@ -2046,8 +2057,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
@@ -2103,7 +2114,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "không thể ghi phiên bản bundle %d với thuật toán %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
@@ -2145,7 +2156,7 @@
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "phiên bản băm không hợp lệ"
@@ -2192,202 +2203,202 @@
msgid "unable to find all commit-graph files"
msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
"vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
"bị hỏng"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "không thể tìm thấy lần chuyển giao %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "không thể lấy kiểu của đối tượng “%s”"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr ""
"Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
"chuyển giao"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "Đang tính mức hình học tô-pô tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "Đang tính toán chuyển giao các bộ lọc Bloom đường dẫn bị thay đổi"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "Đang sưu tập các lần chuyển giao được tham chiếu"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "gặp lỗi thêm gói %s"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "gặp lỗi khi mở mục lục cho “%s”"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
"tượng đã đóng gói"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "không thể tạo lớp sơ đồ tạm thời"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "không thể chỉnh sửa quyền chia sẻ thành “%s”"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "Đang quét các lần chuyển giao đã hòa trộn"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr ""
"cố gắng để ghi một đồ thị các lần chuyển giao, nhưng “core.commitGraph” bị "
"vô hiệu hóa"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
"đã hỏng"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
"%u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
"thị lần chuyển giao"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
"%s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
"dứt quá sớm"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2395,7 +2406,7 @@
"đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
"nhưng không phải số không ở chỗ khác"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2403,32 +2414,32 @@
"đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
"giao %s, nhưng số không ở chỗ khác"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
"tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < "
"%<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là "
"%<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2448,28 +2459,28 @@
"Tắt lời nhắn này bằng cách chạy\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1237
+#: commit.c:1239
#, 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."
-#: commit.c:1241
+#: commit.c:1243
#, 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."
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: commit.c:1247
+#: commit.c:1249
#, 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"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2483,7 +2494,7 @@
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2498,35 +2509,35 @@
"\t%s\n"
"Nguyên nhân có thể là gồm quẩn vòng."
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "không thể khai triển đường dẫn “%s”"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "các bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "định dạng cấu hình không hợp lệ: %s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
-msgstr "thiếu tên biến môi trường cho cấu hình '%.*s'"
+msgstr "thiếu tên biến môi trường cho cấu hình “%.*s”"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "thiếu biến môi trường '%s' cho cấu hình '%.*s'"
+msgstr "thiếu biến môi trường “%s” cho cấu hình “%.*s”"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "khóa không chứa một phần: %s"
@@ -2536,297 +2547,297 @@
msgid "key does not contain variable name: %s"
msgstr "khóa không chứa bất kỳ một tên biến nào: %s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "khóa không hợp lệ (dòng mới): %s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "khóa cấu hình trống rỗng"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "tham số cấu hình không có thực: %s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "định dạng không có thực trong %s"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "số lượng không có thực trong %s"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "quá nhiều mục tin trong %s"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "thiếu khóa cấu hình “%s”"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "thiếu giá trị cấu hình “%s”"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "cấu hình sai tại dòng %d trong %s"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "sai giá trị kiểu lô-gíc của cấu hình “%s” cho “%s”"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”"
-#: config.c:1284
+#: config.c:1268
#, 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ệ"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar chỉ được có một ký tự"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "giá trị cho %s sai dạng"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "giá trị cho %s sai dạng: %s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "không thể tải đối tượng blob cấu hình “%s”"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "tham chiếu “%s” không chỉ đến một blob nào cả"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "không thể phân giải điểm xét duyệt “%s”"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "gặp lỗi khi phân tích cú pháp %s"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "tên của phần không hợp lệ “%s”"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "không thể khóa tập tin cấu hình %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "đang mở “%s”"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "mẫu không hợp lệ: %s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "tập tin cấu hình “%s” không hợp lệ"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "không thể mmap “%s”%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "chmod trên %s gặp lỗi"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "không thể ghi tập tin cấu hình “%s”"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "tên của phần không hợp lệ: %s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "thiếu giá trị cho cho “%s”"
@@ -2861,72 +2872,72 @@
msgid "expected flush after capabilities"
msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "bỏ qua capabilities sau dòng đầu tiên “%s”"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "lỗi giao thức: không cần capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "lỗi giao thức: cần sha-1 shallow, nhưng lại nhận được “%s”"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "kho đã ở điểm cuối khoác nên không thể được shallow"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "gói không hợp lệ"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "lỗi giao thức: không cần “%s”"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "không hiểu định dạng đối tượng “%s” được chỉ định bởi máy phục vụ"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "trả về của ls-refs không hợp lệ: %s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "cần đẩy dữ liệu lên đĩa sau khi liệt kê tham chiếu"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "cần nhận được trả lời là kết thúc gói sau khi liệt kê tham chiếu"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "giao thức “%s” chưa được hỗ trợ"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "Đang tìm kiếm %s … "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "không tìm được %s (cổng %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2935,7 +2946,7 @@
"xong.\n"
"Đang kết nối đến %s (cổng %s) … "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2945,77 +2956,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "hoàn tất."
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "không thể tìm thấy %s (%s)"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "không hiểu cổng %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "đã khóa tên máy lạ “%s”"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "đã khóa cổng lạ “%s”"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "không thể khởi chạy ủy nhiệm “%s”"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "chưa chỉ định đường dẫn; xem'git help pull” để biết cú pháp url hợp lệ"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "newline bị cấm trong các git:// máy chủ và đường dẫn repo"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh biến thể “simple” không hỗ trợ -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh biến thể “simple” không hỗ trợ -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "đã khóa tên đường dẫn lạ “%s”"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "không thể rẽ nhánh tiến trình con"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
@@ -3159,17 +3170,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "từ chối làm việc với giấy chứng thực thiếu trường giao thức"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "url có chứa một dấu xuống dòng trong thành phần %s của nó: %s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "url không có lược đồ: %s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "không thể phân tích cú pháp giấy chứng thực url: %s"
@@ -3263,23 +3274,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "không hiểu giá trị cho --diff-merges: %s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base không hoạt động với phạm vi"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base chỉ hoạt động với các lần chuyển giao"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "không thể lấy HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "không tìm thấy cơ sở để hòa trộn"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "có nhiều cơ sở để hòa trộn"
@@ -3295,17 +3306,17 @@
"Không phải là một thư mục git. Dùng --no-index để so sánh hai đường dẫn bên "
"ngoài một cây làm việc"
-#: diff.c:156
+#: diff.c:157
#, 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:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%s”\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3313,7 +3324,7 @@
"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, "
"“zebra”, “dimmed-zebra”, “plain”"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3323,7 +3334,7 @@
"change”, “ignore-space-at-eol”, “ignore-all-space”, “allow-indentation-"
"change”"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3331,12 +3342,12 @@
"color-moved-ws: allow-indentation-change không thể tổ hợp cùng với các chế "
"độ khoảng trắng khác"
-#: diff.c:410
+#: diff.c:411
#, 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:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3345,26 +3356,26 @@
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, 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:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr ""
"-G và --pickaxe-regex là loại trừ lẫn nhau, dùng --pickaxe-regex với -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
@@ -3372,22 +3383,22 @@
"tùy chọn --pickaxe-all và --find-object loại từ lẫn nhau, hãy dùng --pickaxe-"
"all với -G và -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "giá trị --stat không hợp lệ: “%s”"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "tùy chọn “%s” cần một giá trị bằng số"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3396,42 +3407,42 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s cần dạng <n>/<m>"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s cần một ký tự, nhưng lại nhận được “%s”"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "đối số --color-moved sai: %s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3439,155 +3450,155 @@
"tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
"\"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "tham số cho %s không hợp lệ"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s”"
-#: diff.c:5287
+#: diff.c:5295
#, 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”"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "đối số --word-diff sai: %s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "tạo miếng vá"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "tạo khác biệt ở định dạng thô"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "đồng nghĩa với “-p --raw”"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "đồng nghĩa với “-p --stat”"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "--stat thuận tiện cho máy đọc"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "chỉ xuất những dòng cuối của --stat"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<tham_số_1,tham_số_2>…"
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "đồng nghĩa với --dirstat=cumulative"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "chỉ hiển thị tên của các tập tin đổi"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "tạo diffstat"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<rộng>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "tạo diffstat với độ rộng đã cho"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "tạo diffstat với tên độ rộng đã cho"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "tạo diffstat với độ rộng đồ thị đã cho"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<số_lượng>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "tạo diffstat với các dòng bị giới hạn"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "tạo tổng hợp xúc tích trong diffstat"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
"\""
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "hiển thị thay đổi được tô màu"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<kiểu>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3595,7 +3606,7 @@
"tô sáng các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” "
"trong khác biệt"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3603,89 +3614,89 @@
"không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra "
"trong --raw hay --numstat"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<tiền_tố>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
"định"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<ký_tự>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "Tùy chọn khác biệt đổi tên"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "dò tìm các tên thay đổi"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "dò bản sao"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "tắt dò tìm đổi tên"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "dùng các blob trống rống như là nguồn đổi tên"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3693,160 +3704,160 @@
"ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
"quá giới hạn đưa ra"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "Tùy chọn thuật toán khác biệt"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "sản sinh khác biệt ít nhất có thể"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "bỏ qua các thay đổi có tất cả các dòng khớp <regex>"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<thuật toán>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "chọn một thuật toán khác biệt"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<văn bản>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<chế độ>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "dùng <regex> để quyết định từ là cái gì"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "cách bỏ qua khoảng trắng trong --color-moved"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "Các tùy chọn khác biệt khác"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các "
"đường dẫn liên quan"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "coi mọi tập tin là dạng văn bản thường"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "tắt mọi kết xuất của chương trình"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị "
"phân"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<khi>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<định dạng>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "ẩn các mục “git add -N” từ bảng mục lục"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<chuỗi>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3854,7 +3865,7 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
"chuỗi được chỉ ra"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3862,35 +3873,35 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
"thức chính quy được chỉ ra"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<đường-dẫn>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "hiển thị các thay đổi trong đường dẫn đã cho đầu tiên"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "bỏ qua đầu ra đến đường dẫn đã cho"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<mã-số-đối-tượng>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3898,32 +3909,32 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
"tượng được chỉ ra"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "chọn các tập tin theo kiểu khác biệt"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<tập_tin>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "Xuất ra một tập tin cụ thể"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "nhận thấy đổi tên toàn diện đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3936,7 +3947,7 @@
msgid "failed to read orderfile '%s'"
msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
@@ -3974,338 +3985,417 @@
msgid "cannot use %s as an exclude file"
msgstr "không thể dùng %s như là một tập tin loại trừ"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "không thể mở thư mục “%s”"
-#: dir.c:2653
+#: dir.c:2766
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:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Không đoán được thư mục tên là gì.\n"
+"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "không thể tạo thư mục cho %s"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di dời thư mục git từ “%s” sang “%s”"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "gợi ý: Chờ trình biên soạn của bạn đóng tập tin…%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "Nội dung lọc"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "không thể lấy thống kê tập tin “%s”"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "đường dẫn không gian tên git \"%s\" sai"
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "không thể đặt GIT_DIR thành “%s”"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "quá nhiều tham số để chạy %s"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "không thể ghi lên máy phục vụ"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "không tìm thấy đối tượng: %s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "xong"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "Máy chủ hỗ trợ %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "Máy chủ không hỗ trợ máy khách shallow"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "Máy chủ không hỗ trợ định dạng đối tượng của kho này"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "kho nguồn là nông, nên bỏ từ chối nhân bản."
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "các thuật toán không khớp nhau: máy khách %s; máy chủ %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "máy chủ không hỗ trợ thuật toán “%s”"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "Máy chủ hỗ trợ bộ lọc"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "không thể ghi các yêu cầu lên máy phục vụ"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "cần “%s”, nhưng lại nhận “%s”"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "gặp dòng không được thừa nhận: “%s”"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "cần tập tin gói để gửi sau “ready”"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "không cần thêm phần nào để gửi sau “ready”"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "lỗi xử lý thông tin shallow: %d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref không được mong đợi: “%s”"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "lỗi khi xử lý wanted refs: %d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: cần nhận được trả lời là kết thúc gói"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
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"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
-msgstr "gặp 'ready' đột xuất từ máy chủ"
+msgstr "gặp “ready” đột xuất từ máy chủ"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "không có máy chủ tham chiếu nào như %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile cần được cấu hình và tồn tại để xác minh chữ ký "
+"ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify là cần thiết để xác minh chữ ký ssh (có "
+"sẵn trong phiên bản openssh 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "tập tin thu hồi chữ ký ssh đã được cấu hình nhưng không tìm thấy: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "chữ sai / không tương thích “%s”"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "gặp lỗi khi lấy dấu vân tay ssh cho khóa “%s”"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"hoặc là user.signingkey hoặc gpg.ssh.defaultKeyCommand cần được cấu hình"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand thành công nhưng lại không trả về khóa nào: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey cần được đặt cho ký ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gặp lỗi khi ghi chìa khóa ký ssh vào “%s”"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "gặp lỗi khi ghi bộ đệm chìa khóa ký ssh vào “%s”"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign là cần thiết cho ký ssh (sẵn có trong openssh phiên bản "
+"8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gặp lỗi khi đọc bộ đệm dữ liệu chữ ký ssh từ “%s”"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4313,109 +4403,109 @@
"mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -"
"P dưới PCRE v2"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "bắt đầu một vùng làm việc (xem thêm: git help tutorial)"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "làm việc trên thay đổi hiện tại (xem thêm: git help everyday)"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "xem xét lịch sử tình trạng (xem thêm: git help revisions)"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "thêm, ghi dấu và chỉnh lịch sử chung của bạn"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "làm việc nhóm (xem thêm: git help workflows)"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "Các lệnh Porcelain chính"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "Lệnh/thao tác thứ cấp"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "Lệnh/bộ hỏi thứ cấp"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "Tương tác với những cái khác"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "Lệnh/thao tác ở mức thấp"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "Lệnh/bộ hỏi ở mức thấp"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "Lệnh/Đồng bộ kho ở mức thấp"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:"
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "không hỗ trợ liệt kê lệnh kiểu “%s”"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Các chỉ dẫn khái niệm về Git là:"
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Xem “git help <lệnh>” để đọc các đặc tả của lệnh con"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "Các lệnh bên ngoài"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "Các bí danh lệnh"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4424,31 +4514,36 @@
"“%s” trông như là một lệnh git, nhưng chúng tôi không\n"
"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”."
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả."
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn."
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Tiếp tục và coi rằng ý bạn là “%s”."
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Chạy “%s” để thay thế? (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Tiếp tục trong %0.1f giây,và coi rằng ý bạn là “%s”."
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4459,16 +4554,16 @@
"\n"
"Những lệnh giống nhất là"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<các tùy chọn>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4479,6 +4574,15 @@
"\n"
"Có phải ý bạn là một trong số những cái này không?"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
+"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "Chưa biết định danh tác giả\n"
@@ -4541,7 +4645,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
@@ -4633,9 +4737,14 @@
#: ls-refs.c:37
#, c-format
msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "giá trị '%s' không hợp lệ cho lsrefs.unborn"
+msgstr "giá trị “%s” không hợp lệ cho lsrefs.unborn"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "dòng không cần: “%s”"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "cần đẩy dữ liệu lên đĩa sau tham số ls-refs (liệt kê tham chiếu)"
@@ -4643,39 +4752,39 @@
msgid "quoted CRLF detected"
msgstr "phát hiện CRLF được trích dẫn"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "thao tác sai “%s” cho “%s”"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-"
"trộn)"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4684,7 +4793,7 @@
"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có cách giải quyết:\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4701,7 +4810,7 @@
"\n"
"cái mà sẽ chấp nhận gợi ý này.\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4710,21 +4819,21 @@
"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có nhiều cách giải quyết:\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4733,7 +4842,7 @@
"XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
"của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s."
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4742,7 +4851,7 @@
"XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; "
"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4753,7 +4862,7 @@
"thành; nó đã bị đổi tên thành nhiều thư mục khác, với không đích đến nhận "
"một phần nhiều của các tập tin."
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4762,7 +4871,7 @@
"CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
"bị đổi tên."
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4771,7 +4880,7 @@
"Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
"đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4780,7 +4889,7 @@
"Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
"thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4789,7 +4898,7 @@
"XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
"đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4798,13 +4907,13 @@
"XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
"mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s."
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4815,23 +4924,23 @@
"VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung "
"đột lồng nhau."
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4840,7 +4949,7 @@
"XUNG ĐỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di "
"chuyển nó đến %s."
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4849,7 +4958,7 @@
"XUNG ĐỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở mỗi bên; đã đổi "
"tên cả hai trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4858,24 +4967,24 @@
"XUNG ĐỘT (các kiểu riêng biệt): %s có các loại khác nhau ở mỗi bên; đã đổi "
"tên một trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "nội dung"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4884,7 +4993,7 @@
"XUNG ĐỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4896,12 +5005,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4911,109 +5020,109 @@
"hòa trộn:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "Đã cập nhật rồi."
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "(commit sai)\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị "
"bãi bỏ."
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, 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:883
+#: merge-recursive.c:892
#, 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:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, 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:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể đọc đối tượng %s “%s”"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "mong đợi đối tượng blob cho %s “%s”"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "gặp lỗi khi mở “%s”: %s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, 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:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:"
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao "
"theo sau hòa trộn)"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào "
"%s."
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5022,7 +5131,7 @@
"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:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5031,7 +5140,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree)."
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5040,7 +5149,7 @@
"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:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5049,45 +5158,45 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %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:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên "
"đường."
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, 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:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm "
"thành %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5096,17 +5205,17 @@
"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:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5117,7 +5226,7 @@
"vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến "
"nhận một phần nhiều của các tập tin."
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5126,80 +5235,80 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
"%s->%s trong %s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, 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:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, 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:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục."
@@ -5207,190 +5316,222 @@
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
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"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "fanout OID nhiều gói chỉ mục có kích thước sai"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "không nhận ra phiên bản %d của multi-pack-index"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "phiên bản băm multi-pack-index %u không khớp phiên bản %u"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id sai: %u (%u các gói tổng)"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gặp lỗi khi mở pack-index “%s”"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "không thể phân tích cú pháp dòng: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "dòng dị hình: %s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "bỏ qua multi-pack-index sẵn có; tổng kiểm không khớp"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "không thể tải gói"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "không thể mở mục lục cho %s"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "Đang thêm tập tin gói từ multi-pack-index"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "đã không thấy tập tin gói %s để mà xóa"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "không hiểu \"preferred pack\": %s"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "không thể chọn gói ưa dùng %s với không đối tượng nào"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "đã không thấy tập tin gói %s để mà xóa"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "\"preferred pack\" “%s” đã hết hạn"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "không có tập tin gói để đánh mục lục."
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "không thể ghi “multi-pack bitmap”"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "không thể ghi “multi-pack-index”"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi phân tích cú pháp"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "tổng kiểm không đúng"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "Đang khóa cho các gói bị tham chiếu"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx chẳng chứa oid nào"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "Đang thẩm tra các khoảng bù đối tượng"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "Đang đếm các đối tượng được tham chiếu"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "Đang tìm và xóa các gói không được tham chiếu"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "không thể lấy thông tin thống kê về các đối tượng gói"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "không thể hoàn thiện các đối tượng gói"
@@ -5451,259 +5592,259 @@
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "không thể fdopen tập tin khóa thay thế"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "không thể đọc tập tin thay thế"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "đường dẫn “%s” không tồn tại"
-#: object-file.c:789
+#: object-file.c:722
#, 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ợ."
-#: object-file.c:795
+#: object-file.c:728
#, 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ộ."
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s” là nông"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap gặp lỗi%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "tập tin đối tượng %s trống rỗng"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "đối tượng mất hỏng “%s”"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gặp rác tại cuối của đối tượng bị mất “%s”"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "kiểu đối tượng không hợp lệ"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "không thể giải gói phần đầu %s"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "không thể phân tích phần đầu của “%s”"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "kiểu đối tượng không hợp lệ"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "không thể giải gói phần đầu %s"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "phần đầu cho %s quá dài, vượt quá %d byte"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "gặp lỗi khi đọc đối tượng “%s”"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "c%s thay thế không được tìm thấy cho %s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "không thể ghi tập tin %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "không thể đặt quyền thành “%s”"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "lỗi ghi tập tin"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "không thể ghi tập tin đối tượng đã mất"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "không thể xả nén đối tượng mới %s (%d)"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "gặp lỗi utime() trên “%s”"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "không thể đọc đối tượng cho %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "lần chuyển giao sai hỏng"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "thẻ sai hỏng"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "gặp lỗi đọc khi đánh mục lục %s"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "không đọc ngắn khi đánh mục lục %s"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: kiểu tập tin không được hỗ trợ"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s không phải là một đối tượng hợp lệ"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mã băm không khớp cho %s (cần %s)"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "không thể mmap %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "không thể giải gói phần đầu của “%s”"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "không thể phân tích phần đầu của “%s”"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "không thể giải gói nội dung của “%s”"
@@ -5832,12 +5973,25 @@
msgid "hash mismatch %s"
msgstr "mã băm không khớp %s"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "ánh xạ multi-pack thiếu mục lục để dành cần thiết"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: không thể mở gói"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "không thể lấy kích cỡ của %s"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "không thể tìm thấy %s trong gói “%s” tại vị trí %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "không thể dung lượng đĩa đã dùng của %s"
@@ -5867,46 +6021,46 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "tệp chỉ mục ngược %s có id mã băm không được hỗ trợ %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "không thể cùng lúc đọc và xác minh được bảng mục lục đảo ngược"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "không thể lấy thông tin thống kê: %s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "gặp lỗi làm cho %s đọc được"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "không thể ghi tập tin promisor “%s”"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "tập tin gói %s không thể được ánh xạ %s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "tùy chọn “%s” cần một giá trị bằng số"
@@ -5926,71 +6080,71 @@
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%s”"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "“%s” yêu cầu một giá trị"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s là xung khắc với %s"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s : xung khắc với các cái khác"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s k nhận giá trị"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s không sẵn có"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy chọn k/m/g"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tùy chọn chưa rõ rang: %s (nên là --%s%s hay --%s%s)"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "bí danh của --%s"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "không hiểu tùy chọn “%s”"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "không hiểu tùy chọn “%c”"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "không hiểu tùy chọn non-ascii trong chuỗi: “%s”"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "…"
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
@@ -5998,49 +6152,73 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-SỐ"
-#: path.c:915
+#: path.c:922
#, 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:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "Chỉ có một đặc tả “attr:” là được phép."
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "đặc tả attr phải không được để trống"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "tên thuộc tính không hợp lệ %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -6048,51 +6226,51 @@
"cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc "
"tả đường dẫn toàn cục khác"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: “%s” ngoài một kho chứa tại “%s”"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "“%s” (mnemonic: “%c”)"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "dòng được trích dẫn sai: %s"
@@ -6113,7 +6291,7 @@
msgid "flush packet write failed"
msgstr "gặp lỗi khi ghi vào tập tin gói lúc đẩy dữ liệu lên bộ nhớ"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "lỗi giao thức: không thể làm được dòng dài"
@@ -6121,7 +6299,7 @@
msgid "packet write with format failed"
msgstr "gặp lỗi khi ghi gói có định dạng"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa"
@@ -6130,25 +6308,25 @@
msgid "packet write failed: %s"
msgstr "gặp lỗi khi ghi gói: %s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "lỗi đọc"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "máy chủ bị treo bất ngờ"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "lỗi giao thức: ký tự chiều dài dòng bị sai: %.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "lỗi giao thức: chiều dài dòng bị sai %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "lỗi máy chủ: %s"
@@ -6162,7 +6340,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "không thể tạo tuyến trình lstat: %s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
@@ -6192,20 +6370,20 @@
msgid "Removing duplicate objects"
msgstr "Đang gỡ các đối tượng trùng lặp"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "không thể lấy thông tin thống kê về “log“"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "không thể đọc kết xuất “log”"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
@@ -6214,12 +6392,12 @@
"không thể phân tích cú pháp dòng đầu tiên của đầu ra “log”: không bắt đầu "
"bằng “commit ”: “%s”"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "không thể phân tích cú pháp phần đầu git “%.*s”"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "gặp lỗi khi tạo khác biệt"
@@ -6248,7 +6426,7 @@
msgstr ""
"%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "“%s” không có một lần chuyển giao nào được lấy ra"
@@ -6268,16 +6446,16 @@
msgid "unable to stat '%s'"
msgstr "không thể lấy thống kê “%s”"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "Làm tươi mới bảng mục lục"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6286,7 +6464,7 @@
"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:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6295,143 +6473,143 @@
"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"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "chữ ký sai 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "phiên bản mục lục sai %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được"
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "đang lờ đi phần mở rộng %.4s"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "không hiểu định dạng mục lục 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "các mục tin stage không đúng thứ tự trong mục lục"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "nhiều mục stage cho tập tin hòa trộn “%s”"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "các mục tin stage không đúng thứ tự cho “%s”"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "không thể tạo tuyến load_cache_entries: %s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "không thể gia nhập tuyến load_cache_entries: %s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s: mở tập tin mục lục gặp lỗi"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: không thể lấy thống kê bảng mục lục đã mở"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: tập tin mục lục nhỏ hơn mong đợi"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s: không thể ánh xạ tập tin mục lục%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "không thể tạo tuyến load_index_extensions: %s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "không thể gia nhập tuyến load_index_extensions: %s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "không thể mở thư mục git: %s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "không thể bỏ liên kết (unlink): “%s”"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "không thể sửa các bít phân quyền trên “%s”"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: không thể xóa bỏ stage #0"
@@ -6513,7 +6691,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6522,7 +6700,7 @@
"Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần "
"chuyển giao.\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6530,7 +6708,7 @@
"\n"
"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6544,7 +6722,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6554,14 +6732,14 @@
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "không thể ghi “%s”"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "không thể ghi “%s”."
@@ -6593,12 +6771,10 @@
"Cánh ứng xử có thể là: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "không thể đọc “%s”."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: “preserve” bị cấm bởi “merges”"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6619,132 +6795,142 @@
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "không nhận ra màu: %%(màu:%s)"
+msgstr "không nhận ra màu: %%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) không nhận các đối số"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tham số không được thừa nhận %%(objectname): %s"
+msgstr "tham số không được thừa nhận %%(objectsize): %s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) không nhận các đối số"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "tham số không được thừa nhận %%(subject): %s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "cần %%(trailers:key=<giá trị>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, 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:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "đối số không được thừa nhận %%(raw): %s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "cần giá trị dương “%s” trong %%(%s)"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "đối số “%s” không được thừa nhận trong %%(%s)"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "không nhận ra tùy chọn thư điện tử: “%s”"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, 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:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "đối số không được thừa nhận %%(if): %s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) không nhận các đối số"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6752,126 +6938,136 @@
"không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu "
"đối tượng"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, 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:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "lệnh này từ chối atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s không thể được dùng với --python, --shell, --tcl"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, 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)"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rời tại %s)"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời từ %s)"
+msgstr "(HEAD được tách rời khỏi %s)"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "(không nhánh)"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "“%s” không chỉ đến một lần chuyển giao hợp lệ nào cả!"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6885,92 +7081,92 @@
"\n"
"\tgit branch -m <name>\n"
msgstr ""
-"Sử dụng '%s' làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
+"Sử dụng “%s” làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
"có thể thay đổi. Để cấu hình tên nhánh khởi đầu sử dụng trong tất cả\n"
"kho lưu trữ mới của bạn, cái mà sẽ ngăn chặn cảnh báo này, gọi lệnh:\n"
"\n"
"\tgit config --global init.defaultBranch <tên>\n"
"\n"
-"Tên thường được chọn thay cho 'master' là 'main', 'trunk' và\n"
-"'development'. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
+"Tên thường được chọn thay cho “master” là “main”, “trunk” và\n"
+"“development”. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
"\n"
"\tgit branch -m <tên>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "không thể lấy về “%s”"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "tên nhánh không hợp lệ: %s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "đang lờ đi tham chiếu mềm thừa %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "nhật ký cho tham chiếu %s có khoảng trống sau %s"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "nhật ký cho tham chiếu %s kết thúc bất ngờ trên %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "nhật ký cho %s trống rỗng"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "từ chối cập nhật tham chiếu với tên sai “%s”"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref bị lỗi cho ref “%s”: %s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "không cho phép đa cập nhật cho tham chiếu “%s”"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "các cập nhật tham chiếu bị bãi bỏ bởi móc"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "“%s” sẵn có; không thể tạo “%s”"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "không thể xử lý “%s” và “%s” cùng một lúc"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỏ tham chiếu %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỏ tham chiếu: %s"
@@ -7274,7 +7470,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "gặp lỗi đọc khi đang ghi “%s” (%s)"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "gặp lỗi khi đẩy dữ liệu “%s” lên đĩa"
@@ -7319,8 +7515,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Preimage đã được ghi lại cho “%s”"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
@@ -7358,45 +7554,40 @@
msgid "could not determine HEAD revision"
msgstr "không thể dò tìm điểm xét duyệt HEAD"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "gặp lỗi khi tìm cây của %s"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input xung khắc với --no-walk"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk xung khắc với --unsorted-input"
+
+#: revision.c:2690
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:2687
+#: revision.c:2693
#, 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:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "gặp lỗi khi mở “/dev/null”"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
-msgstr "không thể tạo tuyến async: %s"
-
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
-"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+msgstr "không thể tạo tuyến trình async: %s"
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
@@ -7417,23 +7608,23 @@
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "đẩy đàm phán thất bại; vẫn tiếp tục xử lý bằng lệnh đẩy"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7441,47 +7632,48 @@
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "không thể xóa bỏ “%s”"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "không thể gỡ bỏ “%s”"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "không nhận ra thao tác: %d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7489,53 +7681,75 @@
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
-"và chuyển giao kết quả bằng lệnh “git commit”"
+"Sau khi giải quyết vấn đề xung đột, hãy đánh dấu bằng\n"
+"\"git add/rm <pathspec>\", sai đó chạy\n"
+"\"git cherry-pick --continue\".\n"
+"Bạn có thể bỏ qua lần chuyển giao này với \"git cherry-pick --skip\".\n"
+"Để bãi bỏ và quay trở lại trạng thái trước khi \"git cherry-pick\",\n"
+"chạy \"git cherry-pick --abort\"."
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Sau khi giải quyết vấn đề này, hãy đánh dấu chúng bằng\n"
+"\"git add/rm <đặc_tả_đường_dẫn_xung_đột>\", sau đó chạy\n"
+"\"git revert --continue\".\n"
+"Bạn có thể bỏ qua lần chuyển giao này với \"git rebase --skip\".\n"
+"Để bãi bỏ và quay trở lại trạng thái trước \"git revert\",\n"
+"chạy \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "gặp lỗi khi hoàn thành “%s”"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
@@ -7543,65 +7757,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "không có khóa hiện diện trong “%.*s”"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "không thể giải trích dẫn giá trị của “%s”"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "không hiểu biến “%s”"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "thiếu “GIT_AUTHOR_NAME”"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "thiếu “GIT_AUTHOR_DATE”"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7630,11 +7844,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "móc “prepare-commit-msg” bị lỗi"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7665,7 +7879,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7693,346 +7907,351 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
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"
-#: sequencer.c:1275
+#: sequencer.c:1292
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"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (root-commit)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "không thể phân tích HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s không phải là một lần chuyển giao!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "không thể phân tích tác giả của lần chuyển giao"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
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"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "không thể đọc phần chú thích (message) từ “%s”"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "định danh tác giả không hợp lệ “%s”"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
-msgstr "tác giả sai hỏng: thiếu thông tin này tháng"
+msgstr "tác giả sai hỏng: thiếu thông tin ngày tháng"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị bỏ qua:"
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "không thể sửa chữa lần chuyển giao gốc"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s không nhận các đối số: “%s”"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "thiếu đối số cho %s"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "không thể đọc “%s”."
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "squash-onto không dùng được"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "có thao tác hoàn nguyên đang được thực hiện"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "có thao tác “cherry-pick” đang được thực hiện"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
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:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "không có tiến trình hoàn nguyên nào"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "không có cherry-pick đang được thực hiện"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "ở đây không có gì để mà bỏ qua cả"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -8041,16 +8260,16 @@
"bạn đã sẵn sàng chuyển giao chưa?\n"
"thử \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8069,27 +8288,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Không thể áp dụng %s… %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "Không hòa trộn %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "Đang thực thi: %s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8104,11 +8323,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8125,90 +8344,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "tên nhãn dị hình: “%.*s”"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "ghi lần chuyển giao gốc giả"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "đang ghi squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "không thể phân tích “%.*s”"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "chẳng có gì để hòa trộn: “%.*s”"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "không thể lấy chú thích của lần chuyển giao của “%s”"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Gặp đáp ứng stash không cần: “%s”"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Không thể tạo thư mục cho “%s”"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "Đã tạo autostash: %s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "không thể reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8220,29 +8439,29 @@
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "Áp dụng autostash có hiệu quả trong các xung đột."
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "Autostash đã sẵn có; nên tạo một mục stash mới."
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Dừng lại ở HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "Dừng lại ở %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8263,58 +8482,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "Đang cải tổ (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "Cài tổ và cập nhật %s một cách thành công.\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8324,50 +8543,60 @@
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "không thể ghi tập tin: “%s”"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "bỏ qua lần chuyển giao được áp dụng kế trước %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"dùng --reapply-cherry-picks để bao gồm các lần chuyển giao đã bị bỏ qua"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script: các tùy chọn được không xử lý"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "không có gì để làm"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "văn lệnh đã sẵn được sắp đặt rồi."
@@ -8524,27 +8753,15 @@
"gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
"người sở hữu tập tin phải luôn có quyền đọc và ghi."
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "gặp lỗi khi mở “/dev/null” hay dup"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "gặp lỗi khi rẽ nhánh tiến trình"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid gặp lỗi"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "mục tin mục lục là một thư mục, nhưng không \"sparse\" (%08x)"
@@ -8599,13 +8816,13 @@
msgid_plural "%u bytes/s"
msgstr[0] "%u byte/giây"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s” để ghi"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "không thể sửa “%s”"
@@ -8631,7 +8848,7 @@
msgid "invalid value for %s"
msgstr "giá trị cho %s không hợp lệ"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
@@ -8656,22 +8873,22 @@
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "trong mô-đun-con không có gì “%s”"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "đối số --ignore-submodules sai: %s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8680,13 +8897,13 @@
"Mô-đun-con trong lần chuyển giao %s tại đường dẫn: “%s” va chạm với mô-đun-"
"con cùng tên. Nên bỏ qua nó."
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8695,36 +8912,36 @@
"Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n "
"1” trong mô-đun-con “%s”"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "xử lý cho mô-đun-con “%s” gặp lỗi"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
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ệ."
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Không thể đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Đang lấy về mô-đun-con %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Không thể truy cập mô-đun-con “%s”\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8733,61 +8950,61 @@
"Có lỗi khi lấy về mô-đun-con:\n"
" “%s”"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "không thể đặt lại mục lục của mô-đun-con"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Mô-đun-con “%s” không thể được cập nhật."
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "thư mục git mô đun con “%s” là bên trong git DIR “%.*s”"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8795,17 +9012,17 @@
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "từ chối di chuyển “%s” vào trong một thư mục git sẵn có"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8816,11 +9033,11 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "không thể lấy thông tin thống kê về ls-files trong .."
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
@@ -8842,7 +9059,7 @@
msgstr "không hiểu giá trị “%s” cho khóa “%s”"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "nhiều hơn một %s"
@@ -8857,11 +9074,11 @@
msgid "could not read input file '%s'"
msgstr "không đọc được tập tin đầu vào “%s”"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "không thể lấy thông tin thống kê về %s"
@@ -8929,7 +9146,7 @@
msgid "error while running fast-import"
msgstr "gặp lỗi trong khi chạy fast-import"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "không thể đọc tham chiếu %s"
@@ -8947,7 +9164,7 @@
msgid "invalid remote service path"
msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "thao tác không được gia thức hỗ trợ"
@@ -8956,7 +9173,7 @@
msgid "can't connect to subservice %s"
msgstr "không thể kết nối đến dịch vụ phụ %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only cần giao thức v2"
@@ -8969,59 +9186,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s không hỗ trợ dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s không hỗ trợ --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s không hỗ trợ --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s không hỗ trợ --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s không hỗ trợ --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s không hỗ trợ “push-option”"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s không hỗ trợ “force”"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "không thể chạy fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "gặp lỗi trong khi chạy fast-export"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -9031,52 +9248,52 @@
"cả.\n"
"Tuy nhiên bạn nên chỉ định một nhánh.\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "không hỗ trợ định dạng đối tượng “%s”"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) gặp lỗi"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) gặp lỗi"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "tuyến trình %s gặp lỗi"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "xử lý %s gặp lỗi khi đợi"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "xử lý %s gặp lỗi"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
@@ -9090,46 +9307,46 @@
msgid "could not read bundle '%s'"
msgstr "không thể đọc bó “%s”"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "xem protocol.version trong “git help config” để có thêm thông tin"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "máy chủ không hỗ trợ wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "không cho phép phương thức vận chuyển “%s”"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync không còn được hỗ trợ nữa"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9138,7 +9355,7 @@
"Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
"có thể được tìm thấy trên mọi máy phục vụ:\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9165,11 +9382,11 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
@@ -9455,17 +9672,17 @@
"HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n"
"và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "Đang cập nhật các cờ mục lục"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
"cây làm việc và lần chuyển giao không được theo dõi có các mục trùng lặp: %s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "cần đẩy dữ liệu lên đĩa sau các tham số của lệnh fetch"
@@ -9502,7 +9719,7 @@
msgid "Fetching objects"
msgstr "Đang lấy về các đối tượng"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
@@ -9599,17 +9816,27 @@
msgid "gitdir file points to non-existent location"
msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "không thể setenv “%s”"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s”"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "không thể mở “%s” để đọc và ghi"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%s”"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "không thể lấy thư mục làm việc hiện hành"
@@ -10172,25 +10399,25 @@
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "không thể gửi lệnh IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "không thể đọc đáp ứng IPC"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "không thể khởi chạy accept_thread “%s”"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "không thể khởi chạy bộ làm việc worker[0] cho “%s”"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
@@ -10199,138 +10426,137 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
-msgstr "không thể chmod %cx '%s'"
+msgstr "không thể chmod %cx “%s”"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "cập nhật tập tin gặp lỗi"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
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:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Không thể mở “%s” để ghi."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "Không thể lấy thông tin thống kê về “%s”"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%s”"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
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:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr ""
"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
"vết"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "cho phép cập nhật các mục ở ngoài “sparse-checkout cone”"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "cảnh báo khi thêm một kho nhúng"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "ứng dụng chạy phía sau cho “git stash -p”"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10361,12 +10587,12 @@
"\n"
"Xem \"git help submodule\" để biết thêm chi tiết."
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "thêm cần một kho git nhúng: %s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10376,51 +10602,51 @@
"Tắt thông báo này bằng cách chạy lệnh\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run xung khắc với --interactive/--patch"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file xung khắc với --interactive/--patch"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file xung khắc với --edit"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:522
+#: builtin/add.c:547
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:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod tham số “%s” phải hoặc là -x hay +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul cần --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, 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:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10430,109 +10656,109 @@
"Tắt thông báo này bằng cách chạy lệnh\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
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:455
+#: builtin/am.c:456
#, 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:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/am.c:535
+#: builtin/am.c:536
#, 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:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/am.c:814
+#: builtin/am.c:815
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:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "dấu thời gian không hợp lệ"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "độ lệch múi giờ không hợp lệ"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, 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:1128
+#: builtin/am.c:1129
#, 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:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể "
"bị mất."
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "Miếng vá trống rỗng."
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "thiếu dòng tác giả trong lần chuyển gia %s"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "dòng định danh không hợp lệ: %.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge”."
-#: builtin/am.c:1540
+#: builtin/am.c:1541
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:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10540,24 +10766,24 @@
"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:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang dùng phương án dự phòng: vá bản cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, 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:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -10565,37 +10791,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
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]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, 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:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
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:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "Dùng “git am --show-current-patch=diff” để xem miếng vá bị lỗi"
@@ -10623,17 +10849,17 @@
"Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ"
"\" cho nó."
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "Không thể phân tích đối tượng “%s”."
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10641,160 +10867,160 @@
"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:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Giá trị không hợp lệ cho --show-current-patch: %s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
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:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
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:2290
+#: builtin/am.c:2292
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:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "chuyển nó qua git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
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:2330
+#: builtin/am.c:2332
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:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
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:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "hiển thị miếng vá đã được áp dụng rồi"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
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:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "Các lần chuyển giao ký-GPG"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10802,16 +11028,16 @@
"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:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, 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:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10820,11 +11046,11 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2429
+#: builtin/am.c:2431
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."
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh"
@@ -10832,44 +11058,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<các tùy chọn>] [<miếng-vá>…]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s”"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "không thể chuyển hướng kết xuất"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive: Máy chủ không có địa chỉ URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: cần ACK/NAK, nhưng lại nhận được gói flush"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive: lỗi giao thức"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive: cần một flush (đẩy dữ liệu lên đĩa)"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <lúc_sai> <lúc_đúng> [<term>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10906,48 +11123,61 @@
#: builtin/bisect--helper.c:32
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)…]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <lệnh>…"
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "không thể mở tập tin “%s” ở chế độ “%s”"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "không thể ghi vào tập tin “%s”"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "không thể mở tập tin “%s” để đọc"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "“%s” không phải một thời hạn hợp lệ"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "không thể dùng lệnh tích hợp “%s” như là một thời kỳ"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "không thể thay đổi nghĩa của thời kỳ “%s”"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "vui lòng dùng hai thời kỳ khác nhau"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "Chúng tôi đang không bisect.\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "“%s” không phải một lần chuyển giao hợp lệ"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10955,27 +11185,27 @@
"không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-"
"chuyển-giao>”."
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Đối số bisect_write sai: %s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "không thể lấy oid của điểm xét duyệt “%s”"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "không thể mở tập tin “%s”"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10984,7 +11214,7 @@
"Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó."
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10995,7 +11225,7 @@
"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng."
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
@@ -11004,15 +11234,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "Bạn có chắc chắn chưa [Y/n]? "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "chưa định nghĩa thời kỳ nào"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -11021,7 +11251,7 @@
"Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n"
"và %s cho tình trạng mới.\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11030,52 +11260,52 @@
"tham số không hợp lệ %s cho “git bisect terms”.\n"
"Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "không thể mở “%s” để nối thêm"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "” không phải một thời hạn hợp lệ"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tùy chọn không được thừa nhận: “%s”"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "sai HEAD - Tôi cần một HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"."
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
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"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "refspec không hợp lệ: “%s”"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
@@ -11083,105 +11313,151 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
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]? "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Hãy gọi “--bisect-state” với ít nhất một đối số"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "“git bisect %s” có thể lấy chỉ một đối số."
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "Đầu vào rev sai: %s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Đầu vào rev sai (không phải là lần chuyển giao): %s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "Chúng tôi không bisect."
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
-msgstr "'%s'?? bạn đang nói gì thế?"
+msgstr "“%s”?? bạn đang nói gì thế?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
-msgstr "không thể đọc tập tin '%s' để thao diễn lại"
+msgstr "không thể đọc tập tin “%s” để thao diễn lại"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "đang chạy %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "chạy bisect gặp lỗi: mã trả về %d từ lệnh “%s” là < 0 hoặc >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "không thể mở “%s” để ghi"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect không thể tiếp tục thêm được nữa"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect chạy thành công"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect tìm thấy lần chuyển giao sai đầu tiên"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"chạy bisect gặp lỗi: “git bisect--helper --bisect-state %s” đã thoát ra với "
+"mã lỗi %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "đặt lại trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "in ra các thời điểm di chuyển nửa bước"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "bắt đầu phiên di chuyển nửa bước"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "tìm lần chuyển giao không di chuyển phân đôi"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "đánh dấu trạng thái ref (hoặc refs)"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "liệt kê các bước bisection đi quá xa"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "phát lại quá trình bisection từ tệp đã cho"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "bỏ qua một số lần chuyển giao để lấy ra"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "trực quan việc di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "dùng <cmd>… để bisect một cách tự động."
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "không có nhật ký cho BISECT_WRITE"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
"--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms cần 0 hoặc 1 tham số"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next cần 0 tham số"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log cần 0 tham số"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "chưa chỉ ra tập tin ghi nhật ký"
@@ -11193,152 +11469,154 @@
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:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "cần một màu: %s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "phải kết thúc bằng một màu"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "màu không hợp lệ cho blame.coloring"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "không thể tìm thấy điểm xét duyệt %s để mà bỏ qua"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
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:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
"đừng hiển thị tên đối tượng của những lần chuyển giao biên giới (Mặc định: "
"off)"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
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:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "hiển thị kết xuất điểm số cho các mục tin “blame”"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "hiển thị ở định dạng đã thiết kế cho dùng bằng máy"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
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:877
+#: builtin/blame.c:873
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:878
+#: builtin/blame.c:874
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:879
+#: builtin/blame.c:875
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:880
+#: builtin/blame.c:876
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:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc định: off)"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "bỏ qua <rev> khi blame"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "bỏ qua các điểm xét duyệt từ <tập tin>"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "các dòng màu theo tuổi"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
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:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr ""
"sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
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:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
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:891
+#: builtin/blame.c:887
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:892
+#: builtin/blame.c:888
msgid "range"
msgstr "vùng"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "xử lý chỉ dòng vùng <đầu>,<cuối> hoặc tính năng :<funcname>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -11351,17 +11629,17 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "tập tin %s chỉ có %lu dòng"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "Các dòng blame"
@@ -11462,74 +11740,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "không thể phân tích chuỗi định dạng"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:515
+#: builtin/branch.c:516
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:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "Gặp lỗi khi sao chép nhánh"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, 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:579
+#: builtin/branch.c:580
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:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11540,180 +11818,180 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
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:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "không dùng"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
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:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
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:655
+#: builtin/branch.c:656
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:656
+#: builtin/branch.c:657
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:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "sao chép một nhánh và reflog của nó"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "hiển thị nhánh hiện hành"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
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:666
+#: builtin/branch.c:667
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:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "sắp xếp và lọc là phân biệt HOA thường"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "tùy chọn --column và --verbose xung khắc nhau"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
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:778
+#: builtin/branch.c:780
#, 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:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "quá nhiều nhánh dành cho thao tác sao chép"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "quá nhiều tham số cho thao tác đổi tên"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "quá nhiều tham số để đặt thượng nguồn mới"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11721,30 +11999,30 @@
"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:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
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:844
+#: builtin/branch.c:846
#, 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:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11753,7 +12031,7 @@
"nhánh.\n"
"Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11761,33 +12039,33 @@
"tùy chọn --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--"
"track” hoặc “--set-upstream-to” để thay thế."
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "phiên bản git:\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() gặp lỗi “%s” (%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "thông tin trình biên dịch: "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "thông tin libc: "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "không chạy từ một kho git - nên chẳng có móc nào để mà hiển thị cả\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
"git bugreport [-o|--output-directory <tập_tin>] [-s|--suffix <định_dạng>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11821,39 +12099,34 @@
"Vui lòng xen xét phần còn lại của báo cáo lỗi bên dưới.\n"
"Bạn có thể xóa bất kỳ dòng nào bạn không muốn chia sẻ.\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "chỉ định thư mục định để tạo tập tin báo cáo lỗi"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr ""
"chỉ định chuỗi định dạng thời gian strftime dùng làm hậu tố cho tên tập tin"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "không thể tạo các thư mục dẫn đầu cho “%s”"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "Thông tin hệ thống"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "Các Móc đã được bật"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "không thể tạo tập tin mới tại “%s”"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "không thể ghi vào %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Đã tạo báo cáo mới tại “%s”\n"
@@ -11874,53 +12147,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "chỉ điịnh định dạng cho bundle"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "Cần một kho chứa để có thể tạo một bundle."
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "không hiển thị chi tiết bundle (bó)"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "“%s” tốt\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "chi tiết; phải được đặt trước một lệnh-con"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Tháo rời các đối tượng"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11928,7 +12201,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11936,72 +12209,72 @@
"git cat-file (--batch[=<định dạng>] | --batch-check[=<định dạng>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "chỉ một tùy chọn batch được chỉ ra"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "thoát với 0 khi không có lỗi"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
-msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
+msgstr "với đối tượng blob, chạy các bộ lọc nội dung của đối tượng"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "đừng sắp xếp đầu ra --batch-all-objects"
@@ -12021,7 +12294,7 @@
msgid "use .gitattributes only from the index"
msgstr "chỉ dùng .gitattributes từ bảng mục lục"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
@@ -12029,8 +12302,8 @@
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:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -12088,11 +12361,10 @@
msgstr "git checkout--worker [<các tùy chọn>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "chuỗi"
@@ -12242,11 +12514,11 @@
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
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:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12256,50 +12528,50 @@
"sau:\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, 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:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, 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:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12318,7 +12590,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12339,19 +12611,19 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
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:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
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:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12360,7 +12632,7 @@
"“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
"Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12380,51 +12652,51 @@
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
"checkout.defaultRemote=origin trong cấu hình của bạn."
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "chỉ cần một tham chiếu"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, 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:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, 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:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12432,7 +12704,7 @@
"không thể chuyển nhánh trong khi đang hòa trộn\n"
"Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12440,7 +12712,7 @@
"không thể chuyển nhanh ở giữa một phiên am\n"
"Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12448,7 +12720,7 @@
"không thể chuyển nhánh trong khi cải tổ\n"
"Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12456,7 +12728,7 @@
"không thể chuyển nhánh trong khi cherry-picking\n"
"Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12464,143 +12736,143 @@
"không thể chuyển nhánh trong khi hoàn nguyên\n"
"Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr ""
"bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
"bước"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
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:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, 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:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "“%s” không thể nhận <điểm-đầu>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, 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:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
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:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
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:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
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:1557
+#: builtin/checkout.c:1555
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:1560
+#: builtin/checkout.c:1558
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:1564
+#: builtin/checkout.c:1562
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 rải rác"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p và --overlay loại từ lẫn nhau"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "thiếu tên nhánh; hãy thử -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "không thể phân giải “%s”"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo "
"từ đó"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, 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:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file xung khắc với --detach"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file xung khắc với --patch"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12608,71 +12880,71 @@
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "bạn phải chỉ định các thư mục muốn hồi phục"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
+msgstr "gợi ý thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "dùng chế độ che phủ (mặc định)"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "tạo và chuyển đến một nhánh mới"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "tạo/đặt_lại và chuyển đến một nhánh"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
+msgstr "gợi ý thứ hai \"git switch <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "vứt bỏ các sửa đổi địa phương"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "lấy ra từ tree-ish nào"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "phục hồi bảng mục lục"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "phục hồi cây làm việc (mặc định)"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "dùng chế độ che phủ"
@@ -12812,8 +13084,8 @@
msgstr "gỡ bỏ toàn bộ thư mục"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mẫu"
@@ -12902,19 +13174,20 @@
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:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "tên"
@@ -12930,8 +13203,8 @@
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:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "độ-sâu"
@@ -12939,8 +13212,8 @@
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "thời-gian"
@@ -12949,16 +13222,16 @@
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
@@ -12989,21 +13262,21 @@
msgstr "đặt cấu hình bên trong một kho chứa mới"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
@@ -13016,50 +13289,42 @@
msgid "initialize sparse-checkout file to include only files at root"
msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Không đoán được thư mục tên là gì.\n"
-"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, 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:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "gặp lỗi khi bắt đầu lặp qua “%s”"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, 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:471
+#: builtin/clone.c:357
#, 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:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "gặp lỗi khi lặp qua “%s”"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -13069,105 +13334,105 @@
"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 restore --source=HEAD :/”\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, 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:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "gặp lỗi khi khởi tạo sparse-checkout"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
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:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
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:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
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:1018
+#: builtin/clone.c:903
#, 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:1021
+#: builtin/clone.c:906
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:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, 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:1049
+#: builtin/clone.c:934
#, 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:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr ""
"đường dẫn kho chứa “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, 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:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, 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:1089
+#: builtin/clone.c:974
#, 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:1109
+#: builtin/clone.c:994
#, 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:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -13175,50 +13440,50 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, 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/clone.c:1229
+#: builtin/clone.c:1121
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:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "vận chuyển máy mạng đã báo cáo lỗi"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, 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:1347
+#: builtin/clone.c:1242
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."
@@ -13254,14 +13519,14 @@
msgid "--command must be the first argument"
msgstr "--command phải là đối số đầu tiên"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13272,102 +13537,100 @@
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <các tùy chọn chia "
"tách>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "tmục"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "thư mục đối tượng để lưu đồ thị"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
"nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Không thể mở đồ thị chuyển giao “%s”"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "đối số --split không được thừa nhận, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "nhận được ID đối tượng không phải dạng hex không cần: %s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "đối tượng không hợp lệ: %s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "bắt đầu di chuyển tại mọi tham chiếu"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
"chuyển giao"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr ""
"bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr ""
"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-"
"giao"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "cho phép tính toán các đường dẫn đã bị thay đổi"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
"số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
"chia cắt không-cơ-sở"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "chỉ làm hết hạn các tập tin khi nó cũ hơn khoảng <thời gian> đưa ra"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "số tối đa các bộ lọc các đường dẫn thay đổi Bloom để tính toán"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "Sưu tập các lần chuyển giao từ đầu vào"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13381,70 +13644,65 @@
msgid "duplicate parent %s ignored"
msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "không phải là tên đối tượng hợp lệ “%s”"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: gặp lỗi khi mở “%s”"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree: gặp lỗi khi đọc “%s”"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree: gặp lỗi khi đóng “%s”"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "cha-mẹ"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "mã số của đối tượng chuyển giao cha mẹ"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "chú thích"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Ký lần chuyển giao dùng GPG"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "phải đưa ra chính xác một cây"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree: gặp lỗi khi đọc"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13457,7 +13715,7 @@
"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:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13472,15 +13730,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "Nếu không được thì dùng lệnh \"git rebase --skip\"\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Nếu không được thì dùng lệnh \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13502,76 +13760,76 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
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:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file với -a là không có ý nghĩa gì"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
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:386
+#: builtin/commit.c:387
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:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
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:412
+#: builtin/commit.c:413
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:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
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:489
+#: builtin/commit.c:490
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:491
+#: builtin/commit.c:492
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:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang thực hiện cải tổ."
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
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:618
+#: builtin/commit.c:619
#, 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:620
+#: builtin/commit.c:621
#, 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:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13579,43 +13837,43 @@
"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:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, 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:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, 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:760
+#: builtin/commit.c:761
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:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "không thể kết hợp “-m” với “--fixup”:%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13624,7 +13882,7 @@
"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những\n"
"dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13635,7 +13893,7 @@
"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:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13645,7 +13903,7 @@
"được\n"
"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"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13657,7 +13915,7 @@
"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:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13671,7 +13929,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"và thử lại.\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13685,76 +13943,76 @@
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"và thử lại.\n"
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "không thể chuyển phần đuôi cho “--trailers”"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, 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:1123
+#: builtin/commit.c:1124
#, 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:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Chế độ bỏ qua không hợp lệ “%s”"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, 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:1195
+#: builtin/commit.c:1196
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:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr ""
"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “reword”."
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc "
"“reword”."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "không thể tổ hợp tùy chọn \"reword\" của --fixup với đường dẫn '%s'"
+msgstr "không thể tổ hợp tùy chọn \"reword\" của --fixup với đường dẫn “%s”"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
@@ -13762,109 +14020,109 @@
"tùy chọn \"reword\" của --fixup là loại trừ qua lại với --patch/--"
"interactive/--all/--include/--only"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
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:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
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:1266
+#: builtin/commit.c:1265
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:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cải tổ -- nên không thể thực hiện việc “tu bổ”."
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
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:1281
+#: builtin/commit.c:1280
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/-F/--fixup."
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F."
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
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:1310
+#: builtin/commit.c:1309
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:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "không hiểu tùy chọn: --fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "tính đầy đủ giá trị trước/sau"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
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:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
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:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13872,11 +14130,11 @@
"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
"no. (Mặc định: traditional)"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13884,199 +14142,199 @@
"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:1509
+#: builtin/commit.c:1511
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:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "không dò tìm các tên thay đổi"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
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:1618
+#: builtin/commit.c:1620
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:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
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:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa hoặc tu bổ/reword lần "
"chuyển giao đã chỉ ra"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
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:1633
+#: builtin/commit.c:1635
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:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "bộ dò vết"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "thêm đuôi tự chọn"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "thêm dòng Signed-off-by vào cuối"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
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:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
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:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
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:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, 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:1790
+#: builtin/commit.c:1792
#, 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:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr ""
"Bãi bỏ việc chuyển giao bởi vì phần thân chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14443,7 +14701,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon không sẵn có; không hỗ trợ unix socket"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache không sẵn có; không hỗ trợ unix socket"
@@ -14643,7 +14901,7 @@
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s” không hợp lệ."
@@ -14669,113 +14927,111 @@
"git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </"
"đường/dẫn>…]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "gặp lỗi: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "không đọc được tập tin liên kết mềm %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "không thể đọc đối tượng %s cho liên kết mềm %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây."
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "gặp lỗi: %d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "đừng nhắc khi khởi chạy công cụ diff"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "công cụ"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
-msgstr ""
-"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
-"không"
+msgstr "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã khác không"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "chuyển cho “diff”"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool cần cây làm việc hoặc --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff xung khắc với --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
@@ -14783,7 +15039,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <các tùy chọn> <env-var>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "kiểu"
@@ -14814,98 +15070,98 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "Lỗi: không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định."
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map thẻ không thể là rỗng"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "nhập vào đánh dấu từ tập tin sẵn có"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "từ:đến"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"các cha mẹ tham chiếu cái mà không trong luồng dữ liệu fast-export bởi mã id "
"đối tượng"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "hiển thị các mã id nguyên gốc của blobs/commits"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "gắn thẻ với các mã ID đánh dấu"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map mà không có --anonymize là không hợp lý"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Không thể chuyển qua cả hai --import-marks và --import-marks-if-exists"
@@ -14964,15 +15220,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel không thể âm"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "đặt thượng nguồn cho git pull/fetch"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
@@ -14980,7 +15236,7 @@
msgid "use atomic transaction to update references"
msgstr "sử dụng giao dịch hạt nhân bên phía máy chủ"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "đường dẫn đến gói tải lên trên máy chủ cuối"
@@ -14992,7 +15248,7 @@
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
@@ -15009,7 +15265,7 @@
msgstr ""
"sửa đặc tả đường dẫn cho các tham chiếu mọi chỗ có trong refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ "
@@ -15019,7 +15275,7 @@
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "khi-cần"
@@ -15031,7 +15287,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "ghi các tham chiếu lấy về vào tập tin FETCH_HEAD"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
@@ -15039,16 +15295,16 @@
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
@@ -15064,19 +15320,19 @@
"mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
"tin cấu hình config)"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr ""
"báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này"
@@ -15090,7 +15346,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "chạy “maintenance --auto” sau khi lấy về"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật"
@@ -15106,62 +15362,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "không tìm thấy đối tượng %s"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "nên xóa chồng các thẻ có sẵn"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -15171,7 +15427,7 @@
"nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n"
"“--show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates true”."
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -15184,22 +15440,22 @@
"false”\n"
"để tránh kiểm tra này.\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, 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:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -15208,58 +15464,63 @@
"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:1327
+#: builtin/fetch.c:1341
#, 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:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, 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:1403
+#: builtin/fetch.c:1417
#, 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:1406
+#: builtin/fetch.c:1420
#, 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:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "đối tượng “%s” không tồn tại"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "không hiểu kiểu nhánh"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15267,22 +15528,22 @@
"không tìm thấy nhánh nguồn.\n"
"bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream."
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Không thể lấy“%s” về"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "không thể lấy “%s” (mã thoát: %d)\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -15290,56 +15551,56 @@
"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:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only cần một tham số hay nhiều --negotiate-tip=* hơn"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "Các tùy chọn --deepen và --depth loại từ lẫn nhau"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
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:2007
+#: builtin/fetch.c:2022
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:2024
+#: builtin/fetch.c:2039
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:2026
+#: builtin/fetch.c:2041
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:2035
+#: builtin/fetch.c:2050
#, 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:2042
+#: builtin/fetch.c:2057
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ý"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "phải cung cấp máy chủ khi sử dụng --negotiate-only"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "Giao thức không hỗ trợ --negotiate-only, nên thoát."
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -15347,11 +15608,11 @@
"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
"partialclone"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic chỉ có thể dùng khi lấy về từ một máy chủ"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin chỉ có thể dùng khi lấy về từ một máy chủ"
@@ -15422,7 +15683,7 @@
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
@@ -15578,129 +15839,139 @@
msgid "notice: No default references"
msgstr "cảnh báo: Không có các tham chiếu mặc định"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: đường dẫn mã băm không khớp, tìm thấy tại: %s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: thiếu đối tượng hoặc hỏng: %s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: đối tượng có kiểu chưa biết “%s”: %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: không thể phân tích cú đối tượng: %s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "tập tin sha1 sai: %s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "Đang kiểm tra thư mục đối tượng"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "Đang lấy liên kết %s"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "Đang kiểm tra cây nhớ tạm"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "non-tree trong cache-tree"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodes”"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes” (mặc định)"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
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:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
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:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s: thiếu đối tượng"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”"
@@ -15724,7 +15995,7 @@
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
@@ -15733,7 +16004,7 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
@@ -15821,148 +16092,188 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "đối số --schedule không được thừa nhận %s"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "gặp lỗi khi tải trước các máy chủ"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "gặp lỗi khi lấy thông tin thống kê về tiến trình “git pack-objects”"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects”"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "gặp lỗi khi ghi multi-pack-index"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "gặp lỗi khi chạy “git multi-pack-index expire”"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "gặp lỗi khi chạy “git multi-pack-index repack”"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "bỏ qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "đã có khóa của tập tin “%s”, bỏ qua bảo trì"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s”"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "“%s” không phải một nhiệm vụ hợp lệ"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "nhiệm vụ “%s” không được chọn nhiều lần"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "chạy nhiệm vụ dựa trên trạng thái của kho chứa"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "tần số"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "chạy nhiệm vụ dựa trên tần suất"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "đừng báo cáo diễn tiến hay các thông tin khác ra đầu lỗi tiêu chuẩn"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "tác vụ"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "chạy một nhiệm vụ cụ thể"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "gặp lỗi khi chạy “git config”"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "gặp lỗi khi khai triển đường dẫn “%s”"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "gặp lỗi khi khởi chạy launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "gặp lỗi khi tạo thư mục cho \"%s\""
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "gặp lỗi khi mồi dịch vụ %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "gặp lỗi khi tạo tập tin xml tạm thời"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "gặp lỗi khi lấy thông tin thống kê về schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
"gặp lỗi khi chạy “crontab -l”; hệ thống của bạn có thể không hỗ trợ “cron”"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "gặp lỗi khi chạy “crontab”; hiển thị của bạn có lẽ không hỗ trợ “cron”"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "gặp lỗi khi mở đầu vào tiêu chuẩn của “crontab”"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "“crontab” đã chết"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "gặp lỗi khi khởi chạy systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "gặp lỗi khi chạy systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "gặp lỗi khi xóa “%s”"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "đối số --scheduler không được thừa nhận “%s”"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "hoặc là bộ lập lịch systemd hoặc là crontab không sẵn có"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "bộ lên lịch %s không sẵn có"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "một tiến trình khác được lập kế hoạch chạy nền để bảo trì"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<bộ lên lịch>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "bộ lên lịch"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "bộ lên lịch để kích hoạt chạy chương trình bảo trì git"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "gặp lỗi khi thêm cấu hình toàn cục"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance run <lệnh_con> [<các tùy chọn>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "lện con không hợp lệ: %s"
@@ -15971,12 +16282,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<các tùy chọn>] [-e] <mẫu> [<rev>…] [[--] </đường/dẫn>…]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -15985,263 +16296,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
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:839
+#: builtin/grep.c:853
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:841
+#: builtin/grep.c:855
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:843
+#: builtin/grep.c:857
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:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
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:856
+#: builtin/grep.c:870
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:859
+#: builtin/grep.c:873
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:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "tìm kiếm trong thư mục con (mặc định)"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
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:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
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:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
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:886
+#: builtin/grep.c:900
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:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
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:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
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:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
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:903
+#: builtin/grep.c:917
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:906
+#: builtin/grep.c:920
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:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
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:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
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:938
+#: builtin/grep.c:952
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:940
+#: builtin/grep.c:954
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:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
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:947
+#: builtin/grep.c:961
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:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "chưa chỉ ra mẫu"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
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 revs"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "không thể phân giải điểm xét duyệt: %s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
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:1157
+#: builtin/grep.c:1171
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:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked không thể được sử dụng với tùy chọn --cached"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
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:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "cả hai --cached và các cây phải được chỉ ra"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -16249,95 +16560,107 @@
"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
"[--] <tập-tin>…"
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "kiểu đối tượng"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "ghi đối tượng vào dữ liệu đối tượng"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "lưu các tập tin mà nó không có các bộ lọc"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng hỏng để mà gỡ lỗi Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "xử lý tập tin như là nó đang ở thư mục này"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "hướng dẫn loại trừ"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "in ra tất cả các tên biến cấu hình"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "hiển thị trang man"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
-msgstr "hiện trang info"
+msgstr "hiển thị trang info"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "hiển thị mô tả lệnh"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "in ra tất cả các tên biến cấu hình"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<lệnh>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "không nhận ra định dạng trợ giúp “%s”"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "Gặp lỗi khi khởi chạy emacsclient."
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "gặp lỗi khi thực thi “%s”"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16346,7 +16669,7 @@
"“%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:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16355,325 +16678,316 @@
"“%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:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%s”: không rõ chương trình xem man."
-#: builtin/help.c:452
+#: builtin/help.c:483
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:459
+#: builtin/help.c:490
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:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "“%s” được đặt bí danh thành “%s”"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "chuỗi alias.%s sai: %s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "tùy chọn này không nhận tham số nào khác"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "Chạy lệnh “git help config” để có thêm thông tin"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "không thể lấy về đối tượng cần %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể điền thêm vào %d byte"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "gói đã vượt quá cỡ tối đa được phép"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "không thể mở packfile “%s”"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "không thể đọc thông tin đối tượng sẵn có %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể đọc đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "lỗi fsck trong đối tượng đóng gói"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc “.%s”"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "không thể ghi %s tập tin “%s”"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "không thể đóng tập tin được ghi %s “%s”"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "không thể đổi tên tập tin tạm thời “*.%s” thành “%s”"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "không thể lưu tập tin gói"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "không thể lưu trữ tập tin ghi mục lục"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "không hiểu thuật toán băm dữ liệu “%s”"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format không thể được dùng với --stdin"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "lỗi fsck trong các đối tượng gói"
@@ -17315,132 +17629,136 @@
"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/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "các đường dẫn được ngăn cách bởi ký tự NULL"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "nhận dạng các trạng thái tập tin với thẻ"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không "
"thay đổi)"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "dùng chữ cái viết thường cho các tập tin “fsmonitor clean”"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "hiển thị các tập tin đã xóa trong kết xuất"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "hiển thị các tập tin khác trong kết xuất"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "chỉ hiển thị tên của các thư mục “khác”"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "hiển thị kết thúc dòng của các tập tin"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "bỏ qua những tập tin khớp với một mẫu"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "mẫu loại trừ được đọc từ <tập tin>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "đọc mẫu cần loại trừ từ <tập-tin>"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "đệ quy xuyên qua mô-đun con"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "chặn các mục tin trùng lặp"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<kho> [<các tham chiếu>…]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<kho> [<các tham chiếu>…]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "thực thi"
@@ -17557,7 +17875,7 @@
msgid "use headers in message's body"
msgstr "sử dụng phần đầu trong nội dung thư"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
@@ -17672,144 +17990,144 @@
msgid "Merging %s with %s\n"
msgstr "Đang hòa trộn %s với %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<các tùy chọn>] [<commit>…]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "tùy chọn “%s” yêu cầu một giá trị"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-merge-commit và commit-msg"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "Đã cập nhật rồi. (không có gì để squash)"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
@@ -17824,33 +18142,33 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "Không cầm nắm gì ngoài hai head hòa trộn."
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "không hiểu chiến lược: -X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể đọc từ “%s”"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17862,11 +18180,11 @@
"topic.\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17875,75 +18193,75 @@
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n"
"thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vời.\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "Không phải nhánh hiện hành."
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
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:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
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:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit không nhận các đối số"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17951,7 +18269,7 @@
"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:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17959,90 +18277,86 @@
"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:1382
+#: builtin/merge.c:1386
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:1396
+#: builtin/merge.c:1400
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:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "Bạn không thể kết hợp --squash với --commit."
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
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:1431
+#: builtin/merge.c:1435
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:1433
+#: builtin/merge.c:1437
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:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
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:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, 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:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1625
-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:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, 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:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, 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:1711
+#: builtin/merge.c:1722
#, 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:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "Sử dụng chiến lược %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -18078,17 +18392,17 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "đối tượng %s được đánh thẻ là %s, không phải là kiểu %s"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr ""
"thẻ trên stdin đã không vượt qua kiểm tra fsck nghiêm ngặt của chúng tôi"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr ""
"thẻ trên đầu vào tiêu chuẩn không chỉ đến một lần chuyển giao hợp lệ nào cả"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
@@ -18109,34 +18423,50 @@
msgstr "cho phép tạo nhiều hơn một cây"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<các tùy chọn>] write [--preferred-pack=<cỡ>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<các tùy chọn>] write [--preferred-pack=<gói>][--refs-"
+"snapshot=</đường/dẫn>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<các tùy chọn>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<các tùy chọn>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<các-tùy-chọn>] repack [--batch-size=<cỡ>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "preferred-pack"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "gói được sử dụng khi tính toán một \"multi-pack bitmap\""
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "ghi multi-pack bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "ghi mục lục multi-pack chỉ chứa các mục lục đã cho"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "ảnh chụp nhanh refs để chọn các lần chuyển giao ánh xạ"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
@@ -18144,11 +18474,6 @@
"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
"vào một bó cái mà lớn hơn kích thước này"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "không hiểu câu lệnh con: %s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<các tùy chọn>] <nguồn>… <đích>"
@@ -18176,72 +18501,72 @@
msgid "skip move/rename errors"
msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "có đích “%s” nhưng đây không phải là một thư mục"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "không thể di chuyển một thư mục vào trong chính nó được"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "không di chuyển được thư mục thông qua tập tin"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "bị xung đột"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "đang ghi đè lên “%s”"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "nhiều nguồn cho cùng một đích"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "thư mục đích không tồn tại"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
@@ -18419,48 +18744,48 @@
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:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
"xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "không thể ghi đối tượng ghi chú (note)"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, 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ệ."
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "gặp lỗi khi đọc đối tượng “%s”."
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "không thể đọc dữ liệu ghi chú từ đối tượng không-blob “%s”."
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "dòng đầu vào dị hình: “%s”."
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, 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” sang “%s”"
@@ -18468,48 +18793,48 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "có quá nhiều đối số"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
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"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18518,29 +18843,29 @@
"Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng "
"%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "quá ít đối số"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18549,12 +18874,12 @@
"Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối "
"tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18563,52 +18888,52 @@
"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n"
"Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -18616,48 +18941,48 @@
"phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18668,41 +18993,41 @@
"chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa "
"trộn bằng “git notes merge --abort”.\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, 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ệ."
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
@@ -18755,83 +19080,87 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "cần đối tượng tại khoảng bù %<PRIuMAX> trong gói: %s"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "gặp lỗi khi ghi mục lục ánh xạ"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "không thể phân tích phần đầu đối tượng của “%s”"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "không thể đọc đối tượng %s"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với "
"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - hết bộ nhớ"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Nén delta dùng tới %d tuyến trình"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "mâu thuẫn với số lượng delta"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18840,7 +19169,7 @@
"giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-"
"hash> <uri>” (nhận “%s”)"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18848,17 +19177,18 @@
"đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã "
"nhận “%s”)"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "không thể lấy kiểu của đối tượng “%s” trong gói “%s”"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "không thể tìm thấy gói “%s”"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18867,7 +19197,7 @@
"cần ID đối tượng cạnh, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18876,248 +19206,248 @@
"cần ID đối tượng, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "giá trị cho --missing không hợp lệ"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "không thể mở mục lục của gói"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "đối tượng mất tại %s không thể đã kiểm tra"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev “%s”"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "điểm xem xét sai “%s”"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "không thể thêm các đối tượng mới dùng"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<phiên bản>[,offset]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "đọc các gói từ đầu vào tiêu chuẩn"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "sử dụng thuật toán “sparse reachability”"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "bỏ qua gói này"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "ghi mục lục ánh xạ nếu được"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "xử lý cho thiếu đối tượng"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "tôn trọng island trong suốt quá trình nén “delta”"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "giao thức"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "không thể dùng tùy chọn --filter mà không có --stdout"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "không thể dùng tùy chọn --filter với --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "không thể dùng danh sách rev bên trong với --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "Đánh số các đối tượng"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19134,9 +19464,9 @@
"and let us know you still use it by sending an e-mail\n"
"to <git@vger.kernel.org>. Thanks.\n"
msgstr ""
-"'git pack-redundant' được đề cử để loại bỏ.\n"
+"“git pack-redundant” được đề cử để loại bỏ.\n"
"Nếu bạn vẫn sử dụng lệnh này, vui lòng bổ sung\n"
-"thêm một tùy chọn, '--i-still-use-this', trên dòng lệnh\n"
+"thêm một tùy chọn, “--i-still-use-this”, trên dòng lệnh\n"
"và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
"đến <git@vger.kernel.org>. Cảm ơn.\n"
@@ -19172,7 +19502,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập tin gói hứa hẹn"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
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"
@@ -19185,44 +19515,48 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy của các mô-đun-con"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "điều khiển cách dùng các móc (hook) pre-merge-commit và commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "tự động stash/stash pop trước và sau"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -19230,14 +19564,14 @@
"Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
"lấy về."
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
"về."
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -19246,7 +19580,7 @@
"tự\n"
"đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19258,42 +19592,42 @@
"theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
"một nhánh trên dòng lệnh."
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19302,20 +19636,20 @@
"Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n"
"từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về."
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao “%s”"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19327,11 +19661,9 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"Kéo mà không chỉ định làm thế nào để hòa giải các nhánh phân kỳ là khác nhau "
-"là\n"
-"không khuyến khích. Bạn có thể dịu thông báo này bằng cách chạy một trong "
-"những lệnh sau đây\n"
-"các lệnh thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
+"Bạn có các nhánh phân kỳ và cần chỉ định cách hòa hợp chúng.\n"
+"Bạn có thể làm như vậy bằng cách chạy một trong những lệnh sau đây\n"
+"thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
"\n"
" git config pull.rebase false # merge (chiến lược mặc định)\n"
" git config pull.rebase true # rebase\n"
@@ -19341,24 +19673,24 @@
"mặc định\n"
"ưu tiên cho tất cả các kho. Bạn cũng có thể chuyển qua --rebase, --no-"
"rebase,\n"
-"hoặc --ff-only trên dòng lệnh để ghi đè mặc định được cấu hình cho mỗi\n"
+"hoặc --ff-only trên dòng lệnh để ghi đè các mặc định đã cấu hình cho mỗi\n"
"lần gọi.\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19369,7 +19701,7 @@
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19387,15 +19719,23 @@
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng."
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh."
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Không thể thực hiện chuyển tiếp nhanh trên nhiều nhánh."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Caanfchir định làm thế nào để giải quyết các nhánh phân kỳ."
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
@@ -19579,15 +19919,15 @@
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "kho"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
@@ -19599,19 +19939,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<tên-tham-chiếu>:<cần>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "yêu cầu máy chủ cập nhật để thích hợp với máy cục bộ"
@@ -19619,12 +19959,12 @@
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "chương trình nhận gói"
@@ -19644,11 +19984,11 @@
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
@@ -19759,84 +20099,83 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<tiền-"
-"tố>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-"
-"ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<tiền_tố>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<tập_tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "ghi mục lục kết quả vào <tập-tin>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "chỉ với bảng mục lục trống rỗng"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "Hòa trộn"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "thực hiện một hòa trộn thêm vào việc đọc"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr ""
"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<thư-mục-con>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "cập nhật cây làm việc với kết quả hòa trộn"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "không kiểm tra cây làm việc sau hòa trộn"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "không cập nhật bảng mục lục hay cây làm việc"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "không xuất các thông tin phản hồi"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
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 đã"
@@ -19859,193 +20198,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "danh sách cần làm không dùng được: “%s”"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "không thể tạo %s tạm thời"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "không thể đánh dấu là tương tác"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "không thể tạo danh sách cần làm"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<các tùy chọn>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "bỏ qua các lần chuyển giao mà nó bắt đầu trống rỗng"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "cải tổ các lần chuyển giao hòa trộn"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "ký các lần chuyển giao"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "tiếp tục cải tổ"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "bỏ qua lần chuyển giao"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sửa danh sách cần làm"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "hiển thị miếng vá hiện hành"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kiểm tra danh sách cần làm"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "sắp xếp lại các dòng fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "chèn các lệnh thực thi trong danh sách cần làm"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "lên trên"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "điểm-xét-duyệt-hạn-chế"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "điểm xét duyệt hạn chế"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-lên-trên"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash lên trên"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "lần chuyển giao thượng nguồn"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "tên-đầu"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "tên đầu"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "chiến lược cải tổ"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "tùy-chọn-chiến-lược"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "các tùy chọn chiến lược"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "chuyển-đến"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "nhánh hay lần chuyển giao lần lấy ra"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "tên lên trên"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "lệnh"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "lệnh muốn chạy"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s cần một ứng dụng hòa trộn chạy phía sau"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "không thể đặt lấy “onto”: “%s”"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head không hợp lệ: “%s”"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20060,7 +20250,7 @@
"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
"--abort\"."
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -20079,7 +20269,7 @@
"\n"
"Kết quả là git không thể cải tổ lại chúng."
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20088,7 +20278,7 @@
"kiểu rỗng không được nhận dạng “%s”; giá trị hợp lệ là \"drop\", \"keep\", "
"và \"ask\"."
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -20105,7 +20295,7 @@
" git rebase “<nhánh>”\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -20119,188 +20309,197 @@
" git branch --set-upstream-to=%s/<nhánh> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "lệnh thực thi trống rỗng"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
"sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "cho phép móc (hook) pre-rebase được chạy"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "hãy im lặng. ý là --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "thêm dòng Signed-off-by vào cuối cho từng lần chuyển giao"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "bỏ qua ngày tác giả và sử dụng ngày tháng hiện tại"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "đồng nghĩa với --reset-author-date"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "chuyển cho “git apply”"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "tiếp tục"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "bãi bỏ và lấy ra nhánh nguyên thủy"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "dùng chiến lược áp dụng để cải tổ"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "dùng chiến lược hòa trộn để cải tổ"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "xử lý các lần chuyển giao mà nó trở thành trống rỗng như thế nào"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "bỏ qua các lần chuyển giao mà nó bắt đầu trống rỗng"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "dùng chiến lược hòa trộn đã cho"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "tùy chọn"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "chuyển thao số đến chiến lược hòa trộn"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "cải tổ tất các các lần chuyển giao cho đến root"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr ""
"áp dụng mọi thay đổi, ngay cả khi những thứ đó đã sẵn có ở thượng nguồn"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh “git am”. Không thể rebase."
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
-"thế."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "không thể kết hợp “--keep-base” với “--onto”"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "không thể kết hợp “--keep-base” với “--root”"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "không thể kết hợp “--root” với “--fork-point”"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
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."
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -20308,16 +20507,16 @@
"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"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "không thể loại bỏ các thay đổi cây-làm-việc"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "không thể quay trở lại %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -20338,141 +20537,132 @@
"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"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "tùy chọn “%c” cần một giá trị bằng số"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "Không hiểu chế độ: %s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy cần --merge hay --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "không thể tổ hợp các tùy chọn áp dụng với các tùy chọn hòa trộn"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec cần --exec hay --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "thượng nguồn không hợp lệ “%s”"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "Không thể tạo lần chuyển giao gốc mới"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn với nhánh"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế"
+msgid "no such branch/commit '%s'"
+msgstr "không có nhánh/lần chuyển giao “%s” như thế"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "không thể chuyển đến %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD đã cập nhật."
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "Thay đổi thành %s:\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Thay đổi từ %s thành %s:\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "Không thể tách rời HEAD"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20502,7 +20692,7 @@
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20523,11 +20713,11 @@
"\n"
"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
@@ -20568,7 +20758,7 @@
msgid "%s points nowhere!"
msgstr "%s chẳng chỉ đến đâu cả!"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "chưa chỉ ra reflog để xóa"
@@ -20723,7 +20913,7 @@
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:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
@@ -20733,25 +20923,30 @@
msgid "Could not setup master '%s'"
msgstr "Không thể cài đặt nhánh master “%s”"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nhánh chưa được quản lý.%s.rebase=%s; giả định là “true”"
+
+#: builtin/remote.c:366
#, 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:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "(khớp)"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "không thể đặt “%s”"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20762,17 +20957,17 @@
"\t%s:%d\n"
"bây giờ tên trên máy chủ không tồn tại “%s”"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "Không có máy chủ nào như vậy: “%s”"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, 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:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20783,17 +20978,17 @@
"\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:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lỗi khi tạo “%s”"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20805,119 +21000,119 @@
"đi;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, 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:999
+#: builtin/remote.c:1009
#, 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:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, 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:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"thực hiện cải tổ (với các hòa trộn) một cách tương tác lên trên máy chủ %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(không có URL)"
@@ -20925,181 +21120,185 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "(không yêu cầu)"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "(không hiểu)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, 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:1277
+#: builtin/remote.c:1281
#, 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:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
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:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
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:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
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:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, 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:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, 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:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "chi tiết; phải được đặt trước một lệnh-con"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<các tùy chọn>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21107,143 +21306,156 @@
"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
"tượng hứa hẹn"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
"objects."
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "không thể mở mục lục cho “%s”"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "gói %s là quá lớn để được xem là trong tiến trình hình học"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "gói %s là quá lớn để được cuộn lại"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "không thể mở tập tin tạm %s để ghi"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "không thể đóng tập tin tạm thời chụp nhanh các tham chiếu"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "đóng gói mọi thứ trong một gói đơn"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "chuyển --delta-islands cho git-pack-objects"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "với -a, đóng gói lại các đối tượng không thể đọc được"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "kích thước cửa sổ được dùng cho nén “delta”"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "giới hạn độ sâu tối đa của “delta”"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "giới hạn số lượng tối đa tuyến trình"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
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:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "đừng đóng gói lại gói này"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "tìm một tiến trình hình học với hệ số <N>"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "ghi mục lục “multi-pack” của các gói kết quả"
+
+#: builtin/repack.c:678
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:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable và -A xung khắc nhau"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric là xung khắc với tùy chọn -A, -a"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "Không có gì mới để mà đóng gói."
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "thiếu tập tin cần thiết: %s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "không thể bỏ liên kết: %s"
@@ -21554,93 +21766,93 @@
msgid "keep"
msgstr "giữ lại"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "Bạn không có HEAD nào hợp lệ."
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "Gặp lỗi khi tìm cây của HEAD."
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gặp lỗi khi tìm cây của %s."
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn."
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "đặt lại HEAD, bảng mục lục và cây làm việc"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ."
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ."
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch xung khắc với --{hard,mixed,soft}"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
"reset -- </các/đường/dẫn>”."
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn."
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset không được phép trên kho thuần"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N chỉ được dùng khi có --mixed"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:"
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21651,16 +21863,16 @@
"\n"
"Cần %.2f giây để kiểm đếm các thay đổi chưa đưa lên bệ phóng sau khi đặt "
"lại.\n"
-"Bạn có thể sử dụng '--quiet' để tránh việc này. Đặt reset.quiet thành true "
+"Bạn có thể sử dụng “--quiet” để tránh việc này. Đặt reset.quiet thành true "
"trong\n"
"cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”."
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
@@ -21702,7 +21914,7 @@
#: builtin/rev-parse.c:442
msgid "no usage string given before the `--' separator"
-msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách '--'"
+msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách “--”"
#: builtin/rev-parse.c:548
msgid "Needed a single revision"
@@ -21840,15 +22052,19 @@
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "chấp nhận chuyển giao mà không ghi chú gì"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -21893,70 +22109,70 @@
msgid_plural "the following files have local modifications:"
msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "không liệt kê các tập tin đã gỡ bỏ"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "chỉ gỡ bỏ từ mục lục"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "ghi đè lên kiểm tra cập nhật"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "cho phép gỡ bỏ đệ qui"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "Không đưa ra đặc tả đường dẫn. Tôi nên loại bỏ các tập tin nào?"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: không thể gỡ bỏ %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<máy>:]<thư/mục> [<các-tham-"
-"chiếu>…]\n"
-" --all và đặc tả <ref> rõ ràng là loại trừ lẫn nhau."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<thư mục> (--all | <tham chiếu>…)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "tên máy dịch vụ"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "dùng giao thức RPC không ổn định"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "đọc tham chiếu từ đầu vào tiêu chuẩn"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
@@ -22014,21 +22230,21 @@
msgid "group by field"
msgstr "nhóm theo trường"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "quá nhiều tham số đưa ra ngoài kho chứa"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22040,113 +22256,113 @@
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "đang bỏ qua %s; không thể xử lý nhiều hơn %d tham chiếu"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "không tham chiếu nào khớp với %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
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:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-” tương ứng với nhánh"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
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:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
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:660
+#: builtin/show-branch.c:659
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:662
+#: builtin/show-branch.c:661
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:664
+#: builtin/show-branch.c:663
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:667
+#: builtin/show-branch.c:666
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:669
+#: builtin/show-branch.c:668
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:671
+#: builtin/show-branch.c:670
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:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
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)"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
"independent hay --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "--reflog cần tên một nhánh"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "chỉ có thể hiển thị cùng lúc %d hạng mục."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "không có tham chiếu nào như thế %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "không thể xử lý nhiều hơn %d điểm xét duyệt."
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "“%s” không phải tham chiếu hợp lệ."
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
@@ -22221,70 +22437,84 @@
"không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ "
"không tồn tại)"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"thư mục “%s” có chứa các tập tin chưa được theo dõi, nhưng lại không trong "
+"“sparse-checkout cone”"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "gặp lỗi khi gỡ bỏ thư mục \"%s\""
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "không thể nâng cấp định dạng kho lưu trữ để kích hoạt worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "khởi tạo sparse-checkout trong chế độ nón"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "bật tắt việc sử dụng một \"sparse index\""
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\""
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "không thể thường hóa đường dẫn “%s”"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "không thể tải các mẫu sparse-checkout"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "đọc các mẫu từ đầu vào tiêu chuẩn"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "gặp lỗi khi đọc lại thư mục làm việc"
@@ -22320,7 +22550,7 @@
" [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n"
" [--] [<đặc/tả/đường/dẫn>…]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22350,6 +22580,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n"
" [--] [<đặc/tả/đường/dẫn>…]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<ghi chú>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -22373,7 +22611,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear với các tham số là chưa được thực hiện"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -22384,166 +22622,166 @@
" %s -> %s\n"
" để nhường chỗ.\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
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"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "không thể tạo diff %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
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."
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "không thể ghi lại cây chỉ mục"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "Đang hòa trộn %s với %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "Đã xóa %s (%s)"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Không thể xóa bỏ mục stash"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "”%s” không phải tham chiếu đến stash"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó."
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "gặp lỗi khi phân tích cây"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "gặp lỗi khi tháo dỡ cây"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "chỉ hiển thị các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "Không thể cập nhật %s với %s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "phần chú thích cho stash"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "Có lẽ bạn đã quên “git add ” phải không?"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "giữ nguyên bảng mục lục"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "cất đi ở chế độ miếng vá"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "chế độ im lặng"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "bao gồm các tập tin bị bỏ qua"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22567,7 +22805,7 @@
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
@@ -22581,27 +22819,35 @@
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
+"sở hữu chính nó."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
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:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "Đang vào “%s”\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22610,7 +22856,7 @@
"run_command trả về trạng thái khác không cho %s\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22621,78 +22867,69 @@
"con lồng nhau của %s\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "chặn kết xuất của từng lệnh mô-đun-con"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
-"sở hữu chính nó."
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "chặn kết xuất của khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, 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:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "chặn kết xuất về tình trạng mô-đun-con"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -22700,102 +22937,102 @@
"dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
"đun-con"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
"* %s %s(blob)->%s(\n"
")"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(mô-đun-con)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "không thể băm đối tượng từ “%s”"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "gặp chế độ không như mong chờ %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "để so sánh lần trong mục lục với cái trong HEAD mô-đun-con"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
"bỏ qua các mô-đun-con với giá trị của “ignore_config” được đặt thành “all”"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "giới hạn kích cỡ tổng hợp"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
"git submodule--helper summary [<các tùy chọn>] [<lần_chuyển_giao>] [--] [</"
"đường/dẫn>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "không thể lấy về một điểm xem xét cho HEAD"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "Các tùy chọn --cached và --files loại từ lẫn nhau"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "chặn kết xuất của url mô-đun-con đồng bộ"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22804,7 +23041,7 @@
"Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn "
"thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22813,45 +23050,45 @@
"Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại "
"bỏ chúng đi"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Đã xóa thư mục “%s”\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "bỏ đăng ký tất cả các trong mô-đun-con"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22866,67 +23103,67 @@
"bằng\n"
"“--reference-if-able” thay vì dùng “--reference”."
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "mô-đun-con “%s” không thể thêm thay thế: %s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "từ chối tạo/dùng “%s” trong một thư mục git của mô đun con"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "thư mục không trống: “%s”"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, 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:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
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:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
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:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22936,85 +23173,183 @@
"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] --url <url> --path </"
"đường/dẫn>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Không thể lấy ra “%s” trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Không thể cải tổ “%s” trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Không thể hòa trộn (merge) “%s” trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr ""
+"Thực hiện không thành công lệnh “%s %s” trong đường dẫn mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: đã checkout “%s”\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: được rebase vào trong “%s”\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: được hòa trộn vào “%s”\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Đường dẫn mô-đun-con “%s”: “%s %s”\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Không thể lấy về trong đường dẫn mô-đun-con “%s”; thử lấy về trực tiếp %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Đã lấy về từ đường dẫn mô-đun con “%s”, nhưng nó không chứa %s. Lấy về trực "
+"tiếp lần chuyển giao gặp lỗi đó."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
"tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "chặn kết xuất cho cập nhật bởi cải tổ hoặc hòa trộn"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "ép buộc lấy ra các cập nhật"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "đừng lấy các đối tượng mới từ địa chỉ trên mạng"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "ghi đè chế độ cập nhật trong trường hợp kho lưu trữ là bản sao mới"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "chiều sâu lịch sử muốn lấy về"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 là cần thiết cho superproject"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 của HEAD của mô-đun-con"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr ""
+"git submodule--helper run-update-procedure [<các tùy chọn>] </đường/dẫn>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23023,143 +23358,194 @@
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "bỏ đặt cấu hình trong tập tin .gitmodules"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <tên> [<giá trị>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <tên>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] </đường/dẫn> <url_mới>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "đặt nhánh theo dõi mặc định thành master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "đặt nhánh theo dõi mặc định"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet](-d|--default)</đường/dẫn>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đường/"
"dẫn>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "cần --branch hoặc --default"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "Các tùy chọn --branch và --default loại từ lẫn nhau"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "Đang thêm repo có sẵn tại “%s” vào bảng mục lục\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "“%s” đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "Thư mục git cho “%s” được tìm thấy một cách cục bộ với các máy chủ:"
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "Thư mục git cho “%s” được tìm thấy một cách cục bộ với các máy chủ:\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n"
+"Nếu bạn muốn sử dụng lại thư mục git nội bộ này thay vì nhân bản lại lần nữa "
+"từ\n"
" %s\n"
-"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng\n"
-"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy "
-"chọn “--name”.\n"
+"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng "
+"hoặc\n"
+"là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy chọn “--"
+"name”."
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “%s”.\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "không thể lấy ra mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "nhánh của kho để lấy ra khi nhân bản"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Gặp lỗi khi thêm mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Gặp lỗi khi đăng ký mô-đun-con “%s”"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "”%s” thực sự đã tồn tại ở bảng mục lục rồi"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr ""
+"”%s” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-con"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "nhánh của kho để thêm như là mô-đun-con"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "cho phép thêm một đường dẫn mô-đun-con bị bỏ qua khác"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<các tùy chọn>...] --url <url> --path </"
-"đường/dẫn> --name <tên>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "chỉ hiển thị các thông điệp báo lỗi"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "vay mượn các đối tượng từ kho thay thế"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"đặt tên của submodule bằng chuỗi đã cho thay vì mặc định là đường dẫn của nó"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<các tùy chọn>] [--] <kho> [</đường/dẫn>]"
+
+#: builtin/submodule--helper.c:3297
+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"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: “%s” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "“%s” không phải là một tên mô-đun-con hợp lệ"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ"
@@ -23184,21 +23570,21 @@
msgid "shorten ref output"
msgstr "làm ngắn kết xuất ref (tham chiếu)"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "lý do"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "lý do cập nhật"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>]\n"
-"\t\t<tên-thẻ> [<head>]"
+" <tên-thẻ> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -23208,12 +23594,12 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--no-contains "
"<lần_chuyển_giao>] [--points-at <đối-tượng>]\n"
-"\t\t[--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
+" [--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
"[<lần_chuyển_giao>]] [<mẫu>…]"
#: builtin/tag.c:30
@@ -23279,131 +23665,131 @@
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, 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:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "ép buộc sửa thẻ lần commit"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
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:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
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:474
+#: builtin/tag.c:472
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:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
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:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
@@ -23417,201 +23803,196 @@
msgid "failed to create directory %s"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "gặp lỗi khi tạo tập tin %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "gặp lỗi khi xóa tập tin %s"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "gặp lỗi khi xóa thư mục %s"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Đang kiểm thử mtime trong “%s” "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư "
"mục con"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "để các tập tin thay thế các thư mục và “vice-versa”"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr ""
"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "đừng động vào các mục index-only"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
"làm việc"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "ghi ra mục lục ngay cả khi không được đánh cờ là có thay đổi"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "bật/tắt theo dõi hệ thống tập tin"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "xóa bít hợp lệ fsmonitor"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -23619,7 +24000,7 @@
"core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật chia tách mục lục"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -23627,7 +24008,7 @@
"core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn tắt chia tách mục lục"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23635,11 +24016,11 @@
"core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực "
"sự muốn tắt bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23647,29 +24028,29 @@
"core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Nhớ đệm không theo vết được bật cho “%s”"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor được bật"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor đã được đặt; bỏ đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor bị tắt"
@@ -23685,19 +24066,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "xóa tham chiếu"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
@@ -23713,19 +24094,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<các tùy chọn>] </đường/dẫn>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "phục vụ info/refs (thông tin/tham chiếu) cho git-http-backend"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
@@ -23761,63 +24142,58 @@
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<các tùy chọn>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> </đường/dẫn/mới>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các tùy chọn>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<các tùy chọn>] <worktree>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "gặp lỗi khi xóa “%s”"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "Đang xóa %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "báo cáo các cây làm việc đã prune"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "đích cây làm việc không sử dụng được “%s”"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23826,7 +24202,7 @@
"“%s” bị mất nhưng cây làm việc bị khóa;\n"
"dùng “%s -f -f” để ghi đè, hoặc “unlock” và “prune” hay “remove” để xóa"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23835,141 +24211,141 @@
"“%s” bị mất nhưng cây làm việc đã được đăng ký;\n"
"dùng “%s -f” để ghi đè, hoặc “prune” hay “remove” để xóa"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "khởi tạo"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
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:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
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"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason cần --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "được thêm với --lock"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "hiển thị chú thích và lý do mở rộng, nếu có"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr ""
-"thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng "
+"thêm chú thích kiểu “prunable” cho các cây làm việc hết hạn cũ hơn khoảng "
"<thời gian>"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose và --porcelain loại từ lẫn nhau"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "“%s” là cây làm việc chính"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "không thể phác họa ra tên đích đến “%s”"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23978,7 +24354,7 @@
"không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23986,38 +24362,38 @@
"không thể di chuyển một cây-làm-việc bị khóa;\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "gặp lỗi khi chạy “git status” vào “%s”"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --"
"force để xóa nó"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -24026,7 +24402,7 @@
"không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -24034,17 +24410,17 @@
"không thể xóa bỏ một cây-làm-việc bị khóa;\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "sửa chữa: %s: %s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "lỗi: %s: %s"
@@ -24173,18 +24549,18 @@
msgid "close failed on standard output"
msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
"dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s” không có điểm kết:%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "không thể xử lý %s như là một phần bổ sung"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -24193,12 +24569,12 @@
"cách dùng: %s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "gặp lỗi khi khai triển bí danh “%s”; “%s” không phải là lệnh git\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
@@ -24245,66 +24621,32 @@
msgid "exit immediately after advertising capabilities"
msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe đã đang được sử dụng rồi: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "không thể khởi động máy phục vụ lên: “%s”"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "không thể sinh ra daemon trong nền"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid gặp lỗi"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "\"daemon\" vẫn chưa trực tuyến"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "daemon gặp lỗi khi khởi động"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid là chưa rõ ràng"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "\"daemon\" vẫn chưa được tắt đi"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<tên>] [<các tùy chọn>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<tên>] [<các tiến trình>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr ""
"test-helper simple-ipc start-daemon [<tên>] [<các tiến trình>] [<chờ tối đa>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<tên>] [<chờ tối đa>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<tên>] [<thẻ>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<tên>] [<số lượng byte>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -24312,87 +24654,83 @@
"test-helper simple-ipc multiple [<tên>] [<các tiến trình>] [<số lượng "
"byte>] [<cỡ bó>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "tên hoặc tên đường dẫn của ổ cắm miền unix"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "tên named-pipe"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "số lượng tiến trình trong kho tiến trình máy phục vụ"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "số giây mà dịch vụ chạy nền chờ khi khởi động hoặc dừng"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "số lượng byte"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "số lượng yêu cầu mỗi tiến trình"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "byte"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ký tự ballast"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "thẻ bài"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "thẻ bài lệnh để gửi lên cho máy phục vụ"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "giá trị âm cho http.postbuffer; đặt thành mặc định là %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE không được hỗ trợ với cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
"Không hỗ trợ ứng dụng SSL chạy phía sau “%s”. Hỗ trợ ứng dụng SSL chạy phía "
"sau:"
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Không thể đặt ứng dụng chạy SSL phía sau “%s”: cURL được biên dịch không có "
"sự hỗ trợ ứng dụng chạy phía sau SSL"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s”: đã đặt rồi"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24408,47 +24746,52 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "sai trích dẫn trong giá trị push-option :“%s”"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói "
"flush"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "trả về của máy phục vụ không hợp lệ; nhận được %s"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "không tìm thấy kho “%s”"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Xác thực gặp lỗi cho “%s”"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "không thể truy cập “%s” với cấu hình http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "không thể truy cập “%s”: %s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "không nên có EOF khi không gentle trên EOF"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "máy phục vụ gửi gói kết thúc không cần"
@@ -24456,83 +24799,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: ký tự chiều dài dòng bị sai: %.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngờ"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC gặp lỗi; %s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "không thể xử lý đẩy cái lớn này"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "đã nhận về phần đầu có chiều dài %d byte"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "phần thân vẫn còn cần %d byte"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "lấy về gặp lỗi."
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "không thể lấy về bằng sha1 thông qua smart http"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "vận chuyển http không hỗ trợ %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push gặp lỗi"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: không hiểu lệnh “%s” từ git"
@@ -24553,46 +24896,46 @@
msgid "object filtering"
msgstr "lọc đối tượng"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "ngày hết hạn"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng"
-#: parse-options.h:337
+#: parse-options.h:335
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"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "đọc đặc tả đường dẫn từ tập tin"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
"với --pathspec-from-file, các phần tử đặc tả đường dẫn bị ngăn cách bởi ký "
"tự NULL"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "khóa"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
@@ -25292,41 +25635,6 @@
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"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "đang chạy lệnh $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-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:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect không thể tiếp tục thêm được nữa"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"chạy bisect gặp lỗi:\n"
-"”bisect-state $state” đã thoát ra với mã lỗi $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect chạy thành công"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -25367,58 +25675,19 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
-#: git-submodule.sh:179
-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:189
-#, 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:208
-#, 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:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-"”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-"
-"con"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra"
-
-#: git-submodule.sh:248
-#, 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:257
-#, 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:532
+#: git-submodule.sh:401
#, 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:542
+#: git-submodule.sh:411
#, 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:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25427,402 +25696,11 @@
"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
"đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực "
-"tiếp $sha1:"
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
-"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-
-#: git-submodule.sh:578
-#, 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:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-
-#: git-submodule.sh:583
-#, 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:584
-#, 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:589
-#, 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:590
-#, 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:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
-"“$displaypath”"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, 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-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Đã áp dụng autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Không thể lưu $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Áp dụng autostash có hiệu quả trong các xung đột.\n"
-"Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n"
-"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
-"nào.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Đang rebase ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"Các lệnh:\n"
-"p, pick <commit> = dùng lần chuyển giao\n"
-"r, reword <commit> = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n"
-"e, edit <commit> = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n"
-"s, squash <commit> = dùng lần chuyển giao, nhưng meld vào lần chuyển giao kế "
-"trước\n"
-"f, fixup <commit> = giống như \"squash\", nhưng loại bỏ chú thích của lần "
-"chuyển giao này\n"
-"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n"
-"d, drop <commit> = xóa lần chuyển giao\n"
-"l, label <label> = đánh nhãn HEAD hiện tại bằng một tên\n"
-"t, reset <label> = đặt lại HEAD thành một nhãn\n"
-"m, merge [-C <commit> | -c <commit>] <nhãn> [# <một_dòng>]\n"
-". tạo một lần chuyển giao hòa trộn sử dụng chú thích của lần chuyển\n"
-". giao hòa trộn gốc (hoặc một_dòng, nếu không chỉ định lần chuyển giao "
-"hòa\n"
-". trộn gốc). Dùng -c <commit> để reword chú thích của lần chuyển "
-"giao.\n"
-"\n"
-"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
-"đáy.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Bạn có thể tu bổ lần chuyển giao ngay bây giờ bằng:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Không thể di chuyển HEAD đến $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Từ chối squash lần hòa trộn: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Không thể lấy ra $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Đây là tổ hợp của $count lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Không thể $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Đây là tổ hợp của 2 lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Không thể áp dụng $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"Không thể tu bổ lần chuyển giao sau khi lấy ra $sha1… $rest thành công\n"
-"Việc này có thể là do một ghi chú cho lần chuyển giao là trống rỗng, hoặc "
-"móc pre-commit\n"
-"gặp lỗi. Nếu là móc pre-commit bị lỗi, Bạn có lẽ cần giải quyết trục trặc "
-"này\n"
-"trước khi bạn có thể làm việc lại với lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Bị dừng tại $sha1_abbrev… $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Đang thực thi: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Thực thi gặp lỗi: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Bạn có thể sửa các trục trặc, và sau đó chạy lệnh “cải tổ”:\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Thực thi thành công: $rest\n"
-"nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n"
-"Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Lệnh chưa biết: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Cài tổ và cập nhật $head_name một cách thành công."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"Bạn có các thay đổi so với trong bệ phóng trong\n"
-"thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n"
-"squash vào lần chuyển giao kế trước, chạy:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Trong cả hai trường hợp, một khi bạn làm xong, tiếp tục bằng:\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc.\n"
-"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
-"nữa."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Không thể thực thi trình biên soạn"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Không thể lấy ra $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Không HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Không thể tạo thư mục tạm thời $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Không thể đánh dấu là tương tác"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25842,50 +25720,32 @@
"lỗi nghiêm trọng: $program_name không thể được dùng ngoaoif thư mục làm việc."
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Không thể $action: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
"giao."
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc."
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git"
@@ -26232,7 +26092,7 @@
#: git-send-email.perl:214
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
-msgstr "lỗi nghiêm trọng: lệnh '%s' chết với mã thoát %d"
+msgstr "lỗi nghiêm trọng: lệnh “%s” chết với mã thoát %d"
#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
@@ -26520,7 +26380,7 @@
msgid "Result: OK\n"
msgstr "Kết quả: Tốt\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "không thể mở tập tin “%s”"
@@ -26545,30 +26405,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi “%s”"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "không thể lấy gửi thư dạng 7 bít"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "bảng mã truyền không hợp lệ"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26579,12 +26439,12 @@
"%s\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26593,17 +26453,529 @@
"nghiêm trọng: %s: %d là dài hơn 998 ký tự\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Các đặc tả đường dẫn sau đây không khớp với bất kỳ đường dẫn thích hợp "
+#~ "nào,\n"
+#~ "nhưng chúng khớp với các mục mục lục bên ngoài \"sparse checkout\" hiện "
+#~ "tại:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật "
+#~ "các mục như vậy."
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "không thể đặt GIT_DIR thành “%s”"
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "gặp lỗi khi mở “/dev/null”"
+
+#~ 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 ""
+#~ "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
+#~ "với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
+#~ "và chuyển giao kết quả bằng lệnh “git commit”"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "gặp lỗi khi mở “/dev/null” hay dup"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Không thể mở “%s” để ghi."
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s”"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <lúc_sai> <lúc_đúng> [<term>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "không thể tạo tập tin mới tại “%s”"
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: gặp lỗi khi mở “%s”"
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "không thể mở packfile “%s”"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "không thể lưu tập tin gói"
+
+#~ msgid "cannot store index file"
+#~ msgstr "không thể lưu trữ tập tin ghi mục lục"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "mẫu loại trừ được đọc từ <tập tin>"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "danh sách cần làm không dùng được: “%s”"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<các tùy chọn>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "cải tổ các lần chuyển giao hòa trộn"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "ký các lần chuyển giao"
+
+#~ msgid "continue rebase"
+#~ msgstr "tiếp tục cải tổ"
+
+#~ msgid "skip commit"
+#~ msgstr "bỏ qua lần chuyển giao"
+
+#~ msgid "edit the todo list"
+#~ msgstr "sửa danh sách cần làm"
+
+#~ msgid "show the current patch"
+#~ msgstr "hiển thị miếng vá hiện hành"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "khai triển mã chuyển giao trong danh sách cần làm"
+
+#~ msgid "check the todo list"
+#~ msgstr "kiểm tra danh sách cần làm"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "sắp xếp lại các dòng fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "chèn các lệnh thực thi trong danh sách cần làm"
+
+#~ msgid "onto"
+#~ msgstr "lên trên"
+
+#~ msgid "restrict-revision"
+#~ msgstr "điểm-xét-duyệt-hạn-chế"
+
+#~ msgid "restrict revision"
+#~ msgstr "điểm xét duyệt hạn chế"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-lên-trên"
+
+#~ msgid "squash onto"
+#~ msgstr "squash lên trên"
+
+#~ msgid "the upstream commit"
+#~ msgstr "lần chuyển giao thượng nguồn"
+
+#~ msgid "head-name"
+#~ msgstr "tên-đầu"
+
+#~ msgid "head name"
+#~ msgstr "tên đầu"
+
+#~ msgid "rebase strategy"
+#~ msgstr "chiến lược cải tổ"
+
+#~ msgid "strategy-opts"
+#~ msgstr "tùy-chọn-chiến-lược"
+
+#~ msgid "strategy options"
+#~ msgstr "các tùy chọn chiến lược"
+
+#~ msgid "switch-to"
+#~ msgstr "chuyển-đến"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "nhánh hay lần chuyển giao lần lấy ra"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "tên lên trên"
+
+#~ msgid "cmd"
+#~ msgstr "lệnh"
+
+#~ msgid "the command to run"
+#~ msgstr "lệnh muốn chạy"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr ""
+#~ "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<các tùy chọn>…] --url <url> --path </"
+#~ "đường/dẫn> --name <tên>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "gặp lỗi khi tạo tập tin %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "socket/pipe đã đang được sử dụng rồi: “%s”"
+
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "không thể khởi động máy phục vụ lên: “%s”"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "không thể sinh ra daemon trong nền"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid gặp lỗi"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "\"daemon\" vẫn chưa trực tuyến"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "daemon gặp lỗi khi khởi động"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid là chưa rõ ràng"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "\"daemon\" vẫn chưa được tắt đi"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "đang chạy lệnh $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Đã áp dụng autostash."
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Không thể lưu $stash_sha1"
+
+#~ 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 ""
+#~ "Áp dụng autostash có hiệu quả trong các xung đột.\n"
+#~ "Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n"
+#~ "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
+#~ "nào.\n"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Đang rebase ($new_count/$total)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Các lệnh:\n"
+#~ "p, pick <commit> = dùng lần chuyển giao\n"
+#~ "r, reword <commit> = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n"
+#~ "e, edit <commit> = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n"
+#~ "s, squash <commit> = dùng lần chuyển giao, nhưng meld vào lần chuyển giao "
+#~ "kế trước\n"
+#~ "f, fixup <commit> = giống như \"squash\", nhưng loại bỏ chú thích của lần "
+#~ "chuyển giao này\n"
+#~ "x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n"
+#~ "d, drop <commit> = xóa lần chuyển giao\n"
+#~ "l, label <label> = đánh nhãn HEAD hiện tại bằng một tên\n"
+#~ "t, reset <label> = đặt lại HEAD thành một nhãn\n"
+#~ "m, merge [-C <commit> | -c <commit>] <nhãn> [# <một_dòng>]\n"
+#~ ". tạo một lần chuyển giao hòa trộn sử dụng chú thích của lần "
+#~ "chuyển\n"
+#~ ". giao hòa trộn gốc (hoặc một_dòng, nếu không chỉ định lần chuyển "
+#~ "giao hòa\n"
+#~ ". trộn gốc). Dùng -c <commit> để reword chú thích của lần chuyển "
+#~ "giao.\n"
+#~ "\n"
+#~ "Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống "
+#~ "dưới đáy.\n"
+
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Bạn có thể tu bổ lần chuyển giao ngay bây giờ bằng:\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Chuyển-tiếp-nhanh đến $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Không thể di chuyển HEAD đến $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Từ chối squash lần hòa trộn: $sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Không thể lấy ra $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:"
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:"
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Đây là tổ hợp của $count lần chuyển giao."
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Không thể $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Đây là tổ hợp của 2 lần chuyển giao."
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Không thể áp dụng $sha1… $rest"
+
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "Không thể tu bổ lần chuyển giao sau khi lấy ra $sha1… $rest thành công\n"
+#~ "Việc này có thể là do một ghi chú cho lần chuyển giao là trống rỗng, hoặc "
+#~ "móc pre-commit\n"
+#~ "gặp lỗi. Nếu là móc pre-commit bị lỗi, Bạn có lẽ cần giải quyết trục trặc "
+#~ "này\n"
+#~ "trước khi bạn có thể làm việc lại với lần chuyển giao."
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Bị dừng tại $sha1_abbrev… $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "Đang thực thi: $rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Thực thi gặp lỗi: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Bạn có thể sửa các trục trặc, và sau đó chạy lệnh “cải tổ”:\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Thực thi thành công: $rest\n"
+#~ "nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n"
+#~ "Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Lệnh chưa biết: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Cài tổ và cập nhật $head_name một cách thành công."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
+
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "Bạn có các thay đổi so với trong bệ phóng trong\n"
+#~ "thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n"
+#~ "squash vào lần chuyển giao kế trước, chạy:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Trong cả hai trường hợp, một khi bạn làm xong, tiếp tục bằng:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc.\n"
+#~ "Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” "
+#~ "lần nữa."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Không thể thực thi trình biên soạn"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Không thể lấy ra $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Không HEAD?"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Không thể tạo thư mục tạm thời $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Không thể đánh dấu là tương tác"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
+#~ "giao."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
+
#~ msgid "unable to write stateless separator packet"
#~ msgstr "không thể ghi gói phân tách không trạng thái"
@@ -26628,7 +27000,6 @@
#~ msgid "one"
#~ msgstr "một"
-#, c-format
#~ msgid "Already up to date!"
#~ msgstr "Đã cập nhật rồi!"
@@ -26648,7 +27019,6 @@
#~ "việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
#~ "Xem mục tin của nó trong “ git help config” để biết chi tiết."
-#, perl-format
#~ msgid "%s: patch contains a line longer than 998 characters"
#~ msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
@@ -26664,11 +27034,9 @@
#~ msgid "repository is shallow; skipping commit-graph"
#~ msgstr "kho nguồn là nông, nên bỏ qua commit-graph"
-#, c-format
#~ msgid "commit-graph improper chunk offset %08x%08x"
#~ msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
-#, c-format
#~ msgid "commit-graph chunk id %08x appears multiple times"
#~ msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần"
@@ -26721,11 +27089,9 @@
#~ msgid "Force progress reporting"
#~ msgstr "Ép buộc báo cáo diễn biến công việc"
-#, 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”"
-#, c-format
#~ msgid "Error deleting branch '%s'"
#~ msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
@@ -26744,14 +27110,12 @@
#~ msgid "too many params"
#~ msgstr "quá nhiều đối số"
-#, sh-format
#~ msgid "Bad rev input: $arg"
#~ msgstr "Đầu vào rev sai: $arg"
#~ msgid "Counting distinct commits in commit graph"
#~ msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
-#, c-format
#~ msgid "the commit graph format cannot write %d commits"
#~ msgstr ""
#~ "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
@@ -27576,9 +27940,6 @@
#~ 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”"
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) không nhận các đối số"
-
#~ msgid "submodule update strategy not supported for submodule '%s'"
#~ msgstr ""
#~ "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s”"
@@ -27910,9 +28271,6 @@
#~ msgid "Can't cherry-pick into empty head"
#~ msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
-#~ msgid "could not open %s for writing"
-#~ msgstr "không thể mở %s để ghi"
-
#~ msgid "bug: unhandled unmerged status %x"
#~ msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
@@ -28080,9 +28438,6 @@
#~ 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 "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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index abbf74c..60ffa45 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -136,228 +136,230 @@
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
+# Fangyi Zhou <me@fangyi.io>, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 17:27+0800\n"
-"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-10 12:16+0000\n"
+"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 41.0\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "不能读取索引"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "不能写入索引"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的：%s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "检视 diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "显示含变更的路径"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "帮助："
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "选择一个条目"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "选择一系列条目"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "选择多个范围"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "反选指定的条目"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "选择所有条目"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "（空）结束选择"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "选择一个编号条目"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "（空）不选择任何内容"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "请选择"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "路径"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
@@ -855,7 +857,7 @@
msgid "'git apply' failed"
msgstr "'git apply' 失败"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -864,37 +866,37 @@
"\n"
"使用 \"git config advice.%s false\" 来关闭此消息"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:270
+#: advice.c:196
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."
@@ -902,37 +904,47 @@
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹配：\n"
+"下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
+"所以不会在索引中更新：\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"如果您意图更新这些条目，请尝试下列其中之一：\n"
+"* 使用 --sparse 选项。\n"
+"* 禁用或者修改稀疏规则。"
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1104,49 +1116,49 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3056
+#: apply.c:3057
#, 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 行）"
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1155,438 +1167,439 @@
"当查询：\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "仓库缺乏执行三方合并所必需的数据对象。"
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "执行三方合并...\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "无法执行三方合并...\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回落到直接应用...\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3981
+#: apply.c:4003
#, 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）不匹配"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4559
+#: apply.c:4581
#, 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 个被拒绝..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "数字"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "动作"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "根目录"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
@@ -1657,152 +1670,151 @@
msgid "cannot read %s"
msgstr "不能读取 %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "无此引用：%.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一个有效的对象名：%s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "不是一个树对象：%s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "当前工作目录未被跟踪"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "文件未找到：%s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "不是一个常规文件：%s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "格式"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "归档格式"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "前缀"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "文件"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "将未跟踪文件添加到归档"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "设置压缩级别"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "仓库"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "命令"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "选项 --add-file 和 --remote 不能同时使用"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允许 %s：%s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1810,22 +1822,22 @@
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1834,7 +1846,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1843,7 +1855,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1852,7 +1864,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1863,7 +1875,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1874,36 +1886,36 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1912,7 +1924,7 @@
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1922,7 +1934,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1941,11 +1953,12 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -2066,7 +2079,7 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
+"如果您正计划基于远程一个现存的上游分支开始您的工作，\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
@@ -2117,8 +2130,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -2176,7 +2189,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "不能写入，归档包版本 %d 不支持算法 %s"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
@@ -2218,7 +2231,7 @@
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "无效的哈希版本"
@@ -2263,217 +2276,217 @@
msgid "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交图需要溢出世代数据，但是没有"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "正在计算提交图拓扑级别"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "计算提交变更路径的布隆过滤器"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "正在收集引用的提交"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "无法创建临时图层"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "无法为 '%s' 调整共享权限"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交！"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2493,27 +2506,27 @@
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2527,7 +2540,7 @@
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2542,35 +2555,35 @@
"\t%2$s\n"
"这可能是因为循环包含。"
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "无效的配置格式：%s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "配置 '%.*s' 缺少环境变量名称"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称：%s"
@@ -2580,295 +2593,295 @@
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名（有换行符）：%s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "空的配置键名"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数：%s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "%s 中错误计数"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "%s 中太多的条目"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "缺失配置键名 %s"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "缺失配置取值 %s"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "超出范围"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录：'%s'"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围：%d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "不能 mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
@@ -2902,72 +2915,72 @@
msgid "expected flush after capabilities"
msgstr "在能力之后应为一个 flush 包"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "忽略第一行 '%s' 之后的能力字段"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "协议错误：意外的 capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "另一端的仓库不能是浅克隆仓库"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "无效数据包"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "协议错误：意外的 '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "服务器给出未知的对象格式 '%s'"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "无效的 ls-refs 响应：%s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "在引用列表之后应该有一个 flush 包"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "在引用列表之后应该有响应结束包"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支持 '%s' 协议"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "无法为 socket 设置 SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "查找 %s ..."
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "无法查找 %s（端口 %s）（%s）"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2976,7 +2989,7 @@
"完成。\n"
"连接到 %s（端口 %s）... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2986,77 +2999,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "完成。"
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "无法查找 %s（%s）"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "未知端口 %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的端口号 '%s'"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
@@ -3197,17 +3210,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "拒绝使用缺少协议字段的凭据"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL 的 %s 组件中包含换行符：%s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "URL 没有 scheme：%s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "不能解析凭据 URL：%s"
@@ -3309,23 +3322,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "未知的 --diff-merges 取值：%s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base 不适用于范围"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base 仅适用于提交"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "不能解析 HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "未找到合并基线"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "找到了多条合并基线"
@@ -3340,18 +3353,18 @@
msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者：注意保持前导空格
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3359,7 +3372,7 @@
"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
"'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3368,18 +3381,18 @@
"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3388,46 +3401,46 @@
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
-msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
+msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3436,200 +3449,200 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "选项 -I 的正则表达式无效：'%s'"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3637,311 +3650,311 @@
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略所有行都和正则表达式匹配的变更"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<路径>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "先显示指定路径的变更"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "跳过指定路径的输出"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "由于文件太多，跳过详尽的重命名检查。"
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3952,7 +3965,7 @@
msgid "failed to read orderfile '%s'"
msgstr "读取排序文件 '%s' 失败"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
@@ -3990,337 +4003,410 @@
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录名。\n"
+"请在命令行指定一个目录"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示：等待您的编辑器关闭文件...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "过滤内容"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "不能设置 GIT_DIR 为 '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack：无效的 index-pack 输出"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "服务器不支持浅客户端"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "服务器不支持这个仓库的对象格式"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "源仓库是浅克隆，拒绝克隆。"
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "不匹配的算法：客户端 %s，服务端 %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "服务器不支持算法 '%s'"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "服务器不支持浅克隆请求"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack：预期响应结束包"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "来自远程的意外的 'ready'"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
+"（openssh 8.2p1+ 版本可用）"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "坏的/不兼容的签名 '%s‘"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "无法得到密钥 '%s' 的 ssh 指纹"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg 数据签名失败"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "ssh 签名需要设置 user.signingkey"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "无法将 ssh 签名密钥写入 '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "无法从 '%s' 读入 ssh 签名数据"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4328,109 +4414,109 @@
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "开始一个工作区（参见：git help tutorial）"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "在当前变更上工作（参见：git help everyday）"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "检查历史和状态（参见：git help revisions）"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "扩展、标记和调校您的历史记录"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "协同（参见：git help workflows）"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "主要的上层命令"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "辅助命令/操作者"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "辅助命令/询问者"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "与其它系统交互"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "低级命令/操作者"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "低级命令/询问者"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "低级命令/同步仓库"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "低级命令/内部助手"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令："
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Git 概念向导有："
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "执行 'git help <command>' 来查看特定子命令"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "外部命令"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "命令别名"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4525,36 @@
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 并继续。"
+msgstr "假定您想要的是 '%s' 并继续。"
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "取而代之运行 '%s' ？ (y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
+msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4477,16 +4568,16 @@
"\n"
"最相似的命令是"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4500,6 +4591,15 @@
"\n"
"您指的是这其中的某一个么？"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
+"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "作者身份未知\n"
@@ -4523,7 +4623,7 @@
"\n"
msgstr ""
"\n"
-"*** 请告诉我你是谁。\n"
+"*** 请告诉我您是谁。\n"
"\n"
"运行\n"
"\n"
@@ -4561,7 +4661,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
@@ -4654,7 +4754,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "lsrefs.unborn 的取值 '%s' 无效"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "意外的行：'%s'"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 参数后应该有一个 flush 包"
@@ -4662,37 +4767,37 @@
msgid "quoted CRLF detected"
msgstr "检测到被引用的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "'%2$s' 的错误动作 '%1$s'"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s （没有检出）"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s（提交不存在）"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "注意：快进子模组 %s 到 %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "无法合并子模组 %s"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4701,7 +4806,7 @@
"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4717,7 +4822,7 @@
"\n"
"以接受此建议。\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4726,21 +4831,21 @@
"无法合并子模组 %s，但是存在多个可能的合并：\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4749,7 +4854,7 @@
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
"在：%s。"
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4758,7 +4863,7 @@
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
"径放置于此：%s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4768,14 +4873,14 @@
"冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
"录中，没有一个目标目录中包含多数文件。"
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +4888,7 @@
msgstr ""
"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +4897,7 @@
"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
"动到 %5$s。"
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +4906,7 @@
"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
"到 %s。"
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4810,13 +4915,13 @@
"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
"建议将其移动到 %5$s。"
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,29 +4931,29 @@
"冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
"可能导致嵌套的冲突标签。"
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4857,7 +4962,7 @@
"冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
"置。"
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4866,24 +4971,24 @@
"冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
"位置。"
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "内容"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "添加/添加"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "子模组"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4892,7 +4997,7 @@
"冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
"在树中被保留。"
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4902,12 +5007,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "无法收集树 %s、%s、%s 的合并信息"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4916,103 +5021,103 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "已经是最新的。"
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败：%s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败：%s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交："
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s（非快进）"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案：\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s （发现多个合并）"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5021,7 +5126,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5030,7 +5135,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5039,7 +5144,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5048,40 +5153,40 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5090,18 +5195,18 @@
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5111,7 +5216,7 @@
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5120,79 +5225,79 @@
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能写入索引。"
@@ -5200,189 +5305,221 @@
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的对象ID扇出表大小错误"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "无法存储反向索引文件"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "不能解析行： %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "格式错误的行：%s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略已存在的多包索引，校验码不匹配"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "不能载入包"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "不能打开 %s 的索引"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "添加包文件到多包索引"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "没有看到要丢弃的包文件 %s"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知的首选包：'%s'"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "不能选择没有对象的首选包 %s"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到要丢弃的包文件 %s"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "首选包 '%s' 已过期"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "没有要索引的包文件。"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "无法写入多包位图"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "删除 %s 失败"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "多包索引文件存在，但无法解析"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "不正确的校验码"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx 不包含 oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "校验多包索引中的 OID 顺序"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "正在对引用对象计数"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在查找和删除未引用的包文件"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
@@ -5440,257 +5577,257 @@
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹配的对象目录"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行：%s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失败%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "无效的对象类型"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "无法解开 %s 头部"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "无效的对象类型"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "无法解开 %s 头部"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的头部太长，超出了 %d 字节"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "文件写错误"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "损坏的提交"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "损坏的标签"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入数据库失败"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
@@ -5816,12 +5953,25 @@
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位图缺少必需的反向索引"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：无法打开包"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "无法得到 %s 的大小"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "无法得到 %s 的磁盘使用量"
@@ -5851,45 +6001,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "无法同时写入和校验反向索引"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "不能调用 stat：%s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "无法设置 %s 为可读"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "无法写入 '%s' 承诺者文件"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "包文件 %s 不能被映射%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "选项 `%s' 期望一个数字值"
@@ -5909,71 +6059,71 @@
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s 需要一个值"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s 与 %s 不兼容"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s：和其它的不兼容"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s 不可用"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
-msgstr "你的意思是 `--%s`（有两个短线）？"
+msgstr "您的意思是 `--%s`（有两个短线）？"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5981,98 +6131,122 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " 或：%s"
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:935
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-数字"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "只允许一个 'attr:' 规格。"
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "属性规格不能为空"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "无效的属性名 %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助记符：'%c'）"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "行被错误地引用：%s"
@@ -6093,7 +6267,7 @@
msgid "flush packet write failed"
msgstr "flush 包写错误"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "协议错误：不可能的长行"
@@ -6101,7 +6275,7 @@
msgid "packet write with format failed"
msgstr "格式化包写入错误"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "写数据包失败：数据超过了包的最大长度"
@@ -6110,25 +6284,25 @@
msgid "packet write failed: %s"
msgstr "数据包写入失败：%s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "读取错误"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "远端意外挂断了"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "协议错误：错误的行长度字符串：%.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "协议错误：错误的行长度 %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
@@ -6142,7 +6316,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "无法创建线程 lstat：%s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
@@ -6171,32 +6345,32 @@
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "生成 diff 失败"
@@ -6223,7 +6397,7 @@
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s：只能添加常规文件、符号链接或 git 目录"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 没有检出一个提交"
@@ -6243,16 +6417,16 @@
msgid "unable to stat '%s'"
msgstr "无法对 %s 执行 stat"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6261,7 +6435,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6270,144 +6444,144 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s：打开索引文件失败"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能对打开的索引执行 stat 操作"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引文件比预期的小"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s：无法映射索引文件%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "无法转换为稀疏索引"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暂存区 #0"
@@ -6480,7 +6654,7 @@
msgstr[0] "变基 %s 到 %s（%d 个提交）"
msgstr[1] "变基 %s 到 %s（%d 个提交）"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6488,7 +6662,7 @@
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6496,7 +6670,7 @@
"\n"
"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6510,7 +6684,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6520,14 +6694,14 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "不能写入 '%s'。"
@@ -6557,12 +6731,10 @@
"可选值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s： 'preserve' 被 'merges' 取代"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6583,257 +6755,277 @@
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "未能识别的 %%(objectsize) 参数：%s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "未能识别的 %%(subject) 参数：%s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "预期 %%(trailers:key=<值>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "未能识别的 %%(raw) 参数：%s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "未识别的邮件选项：%s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 不带参数"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "这个命令拒绝元素 %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "（非分支，正变基分离头指针 %s）"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（头指针在 %s 分离）"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（头指针自 %s 分离）"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "（非分支）"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6857,81 +7049,81 @@
"\n"
"\tgit branch -m <name>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "无法获取 `%s`"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "无效的分支名：%s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "引用更新被钩子中止"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
@@ -7228,7 +7420,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "写入 '%s' (%s) 时出错"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "刷新 '%s' 失败"
@@ -7273,8 +7465,8 @@
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
@@ -7312,46 +7504,41 @@
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指向的树。"
+msgstr "无法找到 %s 指向的树"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input 和 --no-walk 不兼容"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "不再支持 --unpacked=<packfile>"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk 和 --unsorted-input 不兼容"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "不能打开 /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
-"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
@@ -7370,69 +7557,70 @@
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack：无法派生 fetch 子进程"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "推送协商失败，但还是继续推送"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "接收端不支持这个仓库的哈希算法"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送（--signed）"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送（--atomic）"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "还原"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "变基"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7440,52 +7628,71 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
-"对修正后的文件做标记，然后用 'git commit' 提交"
+"解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
+"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解决所有冲突之后，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然后执行 \"git revert --continue\"。您也可以执行\n"
+"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
@@ -7493,65 +7700,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7580,11 +7787,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7608,7 +7815,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7631,344 +7838,349 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "无效的作者身份 '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "损坏的作者：缺失日期信息"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "第一个提交说明将被跳过："
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -7977,16 +8189,16 @@
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -8005,27 +8217,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "正在执行：%s\n"
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -8040,11 +8252,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -8061,90 +8273,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "无法自动贮藏"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的贮藏响应：'%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了自动贮藏：%s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "无法硬性重置（reset --hard）"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用自动贮藏。\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8155,29 +8367,29 @@
"您的修改在贮藏区中很安全。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "应用自动贮藏导致冲突。"
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8197,58 +8409,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在变基（%d/%d）%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功变基并更新 %s。\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8257,50 +8469,59 @@
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "跳过了先前已应用的提交 %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
@@ -8456,27 +8677,15 @@
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "不能打开或者复制 /dev/null"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid 失败"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "尝试在没有 cone 模式下使用稀疏索引"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "不能更新缓存树，保持完整"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
@@ -8533,13 +8742,13 @@
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "不能编辑 '%s'"
@@ -8563,7 +8772,7 @@
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
@@ -8586,70 +8795,70 @@
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "坏的 --ignore-submodules 参数：%s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "处理子模组 '%s' 失败"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送子模组 '%s'\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "无法推送子模组 '%s'\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在获取子模组 %s%s\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "无法访问子模组 '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8658,77 +8867,77 @@
"获取子模组时的错误：\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为 git 仓库"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "无法重置子模组索引"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "禁止移动 '%s' 到现存 git 目录中"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8739,11 +8948,11 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -8765,7 +8974,7 @@
msgstr "键 '%2$s' 的未知取值 '%1$s'"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
@@ -8780,11 +8989,11 @@
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
@@ -8850,7 +9059,7 @@
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
@@ -8868,7 +9077,7 @@
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
@@ -8877,7 +9086,7 @@
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only 需要协议 v2"
@@ -8890,59 +9099,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error，助手说 '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "助手 %s 不支持 --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "助手 %s 不支持 --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持推送，需要引用规格"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8951,52 +9160,52 @@
"没有共同的引用并且也没有指定，什么也不会做。\n"
"也许您应该指定一个分支。\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支持的对象格式 '%s'"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
@@ -9010,53 +9219,53 @@
msgid "could not read bundle '%s'"
msgstr "无法读取归档包 '%s'"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "服务器不支持 wait-for-done"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -9083,11 +9292,11 @@
"以推送至远程。\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
@@ -9333,7 +9542,7 @@
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
-msgstr "在修复上述路径之后，你可能要执行 `git sparse-checkout reapply`。\n"
+msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
#: unpack-trees.c:352
msgid "Updating files"
@@ -9348,16 +9557,16 @@
"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
"并且碰撞组中只有一个文件存在工作区中：\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "正在更新索引标志"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作树和未跟踪提交具有重复条目：%s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "在 fetch 参数之后应该有一个 flush 包"
@@ -9394,7 +9603,7 @@
msgid "Fetching objects"
msgstr "正在获取对象"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
@@ -9490,17 +9699,27 @@
msgid "gitdir file points to non-existent location"
msgstr "gitdir 文件指向一个不存在的位置"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "不能设置环境变量 '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
@@ -10062,25 +10281,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "无法发送 IPC 命令"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "无法读取 IPC 响应"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "无法启动 accept_thread '%s'"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "无法启动 '%s' 的 worker[0]"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
@@ -10089,131 +10308,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "不能 chmod %cx '%s'"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "无法为写入打开 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "允许更新稀疏检出 cone 以外的条目"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "`git stash -p` 的后端"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10241,12 +10459,12 @@
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10256,51 +10474,51 @@
"运行下面的命令来关闭本消息\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run 与 --interactive/--patch 不兼容"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file 与 --edit 不兼容"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 与路径表达式参数不兼容"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10310,105 +10528,105 @@
"运行下面的命令来关闭本消息\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺失作者行"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10416,24 +10634,24 @@
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -10441,35 +10659,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
@@ -10492,177 +10710,177 @@
msgstr ""
"在您的索引中仍存在未合并的路径。\n"
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
-"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
+"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
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:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "无效的 --show-current-patch 值：%s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交说明中添加 Signed-off-by 尾注"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "传递给 git-mailinfo"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "恢复原始分支并终止打补丁操作"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "终止补丁操作但保持 HEAD 不变"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "显示正在应用的补丁"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10670,16 +10888,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10688,11 +10906,11 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
@@ -10700,44 +10918,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能创建归档文件 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "不能重定向输出"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive：未提供远程 URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive：协议错误"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive：应有一个 flush 包"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10775,72 +10984,85 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <命令>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "不能写入文件 '%s'"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "不能打开文件 '%s' 来读取"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "请使用两个不同的术语"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "我们没有在二分查找。\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一个有效的提交"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "坏的 bisect_write 参数：%s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "无法获取版本 '%s' 的对象 ID"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10849,7 +11071,7 @@
"您需要给我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10860,7 +11082,7 @@
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -10869,22 +11091,22 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "未定义术语"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10893,52 +11115,52 @@
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "版本遍历设置失败\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "无法打开 '%s' 进行追加"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' 不是一个有效的术语"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项：'%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用：'%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "您需要执行 \"git bisect start\" 来开始\n"
@@ -10946,104 +11168,148 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]？ "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "请使用至少一个参数调用 `--bisect-state`"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' 只能带一个参数。"
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "坏的版本输入：%s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "坏的版本输入（不是提交）：%s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "'%s'?? 您在说什么?"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "不能读取文件 '%s' 来重放"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "二分查找运行失败：没有提供命令。"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "正在执行 %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "无法打开文件 '%s' 进行写入"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "二分查找不能继续运行"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "二分查找运行成功"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分查找找到了第一个坏的提交"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "查询下一个二分查找提交"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "标记引用的状态"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "列出到目前为止的二分查找步骤"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "从给定文件重放二分查找进程"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "跳过要检出的一些提交"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "可视化二分查找过程"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "使用 <命令>... 来自动二分查找。"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需要 2 或 3 个参数"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 个参数"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 需要 0 个参数"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "未提供日志文件"
@@ -11055,149 +11321,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "不显示边界提交的对象名（默认：关闭）"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "显示工作消耗统计"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "显示 blame 条目的输出得分"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的镜像"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "得分"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "范围"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
@@ -11209,18 +11477,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "追踪代码行"
@@ -11323,74 +11591,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11401,209 +11669,209 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "对象"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, 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:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11611,39 +11879,39 @@
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git 版本：\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() 失败，错误为 '%s'（%d）\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "编译器信息："
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc 信息："
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11677,38 +11945,33 @@
"请检查下面错误报告中余下的内容。\n"
"您可以删除任何您不想共享的内容。\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "指定错误报告文件的目标位置"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "指定文件的 strftime 格式后缀"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "系统信息"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "启用的钩子"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "不能在 '%s' 创建新文件"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "无法写入 %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "在 '%s' 创建了新报告。\n"
@@ -11729,53 +11992,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <文件> [<引用名>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "指定归档包的格式版本"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "需要一个仓库来创建归档包。"
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "不显示归档包的细节"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解开归档包。"
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "冗长输出；必须置于子命令之前"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "解包对象中"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11783,7 +12046,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11791,71 +12054,71 @@
"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
"[--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
@@ -11875,7 +12138,7 @@
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "从标准输入读出文件名"
@@ -11883,8 +12146,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -11942,11 +12205,10 @@
msgstr "git checkout--worker [<选项>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "字符串"
@@ -12097,11 +12359,11 @@
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -12110,51 +12372,51 @@
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12175,7 +12437,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12202,19 +12464,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12223,7 +12485,7 @@
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12242,51 +12504,51 @@
"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
"名称，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "只期望一个引用"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支，得到标签 '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支，得到远程分支 '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支，得到 '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支，得到提交 '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12294,7 +12556,7 @@
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12302,7 +12564,7 @@
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12310,7 +12572,7 @@
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12318,7 +12580,7 @@
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12326,208 +12588,208 @@
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名，尝试 -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 与 --detach 不兼容"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 与 --patch 不兼容"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'（默认）"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "使用叠加模式"
@@ -12667,8 +12929,8 @@
msgstr "删除整个目录"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
@@ -12755,19 +13017,20 @@
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名称"
@@ -12783,8 +13046,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
@@ -12792,8 +13055,8 @@
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "时间"
@@ -12802,16 +13065,16 @@
msgstr "从一个特定时间创建一个浅克隆"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
@@ -12840,21 +13103,21 @@
msgstr "在新仓库中设置配置信息"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
@@ -12867,50 +13130,42 @@
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏检出文件，只包含根目录文件"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"无法猜到目录名。\n"
-"请在命令行指定一个目录"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12920,148 +13175,148 @@
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "无法初始化稀疏检出"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "远程传输报告错误"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -13097,14 +13352,14 @@
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13114,93 +13369,91 @@
">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹配的对象目录"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交图形被拆分，只验证头一个文件"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "未能识别的 --split 参数，%s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "意外的非十六进制对象 ID：%s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "无效对象：%s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "启用变更路径的计算"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "允许写一个增量提交图形文件"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本拆分提交图形中的最大提交数"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一个拆分提交图形的两个级别之间的最大比率"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "只让早于给定时间的文件过期"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "要计算的变更路径布隆过滤器的最大数"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "正从标准输入收集提交"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未识别的子命令：%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13214,70 +13467,65 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：无法打开 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree：无法读取 '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree：无法关闭 '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "父提交"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "必须精确地提供一个树"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree：读取失败"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13286,7 +13534,7 @@
"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13300,15 +13548,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "否则，请使用 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否则，请使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13329,122 +13577,122 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 树对象失败"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file 和 -a 在一起没有意义"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "在变基过程中不能做部分提交。"
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "不能将 -m 和 --fixup 组合使用：%s"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored.\n"
msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13453,7 +13701,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13462,7 +13710,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
"也可以删除它们。\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13472,7 +13720,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13485,7 +13733,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"然后重试。\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13499,374 +13747,374 @@
"然后重试。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "无法将尾注传递给 --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "您正处于一个合并过程中 -- 无法改写说明。"
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
msgstr ""
"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正处于一个变基过程中 -- 无法修补提交。"
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知选项：--fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]提交"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾注"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "添加自定义尾注"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "添加 Signed-off-by 尾注"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "因提交说明的正文为空而终止提交。\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -14224,7 +14472,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon 不可用，不支持 unix 套接字"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache 不可用，不支持 unix 套接字"
@@ -14424,7 +14672,7 @@
msgid "Not a git repository"
msgstr "不是 git 仓库"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
@@ -14448,111 +14696,111 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失败：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "失败：%d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
-msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
+msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不兼容"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -14560,7 +14808,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "类型"
@@ -14588,95 +14836,95 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 取值不能为空"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "如果文件存在，从该文件导入标记"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "当标签缺少标记人字段时，假装提供一个"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名输出中将 <from> 转换为 <to>"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "对带有标记 ID 的标签做标记"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map 而没有 --anonymize 没有意义"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
@@ -14734,15 +14982,15 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能为负数"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "为 git pull/fetch 设置上游"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
@@ -14750,7 +14998,7 @@
msgid "use atomic transaction to update references"
msgstr "使用原子事务更新引用"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
@@ -14762,7 +15010,7 @@
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
@@ -14778,7 +15026,7 @@
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
@@ -14787,7 +15035,7 @@
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
@@ -14799,7 +15047,7 @@
msgid "write fetched references to the FETCH_HEAD file"
msgstr "将获取到的引用写入 FETCH_HEAD 文件"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下载包"
@@ -14807,16 +15055,16 @@
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
@@ -14830,19 +15078,19 @@
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
@@ -14854,7 +15102,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "获取后执行 'maintenance --auto'"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
@@ -14870,62 +15118,62 @@
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14935,7 +15183,7 @@
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14946,22 +15194,22 @@
"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14971,57 +15219,62 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "对象 '%s' 不存在"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支，和 --set-upstream 不兼容"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "未知的分支类型"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -15029,87 +15282,87 @@
"未发现源分支。\n"
"您需要使用 --set-upstream 选项指定一个分支。"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'（退出码：%d）\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
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:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "在使用 --negotiate-only 时必须提供远程仓库"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
msgstr "协议不支持 --negotiate-only，退出。"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
@@ -15174,7 +15427,7 @@
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
@@ -15330,129 +15583,139 @@
msgid "notice: No default references"
msgstr "注意：无默认引用"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s： 哈希路径不匹配，在 %s 被找到"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：对象损坏或丢失：%s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s： 对象有未知的类型 '%s': %s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析对象：%s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "坏的 sha1 文件：%s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的东西（%s）"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分离头指针的指向不存在"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "正在检查缓存树"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中无效的 sha1 指针"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非树对象"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "显示悬空的对象"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在检查对象"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s：对象缺失"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
@@ -15476,7 +15739,7 @@
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
@@ -15485,12 +15748,12 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
+"最后一次 gc 操作报告如下信息。请检查原因并删除 %s\n"
"在该文件被删除之前，自动清理将不会执行。\n"
"\n"
"%s"
@@ -15567,147 +15830,187 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "无法识别的 --schedule 参数 '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "无法写入提交图"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "无法预先获取远程仓库"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "无法启动 'git pack-objects' 进程"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "无法完成 'git pack-objects' 进程"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "无法写入多包索引"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' 失败"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' 失败"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "锁文件 '%s' 已存在，跳过维护"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "任务 '%s' 失败"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 不是一个有效的任务"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "任务 '%s' 不能被多次选择"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "基于仓库状态来运行任务"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "频率"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "基于频率运行任务"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "不通过标准错误报告进度或其它信息"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "任务"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "运行一个特定的任务"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "无法运行 'git config'"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "无法扩展路径 '%s'"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "无法启动 launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "无法为 '%s' 创建目录"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "无法引导服务 %s"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "无法创建临时 XML 文件"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "无法启动计划任务"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "无法打开 'crontab' 的标准输入"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "'crontab' 终止"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "无法启动 systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "无法运行 systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "删除 '%s' 失败"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "无法识别的 --scheduler 参数 '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "systemd 和 crontab 的定时器都不可用"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s 调度器不可用"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "另外一个进程正运行于后台维护"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<调度器>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "调度器"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "触发 git maintenance 执行的调度器"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "无法将仓库添加到全局配置"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <子命令> [<选项>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "无效子命令：%s"
@@ -15716,12 +16019,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -15730,262 +16033,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked 不能与 --cached 同时使用"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15993,95 +16296,107 @@
"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
"[--] <文件>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "对象类型"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "将对象写入对象数据库"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "从标准输入读取对象"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "原样存储文件不使用过滤器"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "打印所有可用的命令"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "排除向导"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "显示有用的指南列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "打印所有配置变量名称"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "显示 man 手册"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "在 web 浏览器中显示手册"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "显示 info 手册"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "打印命令描述"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "显示有用的指南列表"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "打印所有配置变量名称"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "执行 '%s' 失败"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -16090,7 +16405,7 @@
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -16099,331 +16414,322 @@
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串：%s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "这个选项不带其他参数"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "无法打开包文件 '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "应用 delta 失败"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "无法存储包文件"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "无法存储索引文件"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的哈希算法 '%s'"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin 需要 git 仓库"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
@@ -16761,8 +17067,8 @@
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
-"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
+"无法得到上游地址，如果您想自动记录基线提交，请使用命令\n"
+"git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
#: builtin/log.c:1555
@@ -17052,129 +17358,133 @@
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字符分隔路径"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "跳过和模式匹配的文件"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "从 <文件> 中读取排除模式"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "从 <文件> 读取排除模式"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "树对象"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "显示调试数据"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "抑制重复条目"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<仓库> [<引用>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<仓库> [<引用>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "exec"
@@ -17291,7 +17601,7 @@
msgid "use headers in message's body"
msgstr "在消息正文中使用标头"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
@@ -17407,143 +17717,143 @@
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作区"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "读取树失败"
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "已经是最新的。（无可挤压）"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "挤压提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
@@ -17558,31 +17868,31 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略选项：-X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17592,83 +17902,83 @@
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17676,7 +17986,7 @@
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17684,88 +17994,84 @@
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "您不能将 --squash 和 --commit 组合使用。"
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略以准备手工解决。\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -17799,15 +18105,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
msgstr "标准输入上的标签未指向一个有效的对象"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "无法写标签文件"
@@ -17828,44 +18134,55 @@
msgstr "允许创建一个以上的树"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<选项>] write [--preferred-pack=<包>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
+"路径>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<选项>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<选项>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成对包文件和包索引的对象目录"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "首选包"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "在计算多包位图时打包以供重用"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "写入多包位图"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "写入只包括给定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用于选择位图提交的引用快照"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未识别的子命令：%s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<选项>] <源>... <目标>"
@@ -17892,72 +18209,72 @@
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "冲突"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
msgstr "目标目录不存在"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
@@ -18133,47 +18450,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "不能写注解对象"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "读取对象 '%s' 失败。"
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "不能从非数据对象 '%s' 中读取注解数据。"
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "格式错误的输入行：'%s'。"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
@@ -18181,89 +18498,89 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "太多参数"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "替换已存在的注解"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "参数太少"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18272,97 +18589,97 @@
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "删除引用 NOTES_MERGE_REF 失败"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "删除 'git notes merge' 工作区失败"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "解析 NOTES_MERGE_REF 失败"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
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:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18372,41 +18689,41 @@
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
@@ -18454,81 +18771,85 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "写入位图索引失败"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18537,23 +18858,24 @@
"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
"式（得到 '%s'）"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "不能找到包 '%s'"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18562,7 +18884,7 @@
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18571,246 +18893,246 @@
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "从标准输入读取包"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "如果可能，写 bitmap 索引"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "协议"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "不能同时使用 --filter 和 --stdin-packs"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "不能同时使用内部版本列表和 --stdin-packs"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "枚举对象中"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18864,7 +19186,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍历 promisor 包以外的对象"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
@@ -18877,61 +19199,65 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18941,41 +19267,41 @@
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18984,20 +19310,20 @@
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -19009,7 +19335,7 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n"
+"您有偏离的分支，需要指定如何调和它们。您可以在执行下一次\n"
"pull 操作之前执行下面一条命令来抑制本消息：\n"
"\n"
" git config pull.rebase false # 合并（缺省策略）\n"
@@ -19020,19 +19346,19 @@
"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
"或者 --ff-only 参数覆盖缺省设置。\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19042,7 +19368,7 @@
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19059,15 +19385,23 @@
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "无法快进到多个分支。"
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需要指定如何调和偏离的分支。"
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
@@ -19230,15 +19564,15 @@
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "镜像所有引用"
@@ -19250,19 +19584,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "要求远程更新在本地被整合"
@@ -19270,12 +19604,12 @@
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "接收包程序"
@@ -19295,11 +19629,11 @@
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
@@ -19409,82 +19743,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -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 | <树对象1> [<树对象2> [<树对象3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
+"> [<树对象二> [<树对象三>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "合并"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要，执行三方合并"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时，也执行三方合并"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<子目录>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "抑制反馈信息"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
@@ -19506,193 +19840,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待办列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<选项>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "保留初始为空的提交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "允许提交说明为空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "对合并提交变基"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "保持兄弟提交的原始分支点"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移动以 squash!/fixup! 开头的提交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "签名提交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "显示上游变化的差异统计"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "继续变基"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "跳过提交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "变基待办列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "显示当前补丁"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "缩短待办列表中的提交号"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "扩展待办列表中的提交号"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "检查待办列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待办列表中插入 exec 执行命令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "限制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游提交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head 名称"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "变基策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略选项"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切换到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "要检出的分支或提交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "要执行的命令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自动重新安排任何失败的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合并后端"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19705,7 +19890,7 @@
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19723,14 +19908,14 @@
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19747,7 +19932,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19760,180 +19945,191 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合并基线做为当前基线"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "显示上游变化的差异统计"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "为每一个提交添加 Signed-off-by 尾注"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "使提交者日期和作者日期一致"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "忽略作者日期，使用当前日期"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "--reset-author-date 的同义词"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "忽略空白字符的变更"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "使用应用策略进行变基"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "如何处理成为空提交的提交"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "保留初始为空的提交"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自动重新安排任何失败的 `exec`"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "应用所有更改，甚至那些已在上游存在的"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 被 --rebase-merges 代替。"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19941,16 +20137,16 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19969,141 +20165,131 @@
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "不能组合使用应用选项和合并选项"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知的变基后端：%s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要与分支的一个合并基线"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命错误：无此分支/提交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "无此分支/提交 '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20129,7 +20315,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20148,11 +20334,11 @@
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -20193,7 +20379,7 @@
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
@@ -20347,7 +20533,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
@@ -20357,25 +20543,30 @@
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "（匹配）"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "不能设置 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20386,17 +20577,17 @@
"\t%s:%d\n"
"现在在为不存在的远程名 '%s' 命名"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库：'%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20407,17 +20598,17 @@
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20427,118 +20618,118 @@
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基（含合并提交）到远程 %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(无 URL)"
@@ -20546,31 +20737,31 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -20578,155 +20769,159 @@
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
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:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态！"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于子命令之前"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20734,139 +20929,152 @@
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "不能打开 %s 的索引"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "包 %s 太大，不在几何级数中考虑"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "包 %s 太大导致数字溢出"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "无法打开临时文件 %s 进行写入"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "不能关闭引用快照临时文件"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "使用因子 <n> 查找几何级数"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "写入结果包的多包索引"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric 和 -A、-a 不兼容"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "缺少需要的文件：%s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "不能删除：%s"
@@ -21172,94 +21380,94 @@
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21271,12 +21479,12 @@
"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
@@ -21456,15 +21664,19 @@
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -21510,68 +21722,69 @@
msgstr[0] "如下文件有本地修改："
msgstr[1] "如下文件有本地修改："
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "没有提供路径规格。我应该删除哪些文件？"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
-" --all 和明确的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<主机>:]<目录> (--all | <引用>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
@@ -21628,21 +21841,21 @@
msgid "group by field"
msgstr "按字段分组"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--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] [(<版本> | <通配符>)...]"
+" [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21655,113 +21868,113 @@
msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能显示 %d 个条目。"
msgstr[1] "一次只能显示 %d 个条目。"
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能处理 %d 个以上的版本。"
msgstr[1] "不能处理 %d 个以上的版本。"
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
@@ -21830,70 +22043,82 @@
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出 cone 中"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "无法删除目录 '%s'"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "无法为稀疏检出文件创建目录"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "无法升级仓库格式以启用 worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "无法设置 extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "初始化稀疏检出为 cone 模式"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "切换稀疏索引的使用"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "无法修改 sparse-index 配置"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "无法规范化路径 %s"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "无法加载现存的稀疏检出模式"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "从标准输入读取模式"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "刷新工作目录时出错"
@@ -21929,7 +22154,7 @@
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<路径规格>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21959,6 +22184,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
" [--] [<路径规格>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21982,7 +22215,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear 不支持参数"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21993,166 +22226,166 @@
" %s -> %s\n"
" 以腾出空间。\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中应用贮藏"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "无法生成差异 %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "不能保存索引树"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "无法从贮藏条目中恢复未跟踪文件"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "无法从贮藏条目中恢复未跟踪文件"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "无法解析树"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "无法解包目录树"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "在贮藏中包含未跟踪文件"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "仅显示贮藏中的未跟踪文件"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22176,7 +22409,7 @@
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
@@ -22190,27 +22423,33 @@
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
+msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "进入 '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22219,7 +22458,7 @@
"对 %s 执行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22229,169 +22468,162 @@
"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "抑制进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
-msgstr "无法为子模组 '%s' 注册 url"
+msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
-msgstr "无法为子模组 '%s' 注册更新模式"
+msgstr "无法为子模组路径 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "抑制子模组初始化的输出"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "抑制子模组状态输出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s（数据对象）->%s（子模组）"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s（子模组）->%s（数据对象）"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "不能从 '%s' 创建哈希对象"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "意外的模式 %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "比较存储在索引和子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "限制总结的大小"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "不能为 HEAD 获取一个版本"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached 和 --files 是互斥的"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "抑制子模组 URL 同步的输出"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22400,52 +22632,52 @@
"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
"-rf' 命令）"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22457,67 +22689,67 @@
"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
"'--reference' 来克隆。"
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "目录非空：'%s'"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "不允许克隆到一个非空目录"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22526,220 +22758,360 @@
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
+msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
+msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "子模组 '%s' 尚未初始化"
+msgstr "子模组路径 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "子模组路径 '%s'：检出 '%s'\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "子模组路径 '%s'：变基至 '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "子模组路径 '%s'：合并入 '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "子模组路径 '%s'：'%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s："
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "抑制变基或合并更新的输出"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "强制检出更新"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "不要从远程地址获取新对象"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "当仓库是新的克隆时，覆盖更新模式"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "浅获取的深度"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "上层项目期待的 SHA1"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "子模块头指针的 SHA1"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<选项>] <路径>"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "抑制设置子模组 URL 的输出"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "设置默认跟踪分支为 master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "设置默认跟踪分支"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch 和 --default 是互斥的"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
-#: builtin/submodule--helper.c:2828
+#: builtin/submodule--helper.c:3053
#, c-format
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "发现一个本地 git 目录 '%s' 及其远程仓库："
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"如果您想要重用这个本地 git 目录而非重新克隆自\n"
" %s\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n"
-"的含义，使用 '--name' 选项指定另外的名称。\n"
+"的含义，使用 '--name' 选项指定另外的名称。"
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "无法检出子模组 '%s'"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "克隆仓库时要检出的分支"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "无法添加子模组 '%s'"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "无法注册子模组 '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' 已经存在于索引中"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' 已经存在于索引中且不是一个子模组"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "要添加为子模组的仓库的分支"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "允许添加一个被忽略的子模组路径"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <名称>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "只打印错误消息"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "从引用仓库中借用对象"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' 不是一个有效的子模组名称"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -22764,21 +23136,21 @@
msgid "shorten ref output"
msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "更新的原因"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
-"\t\t<标签名> [<头>]"
+" <标签名> [<头>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -22788,12 +23160,12 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
"at <对象>]\n"
-"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
+" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22857,130 +23229,130 @@
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -22994,209 +23366,204 @@
msgid "failed to create directory %s"
msgstr "创建目录 %s 失败"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "创建文件 %s 失败"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "删除文件 %s 失败"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "删除目录 %s 失败"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "不要触碰仅索引条目"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "即使没有被标记为已更改，也要写出索引"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "启用或禁用文件系统监控"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "标记文件为 fsmonitor 有效"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23204,11 +23571,11 @@
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23216,25 +23583,25 @@
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor 被启用"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor 被禁用"
@@ -23250,19 +23617,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
@@ -23278,19 +23645,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应之后退出"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在初始的引用广告后立即退出"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "为 git-http-backend 提供 info/refs"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
@@ -23326,63 +23693,58 @@
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "删除 '%s' 失败"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "删除 %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "无法使用的工作区目标 '%s'"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23391,7 +23753,7 @@
"'%s' 是一个丢失但锁定的工作区，\n"
"使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23400,139 +23762,139 @@
"'%s' 是一个丢失但已经注册的工作区，\n"
"使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "初始化"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason 需要 --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "由 --lock 添加"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "显示扩展的注释和原因（如果有）"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose 和 --porcelain 互斥"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23541,7 +23903,7 @@
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23549,36 +23911,36 @@
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23587,7 +23949,7 @@
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23595,17 +23957,17 @@
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "修理：%s：%s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "错误：%s：%s"
@@ -23732,17 +24094,17 @@
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -23751,12 +24113,12 @@
"用法：%s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败：%s\n"
@@ -23803,65 +24165,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "通告能力之后立即退出"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "套接字/管道已在使用：'%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "不能启动服务于：'%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "无法在后台生成守护进程"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid 失败"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守护进程尚未上线"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "守护进程无法启动"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid 迷惑了"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守护进程尚未关闭"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<名字>] [<令牌>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -23869,83 +24197,79 @@
"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大"
"小>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "unix 域套接字的名称或路径名"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "命名管道的名字"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "服务器线程池中的线程数"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "等待守护进程启动或停止的秒数"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "字节数目"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "每个线程的请求数"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "字节"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "ballast character"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "令牌"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "发送到服务器的命令令牌"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值，默认为 %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支持委托控制，因为 cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "不支持协议限制，因为 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23961,45 +24285,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号：'%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 无效：这是 git 仓库么？"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务，得到 flush 包"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应，得到 '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'：%s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "远程服务器发送意外的响应结束数据包"
@@ -24007,83 +24336,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl：错误的行宽字符：%.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl：意外响应结束包"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求，zlib 结束错误 %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 字节长度的头信息"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "预期仍然需要 %d 个字节的正文"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持浅克隆能力"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：错误读取来自 git 的命令流"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：尝试没有本地仓库下获取"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
@@ -24104,44 +24433,44 @@
msgid "object filtering"
msgstr "对象过滤"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "到期时间"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "用 <n> 位数字显示对象名"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "从文件读取路径表达式"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "key"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "排序的字段名"
@@ -24283,7 +24612,7 @@
#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
-msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
+msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
#: command-list.h:84
msgid "A CVS server emulator for Git"
@@ -24826,41 +25155,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分查找运行失败：没有提供命令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "运行 $command"
-
-#: git-bisect.sh:80
-#, 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:105
-msgid "bisect run cannot continue any more"
-msgstr "二分查找不能继续运行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分查找运行失败：\n"
-"'bisect-state $state' 退出码为 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分查找运行成功"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24899,435 +25193,28 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "只能在工作区的顶级目录中使用相对路径"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已经存在于索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 没有检出的提交"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "无法添加子模组 '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "无法注册子模组 '$sm_path'"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "子模组 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已应用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "不能存储 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"应用 autostash 导致了冲突。\n"
-"您的修改安全地保存在贮藏区中。\n"
-"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "变基中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"命令:\n"
-"p, pick <提交> = 使用提交\n"
-"r, reword <提交> = 使用提交，但修改提交说明\n"
-"e, edit <提交> = 使用提交，但停下来修补\n"
-"s, squash <提交> = 使用提交，但挤压到前一个提交\n"
-"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
-"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
-"d, drop <提交> = 删除提交\n"
-"l, label <标签> = 为当前 HEAD 打上标签\n"
-"t, reset <标签> = 重置 HEAD 到该标签\n"
-"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
-". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
-". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
-". -c <提交> 可以编辑提交说明。\n"
-"\n"
-"可以对这些行重新排序，将从上至下执行。\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您现在可以修补这个提交，使用\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"当您对变更感到满意，执行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：不是一个可以被拣选的提交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "无效的提交名：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "不能写入当前提交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "不能快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "不能移动 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒绝挤压一个合并：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "无法重做合并 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "不能拣选 $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "这是提交说明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "提交说明 #${n} 将被跳过："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "这是一个 $count 个提交的组合。"
-msgstr[1] "这是一个 $count 个提交的组合。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "不能写入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "这是一个 2 个提交的组合。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "不能应用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"不能在成功拣选 $sha1... $rest 之后修补提交\n"
-"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
-"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "停止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "没有父提交的情况下不能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "执行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "执行失败：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "并且修改索引和/或工作区"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您可以解决这个问题，然后运行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"执行成功：$rest\n"
-"但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知命令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "成功变基并更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "不能删除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"您已暂存了工作区的修改。如果这些修改要挤压到前一个提交，执行：\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"如果这些变更要形成一个新提交，执行：\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"无论哪种情况，当您完成提交，继续执行：\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修补提交中查找作者信息时遇到错误"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "不能提交暂存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "无法运行编辑器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "不能检出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "没有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "不能创建临时 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "不能标记为交互式"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被注释掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "不能对重写提交进行初始化"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25344,44 +25231,28 @@
msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "不能变基：您有未暂存的变更。"
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暂存的变更。"
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "不能变基：您的索引中包含未提交的变更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
@@ -25993,7 +25864,7 @@
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
@@ -26018,30 +25889,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26052,12 +25923,12 @@
"%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26066,13 +25937,547 @@
"致命错误：%s:%d 超过 998 字符\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
+
+#, c-format
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "以下路径规格不匹配任何适合的路径，但它们和当前稀疏检出之外的索引条目匹"
+#~ "配：\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr "如果您打算更新此类条目，请禁用或修改稀疏规则。"
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "不能设置 GIT_DIR 为 '%s'"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "不能打开 /dev/null"
+
+#~ 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 ""
+#~ "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
+#~ "对修正后的文件做标记，然后用 'git commit' 提交"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "不能打开或者复制 /dev/null"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "尝试在没有 cone 模式下使用稀疏索引"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "不能更新缓存树，保持完整"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "无法为写入打开 '%s'。"
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "不能创建归档文件 '%s'"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check 需要 2 或 3 个参数"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "不能在 '%s' 创建新文件"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree：无法打开 '%s'"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "无法打开包文件 '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "无法存储包文件"
+
+#~ msgid "cannot store index file"
+#~ msgstr "无法存储索引文件"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "从 <文件> 中读取排除模式"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "merge-recursive 的未知选项：-X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "不可用的待办列表：'%s'"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<选项>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "对合并提交变基"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "保持兄弟提交的原始分支点"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "移动以 squash!/fixup! 开头的提交"
+
+#~ msgid "sign commits"
+#~ msgstr "签名提交"
+
+#~ msgid "continue rebase"
+#~ msgstr "继续变基"
+
+#~ msgid "skip commit"
+#~ msgstr "跳过提交"
+
+#~ msgid "edit the todo list"
+#~ msgstr "变基待办列表"
+
+#~ msgid "show the current patch"
+#~ msgstr "显示当前补丁"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "缩短待办列表中的提交号"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "扩展待办列表中的提交号"
+
+#~ msgid "check the todo list"
+#~ msgstr "检查待办列表"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "重新排列 fixup/squash 行"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "在待办列表中插入 exec 执行命令"
+
+#~ msgid "onto"
+#~ msgstr "onto"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "限制版本"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "squash onto"
+
+#~ msgid "the upstream commit"
+#~ msgstr "上游提交"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "head 名称"
+
+#~ msgid "rebase strategy"
+#~ msgstr "变基策略"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "策略选项"
+
+#~ msgid "switch-to"
+#~ msgstr "切换到"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "要检出的分支或提交"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "onto name"
+
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "要执行的命令"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --"
+#~ "name <名称>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "创建文件 %s 失败"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "在初始的引用广告后立即退出"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "套接字/管道已在使用：'%s'"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "不能启动服务于：'%s'"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "无法在后台生成守护进程"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid 失败"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "守护进程尚未上线"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "守护进程无法启动"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid 迷惑了"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "守护进程尚未关闭"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "不支持协议限制，因为 cURL < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "运行 $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' 没有检出的提交"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "子模组 '$displaypath'：'$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "已应用 autostash。"
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "不能存储 $stash_sha1"
+
+#~ 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 ""
+#~ "应用 autostash 导致了冲突。\n"
+#~ "您的修改安全地保存在贮藏区中。\n"
+#~ "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "变基中（$new_count/$total）"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "命令:\n"
+#~ "p, pick <提交> = 使用提交\n"
+#~ "r, reword <提交> = 使用提交，但修改提交说明\n"
+#~ "e, edit <提交> = 使用提交，但停下来修补\n"
+#~ "s, squash <提交> = 使用提交，但挤压到前一个提交\n"
+#~ "f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"
+#~ "x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"
+#~ "d, drop <提交> = 删除提交\n"
+#~ "l, label <标签> = 为当前 HEAD 打上标签\n"
+#~ "t, reset <标签> = 重置 HEAD 到该标签\n"
+#~ "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
+#~ ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
+#~ ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
+#~ ". -c <提交> 可以编辑提交说明。\n"
+#~ "\n"
+#~ "可以对这些行重新排序，将从上至下执行。\n"
+
+#, sh-format
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您现在可以修补这个提交，使用\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "当您对变更感到满意，执行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1：不是一个可以被拣选的提交"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "无效的提交名：$sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "不能写入当前提交的替代 sha1"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "快进到 $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "不能快进到 $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "不能移动 HEAD 到 $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "拒绝挤压一个合并：$sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "无法重做合并 $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "不能拣选 $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "这是提交说明 #${n}："
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "提交说明 #${n} 将被跳过："
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "这是一个 $count 个提交的组合。"
+#~ msgstr[1] "这是一个 $count 个提交的组合。"
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "不能写入 $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "这是一个 2 个提交的组合。"
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "不能应用 $sha1... $rest"
+
+#, sh-format
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "不能在成功拣选 $sha1... $rest 之后修补提交\n"
+#~ "这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-"
+#~ "commit\n"
+#~ "钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "停止在 $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "没有父提交的情况下不能 '$squash_style'"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "执行：$rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "执行失败：$rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "并且修改索引和/或工作区"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您可以解决这个问题，然后运行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "执行成功：$rest\n"
+#~ "但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "未知命令：$command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "要修改请使用命令 'git rebase --edit-todo'。"
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "成功变基并更新 $head_name。"
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "不能删除 CHERRY_PICK_HEAD"
+
+#, sh-format
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "您已暂存了工作区的修改。如果这些修改要挤压到前一个提交，执行：\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "如果这些变更要形成一个新提交，执行：\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "无论哪种情况，当您完成提交，继续执行：\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr "在修补提交中查找作者信息时遇到错误"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "不能提交暂存的修改。"
+
+#~ msgid "Could not execute editor"
+#~ msgstr "无法运行编辑器"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "不能检出 $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "没有 HEAD？"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "不能创建临时 $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "不能标记为交互式"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
+#~ msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "注意空提交已被注释掉"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "不能对重写提交进行初始化"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "不能变基：您有未暂存的变更。"
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "无法通过变基方式拉取：您有未暂存的变更。"
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "不能变基：您的索引中包含未提交的变更。"
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5d5718a..f1df8b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,12 +17,13 @@
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-14 07:56+0800\n"
-"PO-Revision-Date: 2021-08-14 13:55+0800\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-11 06:38+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
"po/git-cli/zh_Hant/>\n"
@@ -35,210 +36,210 @@
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
-#: add-interactive.c:376
+#: add-interactive.c:380
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
-#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
msgid "could not read index"
msgstr "無法讀取索引"
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二進位"
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "無"
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "未變更"
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
#, c-format
msgid "could not stage '%s'"
msgstr "無法暫存「%s」"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
msgid "could not write index"
msgstr "無法寫入索引"
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "已更新 %d 個路徑\n"
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "注意：%s 現已不再追蹤。\n"
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "「%s」路徑執行 make_cache_entry 失敗"
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
msgid "Revert"
msgstr "還原"
-#: add-interactive.c:775
+#: add-interactive.c:779
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{樹}"
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "還原了 %d 個路徑\n"
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "沒有未追蹤的檔案。\n"
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "新增未追蹤的"
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 個路徑\n"
-#: add-interactive.c:925
+#: add-interactive.c:929
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合併：%s"
-#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二進位檔案被修改。\n"
-#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "沒有修改。\n"
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "修補檔更新"
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "檢視 diff"
-#: add-interactive.c:1010
+#: add-interactive.c:1014
msgid "show paths with changes"
msgstr "顯示有變更的路徑"
-#: add-interactive.c:1012
+#: add-interactive.c:1016
msgid "add working tree state to the staged set of changes"
msgstr "加入工作區狀態至暫存列表"
-#: add-interactive.c:1014
+#: add-interactive.c:1018
msgid "revert staged set of changes back to the HEAD version"
msgstr "還原修改的暫存集至 HEAD 版本"
-#: add-interactive.c:1016
+#: add-interactive.c:1020
msgid "pick hunks and update selectively"
msgstr "挑選區塊並選擇性更新"
-#: add-interactive.c:1018
+#: add-interactive.c:1022
msgid "view diff between HEAD and index"
msgstr "檢視 HEAD 及索引之間的差異"
-#: add-interactive.c:1020
+#: add-interactive.c:1024
msgid "add contents of untracked files to the staged set of changes"
msgstr "加入未追蹤檔案的內容至暫存列表"
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
msgid "Prompt help:"
msgstr "提示說明："
-#: add-interactive.c:1030
+#: add-interactive.c:1034
msgid "select a single item"
msgstr "選擇單一項目"
-#: add-interactive.c:1032
+#: add-interactive.c:1036
msgid "select a range of items"
msgstr "選擇項目範圍"
-#: add-interactive.c:1034
+#: add-interactive.c:1038
msgid "select multiple ranges"
msgstr "選擇多個範圍"
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
msgid "select item based on unique prefix"
msgstr "基於唯一前綴選擇項目"
-#: add-interactive.c:1038
+#: add-interactive.c:1042
msgid "unselect specified items"
msgstr "取消選擇指定項目"
-#: add-interactive.c:1040
+#: add-interactive.c:1044
msgid "choose all items"
msgstr "選擇所有項目"
-#: add-interactive.c:1042
+#: add-interactive.c:1046
msgid "(empty) finish selecting"
msgstr "（空）完成選取"
-#: add-interactive.c:1079
+#: add-interactive.c:1083
msgid "select a numbered item"
msgstr "選擇編號過的項目"
-#: add-interactive.c:1083
+#: add-interactive.c:1087
msgid "(empty) select nothing"
msgstr "（空）全不選取"
-#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** 指令 ***"
-#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "請選擇"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "staged"
msgstr "快取"
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
-#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
-#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
-#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
+#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
+#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
+#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
#: git-add--interactive.perl:213
msgid "path"
msgstr "路徑"
-#: add-interactive.c:1151
+#: add-interactive.c:1155
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
@@ -645,7 +646,7 @@
#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
-msgstr "無論如何都要套用到工作區嗎？"
+msgstr "無論如何都要套用到工作區嗎？ "
#: add-patch.c:1298 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
@@ -668,7 +669,7 @@
"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
"K - 維持此區塊未決狀態，檢視上一個區塊\n"
"g - 選擇要跳轉至的區塊\n"
-"/ - 尋找符合提供之正規表示式的區塊\n"
+"/ - 尋找符合提供之常規表示式的區塊\n"
"s - 分割目前區塊為更小的區塊\n"
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
@@ -691,7 +692,7 @@
#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
-msgstr "跳轉到哪個區塊？"
+msgstr "跳轉到哪個區塊？ "
#: add-patch.c:1561
#, c-format
@@ -710,12 +711,12 @@
#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
-msgstr "使用正規表示式搜尋？"
+msgstr "使用常規表示式搜尋？ "
#: add-patch.c:1596
#, c-format
msgid "Malformed search regexp %s: %s"
-msgstr "錯誤的正規表示式 %s：%s"
+msgstr "錯誤的常規表示式 %s：%s"
#: add-patch.c:1613
msgid "No hunk matches the given pattern"
@@ -738,7 +739,7 @@
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:145
+#: advice.c:78
#, c-format
msgid ""
"\n"
@@ -747,37 +748,37 @@
"\n"
"請使用「git config advice.%s false」來停用此訊息"
-#: advice.c:161
+#: advice.c:94
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:252
+#: advice.c:178
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選，因為您有未合併的檔案。"
-#: advice.c:254
+#: advice.c:180
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交，因為您有未合併的檔案。"
-#: advice.c:256
+#: advice.c:182
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併，因為您有未合併的檔案。"
-#: advice.c:258
+#: advice.c:184
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取，因為您有未合併的檔案。"
-#: advice.c:260
+#: advice.c:186
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交，因為您有未合併的檔案。"
-#: advice.c:262
+#: advice.c:188
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s，因為您有未合併的檔案。"
-#: advice.c:270
+#: advice.c:196
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."
@@ -785,38 +786,48 @@
"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:278
+#: advice.c:204
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:283 builtin/merge.c:1375
+#: advice.c:209 builtin/merge.c:1379
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
-#: advice.c:285
+#: advice.c:211
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:286
+#: advice.c:212
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "無法快轉，終止。"
+
+#: advice.c:227
#, c-format
msgid ""
-"The following pathspecs didn't match any eligible path, but they do match "
-"index\n"
-"entries outside the current sparse checkout:\n"
+"The following paths and/or pathspecs matched paths that exist\n"
+"outside of your sparse-checkout definition, so will not be\n"
+"updated in the index:\n"
msgstr ""
-"下列路徑規格不符合任何適合路徑，\n"
-"但符合目前稀疏簽出外的索引項目：\n"
+"下列路徑和（或）路徑規格\n"
+"符合稀疏簽出定義外且存在的路徑，\n"
+"所以不會在索引中更新：\n"
-#: advice.c:303
+#: advice.c:234
msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "若有意更新這些項目，請停用或修改稀疏規則。"
+"If you intend to update such entries, try one of the following:\n"
+"* Use the --sparse option.\n"
+"* Disable or modify the sparsity rules."
+msgstr ""
+"如果您執意要更新這些項目，請試試以下任一方式：\n"
+"* 使用 --sparse 選項。\n"
+"* 停用或修改稀疏規則。"
-#: advice.c:310
+#: advice.c:242
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -840,20 +851,20 @@
msgstr ""
"注意：正在切換到 '%s'。\n"
"\n"
-"您正處於分離開頭指標狀態。您可以檢視、做實驗性的修改及提交，並且您可以在切"
-"換\n"
-"回一個分支時，捨棄在此狀態下所做的提交而不對分支造成影響。\n"
+"您正處於分離開頭指標狀態。您可以檢視、進行實驗性修改並提交，\n"
+"而且您可以在切換回一個分支時，\n"
+"捨棄在此狀態下所做的提交而不對分支造成影響。\n"
"\n"
-"如果您想要透過建立分支來保留在此狀態下所做的提交，您可以透過在 switch 指令\n"
-"中新增參數 -c 來實現（現在或稍後）。例如：\n"
+"如果您想要透過建立分支來保留在此狀態下所做的提交，\n"
+"您可以現在或稍後在 switch 指令使用 -c 選項。例如：\n"
"\n"
-" git switch -c <新分支名>\n"
+" git switch -c <新分支名稱>\n"
"\n"
-"或者復原此動作：\n"
+"或者是復原此動作：\n"
"\n"
" git switch -\n"
"\n"
-"透過將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n"
+"將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
"\n"
#: alias.c:50
@@ -893,7 +904,7 @@
#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
-msgstr "無法準備時間戳正規表示式 %s"
+msgstr "無法準備時間戳常規表示式 %s"
#: apply.c:809
#, c-format
@@ -988,48 +999,48 @@
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二進位修補檔在第 %d 行損壞：%.*s"
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "無法識別的二進位修補檔位於第 %d 行"
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "修補檔案的第 %d 行只有垃圾資料"
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "不能開啟或讀取 %s"
-#: apply.c:2935
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "無效的行首字元：'%c'"
-#: apply.c:3056
+#: apply.c:3057
#, 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 行）。"
-#: apply.c:3068
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
-#: apply.c:3074
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
@@ -1038,434 +1049,435 @@
"當查詢：\n"
"%.*s"
-#: apply.c:3096
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺少 '%s' 的二進位修補檔資料"
-#: apply.c:3104
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
-#: apply.c:3170
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
-#: apply.c:3188
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
-#: apply.c:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二進位修補檔未套用到 '%s'"
-#: apply.c:3208
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
-#: apply.c:3229
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打修補檔失敗：%s:%ld"
-#: apply.c:3352
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "不能簽出 %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
-#: apply.c:3412
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "讀取位於符號連結中的 '%s'"
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路徑 %s 已經被重新命名/刪除"
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在於索引中"
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不符合"
-#: apply.c:3571
+#: apply.c:3593
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
-#: apply.c:3574
+#: apply.c:3596
#, c-format
msgid "Performing three-way merge...\n"
msgstr "正在進行三方合併⋯⋯\n"
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "無法讀取 '%s' 的目前內容"
-#: apply.c:3606
+#: apply.c:3628
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "無法進行三方合併⋯⋯\n"
-#: apply.c:3620
+#: apply.c:3642
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "套用修補檔到 '%s' 存在衝突。\n"
-#: apply.c:3625
+#: apply.c:3647
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功套用修補檔到 '%s'。\n"
-#: apply.c:3642
+#: apply.c:3664
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回復至直接套用模式⋯⋯\n"
-#: apply.c:3654
+#: apply.c:3676
msgid "removal patch leaves file contents"
msgstr "移除修補檔仍留下了檔案內容"
-#: apply.c:3727
+#: apply.c:3749
#, c-format
msgid "%s: wrong type"
msgstr "%s：錯誤類型"
-#: apply.c:3729
+#: apply.c:3751
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的類型是 %o，應為 %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
-#: read-cache.c:1353
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
#, c-format
msgid "invalid path '%s'"
msgstr "無效路徑 '%s'"
-#: apply.c:3952
+#: apply.c:3974
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已經存在於索引中"
-#: apply.c:3956
+#: apply.c:3978
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已經存在於工作區中"
-#: apply.c:3976
+#: apply.c:3998
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
-#: apply.c:3981
+#: apply.c:4003
#, 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）不符合"
-#: apply.c:4001
+#: apply.c:4023
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影響的檔案 '%s' 位於符號連結中"
-#: apply.c:4005
+#: apply.c:4027
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：修補檔未套用"
-#: apply.c:4020
+#: apply.c:4042
#, c-format
msgid "Checking patch %s..."
msgstr "正在檢查修補檔 %s..."
-#: apply.c:4112
+#: apply.c:4134
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模組 %s 的 sha1 訊息缺少或無效"
-#: apply.c:4119
+#: apply.c:4141
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式變更，但它不在目前 HEAD 中"
-#: apply.c:4122
+#: apply.c:4144
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 訊息缺少或無效（%s）。"
-#: apply.c:4131
+#: apply.c:4153
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在暫時索引中新增 %s"
-#: apply.c:4141
+#: apply.c:4163
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把暫時索引寫入到 %s"
-#: apply.c:4279
+#: apply.c:4301
#, c-format
msgid "unable to remove %s from index"
msgstr "不能從索引中移除 %s"
-#: apply.c:4313
+#: apply.c:4335
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模組 %s 損壞的修補檔"
-#: apply.c:4319
+#: apply.c:4341
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能對建立檔案 '%s' 呼叫 stat"
-#: apply.c:4327
+#: apply.c:4349
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能為建立檔案 %s 建立後端儲存"
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
#, c-format
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 新增快取條目"
-#: apply.c:4376 builtin/bisect--helper.c:525
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
#, c-format
msgid "failed to write to '%s'"
msgstr "寫入 '%s' 失敗"
-#: apply.c:4380
+#: apply.c:4402
#, c-format
msgid "closing file '%s'"
msgstr "關閉檔案 '%s'"
-#: apply.c:4450
+#: apply.c:4472
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能寫入檔案 '%s' 權限 %o"
-#: apply.c:4548
+#: apply.c:4570
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功套用修補檔 %s。"
-#: apply.c:4556
+#: apply.c:4578
msgid "internal error"
msgstr "內部錯誤"
-#: apply.c:4559
+#: apply.c:4581
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
-#: apply.c:4570
+#: apply.c:4592
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
-#: apply.c:4592
+#: apply.c:4614
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "成功套用第 #%d 個區塊。"
-#: apply.c:4596
+#: apply.c:4618
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒絕第 #%d 個區塊。"
-#: apply.c:4725
+#: apply.c:4747
#, c-format
msgid "Skipped patch '%s'."
msgstr "略過修補檔 '%s'。"
-#: apply.c:4733
+#: apply.c:4755
msgid "unrecognized input"
msgstr "無法識別的輸入"
-#: apply.c:4753
+#: apply.c:4775
msgid "unable to read index file"
msgstr "無法讀取索引檔案"
-#: apply.c:4910
+#: apply.c:4932
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能開啟修補檔 '%s'：%s"
-#: apply.c:4937
+#: apply.c:4959
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 個空白字元誤用"
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字元誤用。"
-#: apply.c:4951
+#: apply.c:4973
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修復空白錯誤後，套用了 %d 行。"
-#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
msgid "Unable to write new index file"
msgstr "無法寫入新索引檔案"
-#: apply.c:4995
+#: apply.c:5017
msgid "don't apply changes matching the given path"
msgstr "不要套用符合提供路徑的變更"
-#: apply.c:4998
+#: apply.c:5020
msgid "apply changes matching the given path"
msgstr "套用符合提供路徑的變更"
-#: apply.c:5000 builtin/am.c:2318
+#: apply.c:5022 builtin/am.c:2320
msgid "num"
msgstr "數字"
-#: apply.c:5001
+#: apply.c:5023
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
-#: apply.c:5004
+#: apply.c:5026
msgid "ignore additions made by the patch"
msgstr "忽略修補檔中的新增的檔案"
-#: apply.c:5006
+#: apply.c:5028
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
-#: apply.c:5010
+#: apply.c:5032
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十進位數顯示新增和刪除的行數"
-#: apply.c:5012
+#: apply.c:5034
msgid "instead of applying the patch, output a summary for the input"
msgstr "不套用修補檔，而是顯示輸入的概要"
-#: apply.c:5014
+#: apply.c:5036
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不套用修補檔，而是檢視修補檔是否可套用"
-#: apply.c:5016
+#: apply.c:5038
msgid "make sure the patch is applicable to the current index"
msgstr "確認修補檔可以套用到目前索引"
-#: apply.c:5018
+#: apply.c:5040
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
-#: apply.c:5020
+#: apply.c:5042
msgid "apply a patch without touching the working tree"
msgstr "套用修補檔而不修改工作區"
-#: apply.c:5022
+#: apply.c:5044
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作區之外檔案的修補檔"
-#: apply.c:5025
+#: apply.c:5047
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
-#: apply.c:5027
+#: apply.c:5049
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
-#: apply.c:5029
+#: apply.c:5051
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
-#: apply.c:5034
+#: apply.c:5056
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
msgid "action"
msgstr "動作"
-#: apply.c:5036
+#: apply.c:5058
msgid "detect new or modified lines that have whitespace errors"
msgstr "檢查新增和修改的行中間的空白字元濫用"
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
msgid "ignore changes in whitespace when finding context"
msgstr "尋找上下文時忽略空白字元的變更"
-#: apply.c:5045
+#: apply.c:5067
msgid "apply the patch in reverse"
msgstr "反向套用修補檔"
-#: apply.c:5047
+#: apply.c:5069
msgid "don't expect at least one line of context"
msgstr "無需至少一行上下文"
-#: apply.c:5049
+#: apply.c:5071
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
-#: apply.c:5051
+#: apply.c:5073
msgid "allow overlapping hunks"
msgstr "允許重疊的修補檔區塊"
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
+#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "詳細輸出"
-#: apply.c:5054
+#: apply.c:5076
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允許不正確的檔案末尾換行符號"
-#: apply.c:5057
+#: apply.c:5079
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任修補檔區塊的標頭訊息中的行號"
-#: apply.c:5059 builtin/am.c:2306
+#: apply.c:5081 builtin/am.c:2308
msgid "root"
msgstr "根目錄"
-#: apply.c:5060
+#: apply.c:5082
msgid "prepend <root> to all filenames"
msgstr "為所有檔案名前新增 <根目錄>"
@@ -1536,152 +1548,151 @@
msgid "cannot read %s"
msgstr "不能讀取 %s"
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1144
+#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
+#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
+#: builtin/merge.c:1145
#, c-format
msgid "could not read '%s'"
msgstr "不能讀取 '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路徑規格 '%s' 未符合任何檔案"
-#: archive.c:451
+#: archive.c:450
#, c-format
msgid "no such ref: %.*s"
msgstr "無此引用：%.*s"
-#: archive.c:457
+#: archive.c:456
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一個有效的物件名：%s"
-#: archive.c:470
+#: archive.c:469
#, c-format
msgid "not a tree object: %s"
msgstr "不是一個樹狀物件：%s"
-#: archive.c:482
+#: archive.c:481
msgid "current working directory is untracked"
msgstr "目前工作目錄未被追蹤"
-#: archive.c:523
+#: archive.c:522
#, c-format
msgid "File not found: %s"
msgstr "找不到檔案：%s"
-#: archive.c:525
+#: archive.c:524
#, c-format
msgid "Not a regular file: %s"
msgstr "不是一般檔案：%s"
-#: archive.c:552
+#: archive.c:551
msgid "fmt"
msgstr "格式"
-#: archive.c:552
+#: archive.c:551
msgid "archive format"
msgstr "歸檔格式"
-#: archive.c:553 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1775
msgid "prefix"
msgstr "前綴"
-#: archive.c:554
+#: archive.c:553
msgid "prepend prefix to each pathname in the archive"
msgstr "為歸檔中每個路徑名加上前綴"
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
+#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
msgid "file"
msgstr "檔案"
-#: archive.c:556
+#: archive.c:555
msgid "add untracked file to archive"
msgstr "將未追蹤檔案加入歸檔"
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
msgid "write the archive to this file"
msgstr "歸檔寫入此檔案"
-#: archive.c:561
+#: archive.c:560
msgid "read .gitattributes in working directory"
msgstr "讀取工作區中的 .gitattributes"
-#: archive.c:562
+#: archive.c:561
msgid "report archived files on stderr"
msgstr "在標準錯誤上報告歸檔檔案"
-#: archive.c:564
+#: archive.c:563
msgid "set compression level"
msgstr "設定壓縮級別"
-#: archive.c:567
+#: archive.c:566
msgid "list supported archive formats"
msgstr "列出支援的歸檔格式"
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
-#: builtin/submodule--helper.c:2902
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
msgid "repo"
msgstr "版本庫"
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
msgid "retrieve the archive from remote repository <repo>"
msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr "指令"
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
msgid "path to the remote git-upload-archive command"
msgstr "遠端 git-upload-archive 指令的路徑"
-#: archive.c:579
+#: archive.c:578
msgid "Unexpected option --remote"
msgstr "未知參數 --remote"
-#: archive.c:581
+#: archive.c:580
msgid "Option --exec can only be used together with --remote"
msgstr "選項 --exec 只能和 --remote 同時使用"
-#: archive.c:583
+#: archive.c:582
msgid "Unexpected option --output"
msgstr "未知參數 --output"
-#: archive.c:585
+#: archive.c:584
msgid "Options --add-file and --remote cannot be used together"
msgstr "--add-file 和 --remote 選項不能同時使用"
-#: archive.c:607
+#: archive.c:606
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知歸檔格式 '%s'"
-#: archive.c:616
+#: archive.c:615
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "參數不支援此格式 '%s'：-%d"
-#: attr.c:202
+#: attr.c:203
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一個有效的屬性名"
-#: attr.c:363
+#: attr.c:364
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允許 %s：%s:%d"
-#: attr.c:403
+#: attr.c:404
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1689,22 +1700,22 @@
"反向模式在 git attributes 中被忽略\n"
"當字串確定要以驚嘆號開始時，使用 '\\!'。"
-#: bisect.c:489
+#: bisect.c:488
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
-#: bisect.c:699
+#: bisect.c:698
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我們無法進行更多的二分搜尋！\n"
-#: bisect.c:766
+#: bisect.c:764
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一個有效的提交名 %s"
-#: bisect.c:791
+#: bisect.c:789
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1713,7 +1724,7 @@
"合併基礎 %s 是壞的。\n"
"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
-#: bisect.c:796
+#: bisect.c:794
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1722,7 +1733,7 @@
"合併基礎 %s 是新的。\n"
"介於 %s 和 [%s] 之間的屬性已經被修改。\n"
-#: bisect.c:801
+#: bisect.c:799
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1731,7 +1742,7 @@
"合併基礎 %s 是 %s。\n"
"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
-#: bisect.c:809
+#: bisect.c:807
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1742,7 +1753,7 @@
"這種情況下 git 二分搜尋無法正常工作。\n"
"您可能弄錯了 %s 和 %s 版本？\n"
-#: bisect.c:822
+#: bisect.c:820
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1753,36 +1764,36 @@
"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
"我們仍舊繼續。"
-#: bisect.c:861
+#: bisect.c:859
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
-#: bisect.c:911
+#: bisect.c:909
#, c-format
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
#, c-format
msgid "could not read file '%s'"
msgstr "不能讀取檔案 '%s'"
-#: bisect.c:1027
+#: bisect.c:1025
msgid "reading bisect refs failed"
msgstr "讀取二分搜尋引用失敗"
-#: bisect.c:1057
+#: bisect.c:1055
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同時為 %s 和 %s\n"
-#: bisect.c:1066
+#: bisect.c:1064
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1791,7 +1802,7 @@
"沒找到能夠測試的提交。\n"
"可能是執行傳入的路徑引數是錯誤的？\n"
-#: bisect.c:1095
+#: bisect.c:1093
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1800,7 +1811,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1101
+#: bisect.c:1099
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1818,11 +1829,12 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
-#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
-#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
-#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
+#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
+#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
+#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍歷設定失敗"
@@ -1850,8 +1862,9 @@
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
-"在修復錯誤後，您可以嘗試修改遠端追蹤分支，透過執行指令\n"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
+"修正錯誤後，您可以執行\n"
+"\"git branch --set-upstream-to=%s%s%s\"\n"
+"命令修正遠端追蹤資訊。"
#: branch.c:67
#, c-format
@@ -1943,11 +1956,12 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
-"如果您正計劃基於遠端一個現存的上游分支開始你的工作，\n"
-"您可能需要執行 \"git fetch\" 來取得分支。\n"
+"如果您打算以遠端現存的上游分支為基礎進行修改，\n"
+"您或許需要執行「git fetch」取得分支。\n"
"\n"
-"如果您正計劃推送一個能與對應遠端分支建立追蹤的新的本機分支，\n"
-"您可能需要使用 \"git push -u\" 推送分支並設定和上游的關聯。"
+"如果您打算將新建立的本機分支推送至對應的遠端分支，\n"
+"且建立兩個分支間的追蹤關係，\n"
+"您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
#: branch.c:281
#, c-format
@@ -1994,8 +2008,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "無法識別的包頭：%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
#, c-format
msgid "could not open '%s'"
msgstr "不能開啟 '%s'"
@@ -2051,7 +2065,7 @@
msgid "cannot write bundle version %d with algorithm %s"
msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
#, c-format
msgid "unrecognized argument: %s"
msgstr "無法識別的參數：%s"
@@ -2093,7 +2107,7 @@
msgid "invalid color value: %.*s"
msgstr "無效的顏色值：%.*s"
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
msgid "invalid hash version"
msgstr "無效的雜湊版本"
@@ -2138,215 +2152,215 @@
msgid "unable to find all commit-graph files"
msgstr "無法找到所有提交圖形檔案"
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "無效的提交位置。提交圖形可能已損壞"
-#: commit-graph.c:766
+#: commit-graph.c:767
#, c-format
msgid "could not find commit %s"
msgstr "無法找到提交 %s"
-#: commit-graph.c:799
+#: commit-graph.c:800
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
-#: commit-graph.c:1075 builtin/am.c:1341
+#: commit-graph.c:1105 builtin/am.c:1342
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
#, c-format
msgid "unable to get type of object %s"
msgstr "無法獲得物件 %s 類型"
-#: commit-graph.c:1368
+#: commit-graph.c:1398
msgid "Loading known commits in commit graph"
msgstr "正在載入提交圖中的已知提交"
-#: commit-graph.c:1385
+#: commit-graph.c:1415
msgid "Expanding reachable commits in commit graph"
-msgstr "正在擴展提交圖中的可以取得提交"
+msgstr "正在展開提交圖中的可以取得的提交"
-#: commit-graph.c:1405
+#: commit-graph.c:1435
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交圖中的提交標記"
-#: commit-graph.c:1424
+#: commit-graph.c:1454
msgid "Computing commit graph topological levels"
msgstr "正在計算提交圖拓樸級別"
-#: commit-graph.c:1477
+#: commit-graph.c:1507
msgid "Computing commit graph generation numbers"
msgstr "正在計算提交圖世代數字"
-#: commit-graph.c:1558
+#: commit-graph.c:1588
msgid "Computing commit changed paths Bloom filters"
msgstr "正在計算提交變更路徑的布隆過濾器"
-#: commit-graph.c:1635
+#: commit-graph.c:1665
msgid "Collecting referenced commits"
msgstr "正在收集引用提交"
-#: commit-graph.c:1660
+#: commit-graph.c:1690
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 個包中尋找提交圖的提交"
-#: commit-graph.c:1673
+#: commit-graph.c:1703
#, c-format
msgid "error adding pack %s"
msgstr "新增包 %s 發生錯誤"
-#: commit-graph.c:1677
+#: commit-graph.c:1707
#, c-format
msgid "error opening index for %s"
msgstr "為 %s 開啟索引發生錯誤"
-#: commit-graph.c:1714
+#: commit-graph.c:1744
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包物件中尋找提交圖的提交"
-#: commit-graph.c:1732
+#: commit-graph.c:1762
msgid "Finding extra edges in commit graph"
msgstr "正在尋找提交圖中額外的邊"
-#: commit-graph.c:1781
+#: commit-graph.c:1811
msgid "failed to write correct number of base graph ids"
msgstr "無法寫入正確數量的基礎圖形 ID"
-#: commit-graph.c:1812 midx.c:911
+#: commit-graph.c:1842 midx.c:1146
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能為 %s 建立先導目錄"
-#: commit-graph.c:1825
+#: commit-graph.c:1855
msgid "unable to create temporary graph layer"
msgstr "無法建立暫時的圖形層"
-#: commit-graph.c:1830
+#: commit-graph.c:1860
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "無法調整「%s」的共用權限"
-#: commit-graph.c:1887
+#: commit-graph.c:1917
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步寫出提交圖"
-#: commit-graph.c:1923
+#: commit-graph.c:1953
msgid "unable to open commit-graph chain file"
msgstr "無法開啟提交圖形鏈檔案"
-#: commit-graph.c:1939
+#: commit-graph.c:1969
msgid "failed to rename base commit-graph file"
msgstr "無法重新命名基礎提交圖形檔案"
-#: commit-graph.c:1959
+#: commit-graph.c:1989
msgid "failed to rename temporary commit-graph file"
msgstr "無法重新命名暫時提交圖形檔案"
-#: commit-graph.c:2092
+#: commit-graph.c:2122
msgid "Scanning merged commits"
msgstr "正在掃描合併提交"
-#: commit-graph.c:2136
+#: commit-graph.c:2166
msgid "Merging commit-graph"
msgstr "正在合併提交圖形"
-#: commit-graph.c:2244
+#: commit-graph.c:2274
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
-#: commit-graph.c:2351
+#: commit-graph.c:2381
msgid "too many commits to write graph"
msgstr "提交太多不能畫圖"
-#: commit-graph.c:2449
+#: commit-graph.c:2479
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
-#: commit-graph.c:2459
+#: commit-graph.c:2489
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
-#: commit-graph.c:2469 commit-graph.c:2484
+#: commit-graph.c:2499 commit-graph.c:2514
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:2476
+#: commit-graph.c:2506
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "無法從提交圖形中解析提交 %s"
-#: commit-graph.c:2494
+#: commit-graph.c:2524
msgid "Verifying commits in commit graph"
msgstr "正在驗證提交圖中的提交"
-#: commit-graph.c:2509
+#: commit-graph.c:2539
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "無法從提交圖形的物件庫中解析提交 %s"
-#: commit-graph.c:2516
+#: commit-graph.c:2546
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-#: commit-graph.c:2526
+#: commit-graph.c:2556
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交圖形父提交列表太長了"
-#: commit-graph.c:2535
+#: commit-graph.c:2565
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交圖形父提交是 %s != %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2579
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交圖形父提交列表過早終止"
-#: commit-graph.c:2554
+#: commit-graph.c:2584
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
-#: commit-graph.c:2558
+#: commit-graph.c:2588
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
-#: commit-graph.c:2575
+#: commit-graph.c:2605
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
-#: commit-graph.c:2581
+#: commit-graph.c:2611
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
-#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
+#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:54
+#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一個提交！"
-#: commit.c:194
+#: commit.c:196
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2366,27 +2380,27 @@
"設定 \"git config advice.graftFileDeprecated false\"\n"
"可關閉本消息"
-#: commit.c:1237
+#: commit.c:1239
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1241
+#: commit.c:1243
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1244
+#: commit.c:1246
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 沒有 GPG 簽名。"
-#: commit.c:1247
+#: commit.c:1249
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-#: commit.c:1501
+#: commit.c:1503
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2400,7 +2414,7 @@
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: config.c:126
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2415,35 +2429,35 @@
"\t%2$s\n"
"這可能是因為循環包含。"
-#: config.c:142
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
-msgstr "無法擴展包含路徑 '%s'"
+msgstr "無法展開包含路徑 '%s'"
-#: config.c:153
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "相對路徑的設定檔案引用必須來自於檔案"
-#: config.c:199
+#: config.c:201
msgid "relative config include conditionals must come from files"
msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-#: config.c:396
+#: config.c:398
#, c-format
msgid "invalid config format: %s"
msgstr "無效的設定檔格式：%s"
-#: config.c:400
+#: config.c:402
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "缺少「%.*s」組態設定的環境變數名稱"
-#: config.c:405
+#: config.c:407
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
-#: config.c:442
+#: config.c:443
#, c-format
msgid "key does not contain a section: %s"
msgstr "鍵名沒有包含一個小節名稱：%s"
@@ -2453,295 +2467,295 @@
msgid "key does not contain variable name: %s"
msgstr "鍵名沒有包含變數名：%s"
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
#, c-format
msgid "invalid key: %s"
msgstr "無效鍵名：%s"
-#: config.c:478
+#: config.c:475
#, c-format
msgid "invalid key (newline): %s"
msgstr "無效鍵名（有換行符號）：%s"
-#: config.c:511
+#: config.c:495
msgid "empty config key"
msgstr "空白設定鍵"
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
#, c-format
msgid "bogus config parameter: %s"
msgstr "偽設定參數：%s"
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式錯誤"
-#: config.c:622
+#: config.c:606
#, c-format
msgid "bogus count in %s"
msgstr "%s 中有偽計數"
-#: config.c:626
+#: config.c:610
#, c-format
msgid "too many entries in %s"
msgstr "%s 中的項目過多"
-#: config.c:636
+#: config.c:620
#, c-format
msgid "missing config key %s"
msgstr "缺少 %s 設定鍵"
-#: config.c:644
+#: config.c:628
#, c-format
msgid "missing config value %s"
msgstr "缺少 %s 設定值"
-#: config.c:995
+#: config.c:979
#, c-format
msgid "bad config line %d in blob %s"
msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:999
+#: config.c:983
#, c-format
msgid "bad config line %d in file %s"
msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1003
+#: config.c:987
#, c-format
msgid "bad config line %d in standard input"
msgstr "標準輸入中錯誤的設定行 %d"
-#: config.c:1007
+#: config.c:991
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1011
+#: config.c:995
#, c-format
msgid "bad config line %d in command line %s"
msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1015
+#: config.c:999
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1152
+#: config.c:1136
msgid "out of range"
msgstr "超出範圍"
-#: config.c:1152
+#: config.c:1136
msgid "invalid unit"
msgstr "無效的單位"
-#: config.c:1153
+#: config.c:1137
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
-#: config.c:1163
+#: config.c:1147
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1166
+#: config.c:1150
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1169
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
-#: config.c:1172
+#: config.c:1156
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1175
+#: config.c:1159
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1178
+#: config.c:1162
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
-#: config.c:1257
+#: config.c:1241
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "「%2$s」的「%1$s」布林設定值無效"
-#: config.c:1275
+#: config.c:1259
#, c-format
msgid "failed to expand user dir in: '%s'"
-msgstr "無法擴展使用者目錄：'%s'"
+msgstr "無法展開使用者目錄於：’%s’"
-#: config.c:1284
+#: config.c:1268
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-#: config.c:1377
+#: config.c:1361
#, c-format
msgid "abbrev length out of range: %d"
msgstr "縮寫長度超出範圍：%d"
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
#, c-format
msgid "bad zlib compression level %d"
msgstr "錯誤的 zlib 壓縮級別 %d"
-#: config.c:1494
+#: config.c:1476
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 應該是一個字元"
-#: config.c:1527
+#: config.c:1509
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "無效的物件建立模式：%s"
-#: config.c:1599
+#: config.c:1581
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式錯誤"
-#: config.c:1625
+#: config.c:1607
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式錯誤：%s"
-#: config.c:1626
+#: config.c:1608
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1687 builtin/pack-objects.c:4084
+#: config.c:1669 builtin/pack-objects.c:4053
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
-#: config.c:1809
+#: config.c:1792
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
-#: config.c:1812
+#: config.c:1795
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 沒有指向一個資料物件"
-#: config.c:1829
+#: config.c:1813
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析設定物件 '%s'"
-#: config.c:1874
+#: config.c:1858
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失敗"
-#: config.c:1930
+#: config.c:1914
msgid "unable to parse command-line config"
msgstr "無法解析指令列中的設定"
-#: config.c:2294
+#: config.c:2282
msgid "unknown error occurred while reading the configuration files"
msgstr "在讀取設定檔案時遇到未知錯誤"
-#: config.c:2468
+#: config.c:2456
#, c-format
msgid "Invalid %s: '%s'"
msgstr "無效 %s：'%s'"
-#: config.c:2513
+#: config.c:2501
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-#: config.c:2559
+#: config.c:2547
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "無法解析指令列設定中的 '%s'"
-#: config.c:2561
+#: config.c:2549
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-#: config.c:2645
+#: config.c:2633
#, c-format
msgid "invalid section name '%s'"
msgstr "無效的小節名稱 '%s'"
-#: config.c:2677
+#: config.c:2665
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多個取值"
-#: config.c:2706
+#: config.c:2694
#, c-format
msgid "failed to write new configuration file %s"
msgstr "寫入新的設定檔案 %s 失敗"
-#: config.c:2958 config.c:3285
+#: config.c:2946 config.c:3273
#, c-format
msgid "could not lock config file %s"
msgstr "不能鎖定設定檔案 %s"
-#: config.c:2969
+#: config.c:2957
#, c-format
msgid "opening %s"
msgstr "開啟 %s"
-#: config.c:3006 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "無效模式：%s"
-#: config.c:3031
+#: config.c:3019
#, c-format
msgid "invalid config file %s"
msgstr "無效的設定檔案 %s"
-#: config.c:3044 config.c:3298
+#: config.c:3032 config.c:3286
#, c-format
msgid "fstat on %s failed"
msgstr "對 %s 呼叫 fstat 失敗"
-#: config.c:3055
+#: config.c:3043
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "無法 mmap '%s'%s"
-#: config.c:3065 config.c:3303
+#: config.c:3053 config.c:3291
#, c-format
msgid "chmod on %s failed"
msgstr "對 %s 呼叫 chmod 失敗"
-#: config.c:3150 config.c:3400
+#: config.c:3138 config.c:3388
#, c-format
msgid "could not write config file %s"
msgstr "不能寫入設定檔案 %s"
-#: config.c:3184
+#: config.c:3172
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能設定 '%s' 為 '%s'"
-#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消設定 '%s'"
-#: config.c:3276
+#: config.c:3264
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱：%s"
-#: config.c:3443
+#: config.c:3431
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺少"
@@ -2775,72 +2789,72 @@
msgid "expected flush after capabilities"
msgstr "在能力之後應為一個 flush 包"
-#: connect.c:263
+#: connect.c:265
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "忽略第一行 '%s' 之後的能力欄位"
-#: connect.c:284
+#: connect.c:286
msgid "protocol error: unexpected capabilities^{}"
msgstr "協定錯誤：意外的 capabilities^{}"
-#: connect.c:306
+#: connect.c:308
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
-#: connect.c:308
+#: connect.c:310
msgid "repository on the other end cannot be shallow"
msgstr "另一端的版本庫不能是淺複製版本庫"
-#: connect.c:347
+#: connect.c:349
msgid "invalid packet"
msgstr "無效封包"
-#: connect.c:367
+#: connect.c:369
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "協定錯誤：意外的 '%s'"
-#: connect.c:497
+#: connect.c:499
#, c-format
msgid "unknown object format '%s' specified by server"
msgstr "伺服器指定的「%s」物件格式無效"
-#: connect.c:526
+#: connect.c:528
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "無效的 ls-refs 回應：%s"
-#: connect.c:530
+#: connect.c:532
msgid "expected flush after ref listing"
msgstr "在引用列表之後應該有一個 flush 包"
-#: connect.c:533
+#: connect.c:535
msgid "expected response end packet after ref listing"
msgstr "在引用列表後預期要有回應結束封包"
-#: connect.c:666
+#: connect.c:670
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支援 '%s' 協定"
-#: connect.c:717
+#: connect.c:721
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "無法為 socket 設定 SO_KEEPALIVE"
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
#, c-format
msgid "Looking up %s ... "
msgstr "尋找 %s ... "
-#: connect.c:761
+#: connect.c:765
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "無法尋找 %s（埠 %s）（%s）"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
#, c-format
msgid ""
"done.\n"
@@ -2849,7 +2863,7 @@
"完成。\n"
"連線到 %s（埠 %s）... "
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2859,77 +2873,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
msgid "done."
msgstr "完成。"
-#: connect.c:824
+#: connect.c:828
#, c-format
msgid "unable to look up %s (%s)"
msgstr "無法尋找 %s（%s）"
-#: connect.c:830
+#: connect.c:834
#, c-format
msgid "unknown port %s"
msgstr "未知埠 %s"
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主機名稱 '%s'"
-#: connect.c:969
+#: connect.c:973
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的埠號 '%s'"
-#: connect.c:979
+#: connect.c:983
#, c-format
msgid "cannot start proxy %s"
msgstr "不能啟動代理 %s"
-#: connect.c:1050
+#: connect.c:1054
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
-#: connect.c:1190
+#: connect.c:1194
msgid "newline is forbidden in git:// hosts and repo paths"
msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
-#: connect.c:1247
+#: connect.c:1251
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 變體 'simple' 不支援 -4"
-#: connect.c:1259
+#: connect.c:1263
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 變體 'simple' 不支援 -6"
-#: connect.c:1276
+#: connect.c:1280
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 變體 'simple' 不支援設定埠"
-#: connect.c:1388
+#: connect.c:1392
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路徑名 '%s'"
-#: connect.c:1436
+#: connect.c:1440
msgid "unable to fork"
msgstr "無法 fork"
-#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "正在檢查連通性"
-#: connected.c:120
+#: connected.c:122
msgid "Could not run 'git rev-list'"
msgstr "不能執行 'git rev-list'"
-#: connected.c:144
+#: connected.c:146
msgid "failed write to rev-list"
msgstr "寫入 rev-list 失敗"
-#: connected.c:149
+#: connected.c:151
msgid "failed to close rev-list's stdin"
msgstr "關閉 rev-list 的標準輸入失敗"
@@ -3069,17 +3083,17 @@
msgid "refusing to work with credential missing protocol field"
msgstr "拒絕使用缺少通訊協定欄位的憑證"
-#: credential.c:394
+#: credential.c:395
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL 的 %s 部分有換行：%s"
-#: credential.c:438
+#: credential.c:439
#, c-format
msgid "url has no scheme: %s"
msgstr "URL 沒有 Scheme：%s"
-#: credential.c:511
+#: credential.c:512
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "無法解析憑證 URL：%s"
@@ -3155,12 +3169,12 @@
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
-msgstr "未能載入 '%s' 的資料島正規表示式：%s"
+msgstr "未能載入 '%s' 的資料島常規表示式：%s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 %d 個）"
+msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）"
#: delta-islands.c:467
#, c-format
@@ -3172,23 +3186,23 @@
msgid "unknown value for --diff-merges: %s"
msgstr "--diff-merges 的值無效：%s"
-#: diff-lib.c:557
+#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "--merge-base 跟範圍無法搭配運作"
-#: diff-lib.c:559
+#: diff-lib.c:563
msgid "--merge-base only works with commits"
msgstr "--merge-base 只能跟提交搭配才能運作"
-#: diff-lib.c:576
+#: diff-lib.c:580
msgid "unable to get HEAD"
msgstr "不能取得 HEAD"
-#: diff-lib.c:583
+#: diff-lib.c:587
msgid "no merge base found"
msgstr "找不到合併基底"
-#: diff-lib.c:585
+#: diff-lib.c:589
msgid "multiple merge bases found"
msgstr "找到多個合併基底"
@@ -3203,18 +3217,18 @@
msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
# 譯者：請維持前導空格
-#: diff.c:156
+#: diff.c:157
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 譯者：請維持前導空格
-#: diff.c:161
+#: diff.c:162
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 參數 '%s'\n"
-#: diff.c:297
+#: diff.c:298
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3222,7 +3236,7 @@
"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
"zebra'、'plain'"
-#: diff.c:325
+#: diff.c:326
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3231,18 +3245,18 @@
"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:333
+#: diff.c:334
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
-#: diff.c:410
+#: diff.c:411
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:470
+#: diff.c:471
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3251,47 +3265,47 @@
"發現設定變數 'diff.dirstat' 中的錯誤：\n"
"%s"
-#: diff.c:4282
+#: diff.c:4290
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開，停止在 %s"
-#: diff.c:4634
+#: diff.c:4642
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4637
+#: diff.c:4645
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4640
+#: diff.c:4648
msgid ""
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"
-#: diff.c:4643
+#: diff.c:4651
msgid ""
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"
-#: diff.c:4722
+#: diff.c:4730
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明確要求只跟一個路徑規格"
-#: diff.c:4770
+#: diff.c:4778
#, c-format
msgid "invalid --stat value: %s"
msgstr "無效的 --stat 值：%s"
-#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一個數字值"
-#: diff.c:4807
+#: diff.c:4815
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3300,200 +3314,200 @@
"無法解析 --dirstat/-X 選項的參數：\n"
"%s"
-#: diff.c:4892
+#: diff.c:4900
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-#: diff.c:4916
+#: diff.c:4924
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之後未知的值"
-#: diff.c:4930
+#: diff.c:4938
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4980 diff.c:4986
+#: diff.c:4988 diff.c:4994
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4998
+#: diff.c:5006
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一個字元，得到 '%s'"
-#: diff.c:5019
+#: diff.c:5027
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "壞的 --color-moved 參數：%s"
-#: diff.c:5038
+#: diff.c:5046
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的無效模式 '%s'"
-#: diff.c:5078
+#: diff.c:5086
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5114 diff.c:5134
+#: diff.c:5122 diff.c:5142
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的參數無效"
-#: diff.c:5238
+#: diff.c:5246
#, c-format
msgid "invalid regex given to -I: '%s'"
-msgstr "傳入 -I 的正規表示式無效：「%s」"
+msgstr "傳入 -I 的常規表示式無效：「%s」"
-#: diff.c:5287
+#: diff.c:5295
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "無法解析 --submodule 選項的參數：'%s'"
-#: diff.c:5343
+#: diff.c:5351
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "壞的 --word-diff 參數：%s"
-#: diff.c:5379
+#: diff.c:5387
msgid "Diff output format options"
msgstr "差異輸出格式化選項"
-#: diff.c:5381 diff.c:5387
+#: diff.c:5389 diff.c:5395
msgid "generate patch"
msgstr "生成修補檔"
-#: diff.c:5384 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
msgid "suppress diff output"
msgstr "不顯示差異輸出"
-#: diff.c:5389 diff.c:5503 diff.c:5510
+#: diff.c:5397 diff.c:5511 diff.c:5518
msgid "<n>"
msgstr "<n>"
-#: diff.c:5390 diff.c:5393
+#: diff.c:5398 diff.c:5401
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
-#: diff.c:5395
+#: diff.c:5403
msgid "generate the diff in raw format"
msgstr "生成原始格式的差異"
-#: diff.c:5398
+#: diff.c:5406
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同義"
-#: diff.c:5402
+#: diff.c:5410
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同義"
-#: diff.c:5406
+#: diff.c:5414
msgid "machine friendly --stat"
msgstr "機器友好的 --stat"
-#: diff.c:5409
+#: diff.c:5417
msgid "output only the last line of --stat"
msgstr "只輸出 --stat 的最後一行"
-#: diff.c:5411 diff.c:5419
+#: diff.c:5419 diff.c:5427
msgid "<param1,param2>..."
msgstr "<參數1,參數2>..."
-#: diff.c:5412
+#: diff.c:5420
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "輸出每個子目錄相對變更的分布"
-#: diff.c:5416
+#: diff.c:5424
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同義"
-#: diff.c:5420
+#: diff.c:5428
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-#: diff.c:5424
+#: diff.c:5432
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
-#: diff.c:5427
+#: diff.c:5435
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精簡摘要，例如建立、重新命名和模式變更"
-#: diff.c:5430
+#: diff.c:5438
msgid "show only names of changed files"
msgstr "只顯示變更檔案的檔案名"
-#: diff.c:5433
+#: diff.c:5441
msgid "show only names and status of changed files"
msgstr "只顯示變更檔案的檔案名和狀態"
-#: diff.c:5435
+#: diff.c:5443
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-#: diff.c:5436
+#: diff.c:5444
msgid "generate diffstat"
msgstr "生成差異統計（diffstat）"
-#: diff.c:5438 diff.c:5441 diff.c:5444
+#: diff.c:5446 diff.c:5449 diff.c:5452
msgid "<width>"
msgstr "<寬度>"
-#: diff.c:5439
+#: diff.c:5447
msgid "generate diffstat with a given width"
msgstr "使用提供的長度生成差異統計"
-#: diff.c:5442
+#: diff.c:5450
msgid "generate diffstat with a given name width"
msgstr "使用提供的檔案名長度生成差異統計"
-#: diff.c:5445
+#: diff.c:5453
msgid "generate diffstat with a given graph width"
msgstr "使用提供的圖形長度生成差異統計"
-#: diff.c:5447
+#: diff.c:5455
msgid "<count>"
msgstr "<次數>"
-#: diff.c:5448
+#: diff.c:5456
msgid "generate diffstat with limited lines"
msgstr "生成有限行數的差異統計"
-#: diff.c:5451
+#: diff.c:5459
msgid "generate compact summary in diffstat"
msgstr "生成差異統計的簡潔摘要"
-#: diff.c:5454
+#: diff.c:5462
msgid "output a binary diff that can be applied"
msgstr "輸出一個可以套用的二進位差異"
-#: diff.c:5457
+#: diff.c:5465
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-#: diff.c:5459
+#: diff.c:5467
msgid "show colored diff"
msgstr "顯示帶顏色的差異"
-#: diff.c:5460
+#: diff.c:5468
msgid "<kind>"
msgstr "<類型>"
-#: diff.c:5461
+#: diff.c:5469
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
-#: diff.c:5464
+#: diff.c:5472
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3501,311 +3515,311 @@
"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
"符"
-#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
msgid "<prefix>"
msgstr "<前綴>"
-#: diff.c:5468
+#: diff.c:5476
msgid "show the given source prefix instead of \"a/\""
-msgstr "顯示提供的源前綴取代 \"a/\""
+msgstr "顯示提供的來源前綴，而非 \"a/\""
-#: diff.c:5471
+#: diff.c:5479
msgid "show the given destination prefix instead of \"b/\""
-msgstr "顯示提供的目標前綴取代 \"b/\""
+msgstr "顯示提供的目的地前綴取代 \"b/\""
-#: diff.c:5474
+#: diff.c:5482
msgid "prepend an additional prefix to every line of output"
msgstr "輸出的每一行附加前綴"
-#: diff.c:5477
+#: diff.c:5485
msgid "do not show any source or destination prefix"
-msgstr "不顯示任何源和目標前綴"
+msgstr "不顯示任何來源和目的地前綴"
-#: diff.c:5480
+#: diff.c:5488
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
-#: diff.c:5484 diff.c:5489 diff.c:5494
+#: diff.c:5492 diff.c:5497 diff.c:5502
msgid "<char>"
msgstr "<字元>"
-#: diff.c:5485
+#: diff.c:5493
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一個字元取代 '+' 來表示新的一行"
-#: diff.c:5490
+#: diff.c:5498
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一個字元取代 '-' 來表示舊的一行"
-#: diff.c:5495
+#: diff.c:5503
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-#: diff.c:5498
+#: diff.c:5506
msgid "Diff rename options"
msgstr "差異重新命名選項"
-#: diff.c:5499
+#: diff.c:5507
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5500
+#: diff.c:5508
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "將完全重寫的變更打破為成對的刪除和建立"
-#: diff.c:5504
+#: diff.c:5512
msgid "detect renames"
msgstr "檢測重新命名"
-#: diff.c:5508
+#: diff.c:5516
msgid "omit the preimage for deletes"
msgstr "省略刪除變更的差異輸出"
-#: diff.c:5511
+#: diff.c:5519
msgid "detect copies"
msgstr "檢測複製"
-#: diff.c:5515
+#: diff.c:5523
msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的檔案做為發現複製的源"
+msgstr "使用未修改的檔案做為發現拷貝的來源"
-#: diff.c:5517
+#: diff.c:5525
msgid "disable rename detection"
msgstr "停用重新命名偵測"
-#: diff.c:5520
+#: diff.c:5528
msgid "use empty blobs as rename source"
-msgstr "使用空的資料物件做為重新命名的源"
+msgstr "使用空的資料物件做為重新命名的來源"
-#: diff.c:5522
+#: diff.c:5530
msgid "continue listing the history of a file beyond renames"
msgstr "繼續列出檔案重新命名以外的歷史記錄"
-#: diff.c:5525
+#: diff.c:5533
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
-#: diff.c:5527
+#: diff.c:5535
msgid "Diff algorithm options"
msgstr "差異演算法選項"
-#: diff.c:5529
+#: diff.c:5537
msgid "produce the smallest possible diff"
msgstr "生成儘可能小的差異"
-#: diff.c:5532
+#: diff.c:5540
msgid "ignore whitespace when comparing lines"
msgstr "行比較時忽略空白字元"
-#: diff.c:5535
+#: diff.c:5543
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字元的變更"
-#: diff.c:5538
+#: diff.c:5546
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字元變更"
-#: diff.c:5541
+#: diff.c:5549
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的Enter符（CR）"
-#: diff.c:5544
+#: diff.c:5552
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的變更"
-#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
msgid "<regex>"
msgstr "<正則>"
-#: diff.c:5547
+#: diff.c:5555
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略整行符合 <regex> 的變更"
-#: diff.c:5550
+#: diff.c:5558
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "啟發式轉換差異邊界以便閱讀"
-#: diff.c:5553
+#: diff.c:5561
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 演算法生成差異"
-#: diff.c:5557
+#: diff.c:5565
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 演算法生成差異"
-#: diff.c:5559
+#: diff.c:5567
msgid "<algorithm>"
msgstr "<演算法>"
-#: diff.c:5560
+#: diff.c:5568
msgid "choose a diff algorithm"
msgstr "選擇一個差異演算法"
-#: diff.c:5562
+#: diff.c:5570
msgid "<text>"
msgstr "<文字>"
-#: diff.c:5563
+#: diff.c:5571
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 演算法生成差異"
-#: diff.c:5565 diff.c:5574 diff.c:5577
+#: diff.c:5573 diff.c:5582 diff.c:5585
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5566
+#: diff.c:5574
msgid "show word diff, using <mode> to delimit changed words"
msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
-#: diff.c:5569
+#: diff.c:5577
msgid "use <regex> to decide what a word is"
-msgstr "使用 <正規表示式> 確定何為一個詞"
+msgstr "使用 <常規表示式> 確定何為一個詞"
-#: diff.c:5572
+#: diff.c:5580
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-#: diff.c:5575
+#: diff.c:5583
msgid "moved lines of code are colored differently"
msgstr "移動的程式碼行用不同方式著色"
-#: diff.c:5578
+#: diff.c:5586
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字元"
-#: diff.c:5581
+#: diff.c:5589
msgid "Other diff options"
msgstr "其它差異選項"
-#: diff.c:5583
+#: diff.c:5591
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
-#: diff.c:5587
+#: diff.c:5595
msgid "treat all files as text"
msgstr "把所有檔案當做文字處理"
-#: diff.c:5589
+#: diff.c:5597
msgid "swap two inputs, reverse the diff"
msgstr "交換兩個輸入，反轉差異"
-#: diff.c:5591
+#: diff.c:5599
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差異時離開碼為 1，否則為 0"
-#: diff.c:5593
+#: diff.c:5601
msgid "disable all output of the program"
msgstr "停用本程式的所有輸出"
-#: diff.c:5595
+#: diff.c:5603
msgid "allow an external diff helper to be executed"
msgstr "允許執行一個外部的差異協助工具"
-#: diff.c:5597
+#: diff.c:5605
msgid "run external text conversion filters when comparing binary files"
msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
-#: diff.c:5599
+#: diff.c:5607
msgid "<when>"
msgstr "<何時>"
-#: diff.c:5600
+#: diff.c:5608
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差異時，忽略子模組的更改"
-#: diff.c:5603
+#: diff.c:5611
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5604
+#: diff.c:5612
msgid "specify how differences in submodules are shown"
msgstr "指定子模組的差異如何顯示"
-#: diff.c:5608
+#: diff.c:5616
msgid "hide 'git add -N' entries from the index"
msgstr "隱藏索引中 'git add -N' 條目"
-#: diff.c:5611
+#: diff.c:5619
msgid "treat 'git add -N' entries as real in the index"
msgstr "將索引中 'git add -N' 條目當做真實的"
-#: diff.c:5613
+#: diff.c:5621
msgid "<string>"
msgstr "<字串>"
-#: diff.c:5614
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "尋找改變了指定字串出現次數的差異"
-#: diff.c:5617
+#: diff.c:5625
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "尋找改變指定正則符合出現次數的差異"
-#: diff.c:5620
+#: diff.c:5628
msgid "show all changes in the changeset with -S or -G"
msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-#: diff.c:5623
+#: diff.c:5631
msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
+msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
-#: diff.c:5626
+#: diff.c:5634
msgid "control the order in which files appear in the output"
msgstr "控制輸出中的檔案顯示順序"
-#: diff.c:5627 diff.c:5630
+#: diff.c:5635 diff.c:5638
msgid "<path>"
msgstr "<路徑>"
-#: diff.c:5628
+#: diff.c:5636
msgid "show the change in the specified path first"
msgstr "先顯示指定路徑的變更"
-#: diff.c:5631
+#: diff.c:5639
msgid "skip the output to the specified path"
msgstr "略過輸出至指定路徑"
-#: diff.c:5633
+#: diff.c:5641
msgid "<object-id>"
msgstr "<物件 ID>"
-#: diff.c:5634
+#: diff.c:5642
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "尋找改變指定物件出現次數的差異"
-#: diff.c:5636
+#: diff.c:5644
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5637
+#: diff.c:5645
msgid "select files by diff type"
msgstr "透過差異類型選擇檔案"
-#: diff.c:5639
+#: diff.c:5647
msgid "<file>"
msgstr "<檔案>"
-#: diff.c:5640
+#: diff.c:5648
msgid "Output to a specific file"
msgstr "輸出到一個指定的檔案"
-#: diff.c:6298
+#: diff.c:6306
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "因為檔案太多，已略過詳細重新命名偵測。"
-#: diff.c:6301
+#: diff.c:6309
msgid "only found copies from modified paths due to too many files."
msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
-#: diff.c:6304
+#: diff.c:6312
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3816,7 +3830,7 @@
msgid "failed to read orderfile '%s'"
msgstr "讀取排序檔案 '%s' 失敗"
-#: diffcore-rename.c:1514
+#: diffcore-rename.c:1564
msgid "Performing inexact rename detection"
msgstr "正在進行非精確的重新命名偵測"
@@ -3854,337 +3868,410 @@
msgid "cannot use %s as an exclude file"
msgstr "不能將 %s 用作排除檔案"
-#: dir.c:2351
+#: dir.c:2464
#, c-format
msgid "could not open directory '%s'"
msgstr "不能開啟目錄 '%s'"
-#: dir.c:2653
+#: dir.c:2766
msgid "failed to get kernel name and information"
msgstr "無法獲得核心名稱和訊息"
-#: dir.c:2777
+#: dir.c:2890
msgid "untracked cache is disabled on this system or location"
msgstr "快取未追蹤檔案在本系統或位置中被停用"
-#: dir.c:3610
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"無法猜到目錄名。\n"
+"請在指令列指定一個目錄"
+
+#: dir.c:3837
#, c-format
msgid "index file corrupt in repo %s"
msgstr "版本庫 %s 中的索引檔案損壞"
-#: dir.c:3657 dir.c:3662
+#: dir.c:3884 dir.c:3889
#, c-format
msgid "could not create directories for %s"
msgstr "不能為 %s 建立目錄"
-#: dir.c:3691
+#: dir.c:3918
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
-#: editor.c:74
+#: editor.c:77
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示：等待您的編輯器關閉檔案...%c"
-#: entry.c:176
+#: entry.c:177
msgid "Filtering content"
msgstr "過濾內容"
-#: entry.c:497
+#: entry.c:498
#, c-format
msgid "could not stat file '%s'"
msgstr "不能對檔案 '%s' 呼叫 stat"
-#: environment.c:152
+#: environment.c:143
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
-#: environment.c:334
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "不能設定 GIT_DIR 為 '%s'"
-
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "執行 %s 的參數太多"
-#: fetch-pack.c:182
+#: fetch-pack.c:193
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：應為 shallow 列表"
-#: fetch-pack.c:185
+#: fetch-pack.c:196
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
-#: fetch-pack.c:196
+#: fetch-pack.c:207
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
-#: fetch-pack.c:216
+#: fetch-pack.c:227
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
-#: fetch-pack.c:227
+#: fetch-pack.c:238
msgid "unable to write to remote"
msgstr "無法寫到遠端"
-#: fetch-pack.c:288
+#: fetch-pack.c:299
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
#, c-format
msgid "invalid shallow line: %s"
msgstr "無效的 shallow 訊息：%s"
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
#, c-format
msgid "invalid unshallow line: %s"
msgstr "無效的 unshallow 訊息：%s"
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
#, c-format
msgid "object not found: %s"
msgstr "物件未找到：%s"
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
#, c-format
msgid "error in object: %s"
msgstr "物件中發生錯誤：%s"
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
#, c-format
msgid "no shallow found: %s"
msgstr "未發現 shallow：%s"
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "應為 shallow/unshallow，卻得到 %s"
-#: fetch-pack.c:439
+#: fetch-pack.c:450
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:456
+#: fetch-pack.c:467
#, c-format
msgid "invalid commit %s"
msgstr "無效提交 %s"
-#: fetch-pack.c:487
+#: fetch-pack.c:498
msgid "giving up"
msgstr "放棄"
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:512
+#: fetch-pack.c:523
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:548
+#: fetch-pack.c:559
#, c-format
msgid "Marking %s as complete"
msgstr "標記 %s 為完成"
-#: fetch-pack.c:763
+#: fetch-pack.c:774
#, c-format
msgid "already have %s (%s)"
msgstr "已經有 %s（%s）"
-#: fetch-pack.c:849
+#: fetch-pack.c:860
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：無法衍生 sideband 多路輸出"
-#: fetch-pack.c:857
+#: fetch-pack.c:868
msgid "protocol error: bad pack header"
msgstr "協定錯誤：壞的包頭"
-#: fetch-pack.c:951
+#: fetch-pack.c:962
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：無法 fork %s 處理程序"
-#: fetch-pack.c:957
+#: fetch-pack.c:968
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack：無效的 index-pack 輸出"
-#: fetch-pack.c:974
+#: fetch-pack.c:985
#, c-format
msgid "%s failed"
msgstr "%s 失敗"
-#: fetch-pack.c:976
+#: fetch-pack.c:987
msgid "error in sideband demultiplexer"
msgstr "sideband 多路輸出發生錯誤"
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
#, c-format
msgid "Server version is %.*s"
msgstr "伺服器版本 %.*s"
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
+#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
+#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
+#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
#, c-format
msgid "Server supports %s"
msgstr "伺服器支援 %s"
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
msgid "Server does not support shallow clients"
msgstr "伺服器不支援 shallow 用戶端"
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
msgid "Server does not support --shallow-since"
msgstr "伺服器不支援 --shallow-since"
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
msgid "Server does not support --shallow-exclude"
msgstr "伺服器不支援 --shallow-exclude"
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
msgid "Server does not support --deepen"
msgstr "伺服器不支援 --deepen"
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
msgid "Server does not support this repository's object format"
msgstr "伺服器不支援此版本庫的物件格式"
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
msgid "no common commits"
msgstr "沒有共同的提交"
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
msgid "source repository is shallow, reject to clone."
msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
-#: fetch-pack.c:1128 fetch-pack.c:1660
+#: fetch-pack.c:1139 fetch-pack.c:1671
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：取得失敗。"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "算法不一致：用戶端 %s；伺服器 %s"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "伺服器不支援「%s」算法"
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
msgid "Server does not support shallow requests"
msgstr "伺服器不支援 shallow 請求"
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
msgid "Server supports filter"
msgstr "伺服器支援 filter"
-#: fetch-pack.c:1329 fetch-pack.c:2043
+#: fetch-pack.c:1340 fetch-pack.c:2053
msgid "unable to write request to remote"
msgstr "無法將請求寫到遠端"
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
#, c-format
msgid "error reading section header '%s'"
msgstr "讀取節標題 '%s' 發生錯誤"
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
#, c-format
msgid "expected '%s', received '%s'"
msgstr "預期 '%s'，得到 '%s'"
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的確認行：'%s'"
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
#, c-format
msgid "error processing acks: %d"
msgstr "處理 ack 發生錯誤：%d"
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
msgid "expected packfile to be sent after 'ready'"
msgstr "預期在 'ready' 之後傳送 packfile"
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在沒有 'ready' 不應該傳送其它小節"
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
#, c-format
msgid "error processing shallow info: %d"
msgstr "處理淺複製訊息發生錯誤：%d"
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "預期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
#, c-format
msgid "error processing wanted refs: %d"
msgstr "處理要取得的引用發生錯誤：%d"
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: 預期要有回應結束封包"
-#: fetch-pack.c:1939
+#: fetch-pack.c:1949
msgid "no matching remote head"
msgstr "沒有符合的遠端分支"
-#: fetch-pack.c:1962 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
msgid "remote did not send all necessary objects"
msgstr "遠端沒有傳送所有必需的物件"
-#: fetch-pack.c:2065
+#: fetch-pack.c:2075
msgid "unexpected 'ready' from remote"
msgstr "從遠端收到非預期的 ‘ready’"
-#: fetch-pack.c:2088
+#: fetch-pack.c:2098
#, c-format
msgid "no such remote ref %s"
msgstr "沒有這樣的遠端引用 %s"
-#: fetch-pack.c:2091
+#: fetch-pack.c:2101
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "伺服器不允許請求未公開的物件 %s"
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
msgid "could not create temporary file"
msgstr "不能建立暫存檔"
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "無法將分離式簽名寫入 '%s'"
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ "
+"版本使用）"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "簽名「%s」損壞或者不相容"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "無法取得「%s」金鑰的 SSH 指紋"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
+
+#: gpg-interface.c:874
msgid "gpg failed to sign the data"
msgstr "gpg 無法為資料簽名"
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "無法將 SSH 簽名金鑰寫入「%s」"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
+
#: graph.c:98
#, c-format
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"
-#: grep.c:531
+#: grep.c:533
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4192,109 +4279,109 @@
"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
"功能"
-#: grep.c:1895
+#: grep.c:1928
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：無法讀取 %s"
-#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "對 '%s' 呼叫 stat 失敗"
-#: grep.c:1923
+#: grep.c:1956
#, c-format
msgid "'%s': short read"
msgstr "'%s'：讀取不完整"
-#: help.c:23
+#: help.c:24
msgid "start a working area (see also: git help tutorial)"
msgstr "開始一個工作區（參見：git help tutorial）"
-#: help.c:24
+#: help.c:25
msgid "work on the current change (see also: git help everyday)"
msgstr "在目前變更上工作（參見：git help everyday）"
-#: help.c:25
+#: help.c:26
msgid "examine the history and state (see also: git help revisions)"
msgstr "檢查歷史和狀態（參見：git help revisions）"
-#: help.c:26
+#: help.c:27
msgid "grow, mark and tweak your common history"
msgstr "擴展、標記和調校您的歷史記錄"
-#: help.c:27
+#: help.c:28
msgid "collaborate (see also: git help workflows)"
msgstr "協同（參見：git help workflows）"
-#: help.c:31
+#: help.c:32
msgid "Main Porcelain Commands"
msgstr "主要的上層指令"
-#: help.c:32
+#: help.c:33
msgid "Ancillary Commands / Manipulators"
msgstr "輔助指令/動作者"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Interrogators"
msgstr "輔助指令/詢問者"
-#: help.c:34
+#: help.c:35
msgid "Interacting with Others"
msgstr "與其它系統互動"
-#: help.c:35
+#: help.c:36
msgid "Low-level Commands / Manipulators"
msgstr "低級指令/動作者"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Interrogators"
msgstr "低級指令/詢問者"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Syncing Repositories"
msgstr "低級指令 / 同步版本庫"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Internal Helpers"
msgstr "低級指令/內部協助工具"
-#: help.c:300
+#: help.c:313
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 指令"
-#: help.c:307
+#: help.c:320
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
-#: help.c:316
+#: help.c:329
msgid "These are common Git commands used in various situations:"
msgstr "這些是各種場合常見的 Git 指令："
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支援的指令列表類型 '%s'"
-#: help.c:405
+#: help.c:418
msgid "The Git concept guides are:"
msgstr "Git 概念嚮導有："
-#: help.c:429
+#: help.c:442
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "執行 'git help <command>' 來檢視特定子指令"
-#: help.c:434
+#: help.c:447
msgid "External commands"
msgstr "外部指令"
-#: help.c:449
+#: help.c:462
msgid "Command aliases"
msgstr "指令別名"
-#: help.c:527
+#: help.c:543
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4303,31 +4390,36 @@
"'%s' 像是一個 git 指令，但卻無法執行。\n"
"可能是 git-%s 受損？"
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
-#: help.c:591
+#: help.c:613
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系統中未發現 Git 指令。"
-#: help.c:613
+#: help.c:635
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
-#: help.c:618
+#: help.c:640
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 並繼續。"
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "改執行「%s」？(y/N)"
+
+#: help.c:654
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
-#: help.c:635
+#: help.c:666
msgid ""
"\n"
"The most similar command is"
@@ -4338,16 +4430,16 @@
"\n"
"最類似的指令有"
-#: help.c:675
+#: help.c:706
msgid "git version [<options>]"
msgstr "git version [<選項>]"
-#: help.c:730
+#: help.c:761
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:734
+#: help.c:765
msgid ""
"\n"
"Did you mean this?"
@@ -4358,6 +4450,15 @@
"\n"
"您指的是這個嗎？"
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
+"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
+
#: ident.c:353
msgid "Author identity unknown\n"
msgstr "作者身分未知\n"
@@ -4389,7 +4490,8 @@
" git config --global user.name \"Your Name\"\n"
"\n"
"來設定您帳號的預設身份標記。\n"
-"如果僅在本版本庫設定身份標記，則省略 --global 參數。\n"
+"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
+"\n"
#: ident.c:397
msgid "no email was given and auto-detection is disabled"
@@ -4419,7 +4521,7 @@
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中僅包含停用字元：%s"
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
#, c-format
msgid "invalid date format: %s"
msgstr "無效的日期格式：%s"
@@ -4440,7 +4542,7 @@
#: list-objects-filter-options.c:124
#, c-format
msgid "invalid filter-spec '%s'"
-msgstr "無效的過濾器表達式 '%s'"
+msgstr "無效的過濾器規格 '%s'"
#: list-objects-filter-options.c:140
#, c-format
@@ -4497,10 +4599,11 @@
msgstr ""
"無法建立 '%s.lock'：%s。\n"
"\n"
-"似乎另外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n"
-"開了一個編輯器。請確認所有進程都已經關閉然後重試。如果仍然報錯，\n"
-"可能之前有一個 git 進程在這個版本庫中異常離開：\n"
-"手動刪除這個檔案再繼續。"
+"這個版本庫似乎有另一個 git 處理程序在執行，\n"
+"例如「git commit」命令開啟的編輯器。\n"
+"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n"
+"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n"
+"如果是這樣，請自行刪除這個檔案再繼續。"
#: lockfile.c:160
#, c-format
@@ -4512,7 +4615,12 @@
msgid "invalid value '%s' for lsrefs.unborn"
msgstr "lsrefs.unborn 的值「%s」無效"
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "遇到非預期橫列：「%s」"
+
+#: ls-refs.c:178
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 引數之後應該有一個 flush 包"
@@ -4520,37 +4628,37 @@
msgid "quoted CRLF detected"
msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "「%s」動作對「%s」無效"
-#: merge-ort.c:1569 merge-recursive.c:1201
+#: merge-ort.c:1584 merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "無法合併子模組 %s （沒有簽出）"
-#: merge-ort.c:1578 merge-recursive.c:1208
+#: merge-ort.c:1593 merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "無法合併子模組 %s（提交不存在）"
-#: merge-ort.c:1587 merge-recursive.c:1215
+#: merge-ort.c:1602 merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
-#: merge-ort.c:1597 merge-ort.c:1604
+#: merge-ort.c:1612 merge-ort.c:1620
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "注意：正在將 %s 子模組快轉到 %s"
-#: merge-ort.c:1625
+#: merge-ort.c:1642
#, c-format
msgid "Failed to merge submodule %s"
msgstr "無法合併 %s 子模組"
-#: merge-ort.c:1632
+#: merge-ort.c:1649
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4559,7 +4667,7 @@
"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
"%s\n"
-#: merge-ort.c:1636 merge-recursive.c:1269
+#: merge-ort.c:1653 merge-recursive.c:1281
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4569,13 +4677,13 @@
"\n"
"which will accept this suggestion.\n"
msgstr ""
-"如果這個正確，將其新增到索引，例如使用指令：\n"
+"正確的話，就能直接加進索引，例如執行下述命令：\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
-"以接受此建議。\n"
+"接受本建議。\n"
-#: merge-ort.c:1649
+#: merge-ort.c:1666
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4584,21 +4692,21 @@
"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
"%s"
-#: merge-ort.c:1868 merge-recursive.c:1358
+#: merge-ort.c:1887 merge-recursive.c:1372
msgid "Failed to execute internal merge"
msgstr "無法執行內部合併"
-#: merge-ort.c:1873 merge-recursive.c:1363
+#: merge-ort.c:1892 merge-recursive.c:1377
#, c-format
msgid "Unable to add %s to database"
msgstr "不能新增 %s 至物件庫"
-#: merge-ort.c:1880 merge-recursive.c:1396
+#: merge-ort.c:1899 merge-recursive.c:1410
#, c-format
msgid "Auto-merging %s"
msgstr "自動合併 %s"
-#: merge-ort.c:2019 merge-recursive.c:2118
+#: merge-ort.c:2038 merge-recursive.c:2132
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4607,7 +4715,7 @@
"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
"放在：%s。"
-#: merge-ort.c:2029 merge-recursive.c:2128
+#: merge-ort.c:2048 merge-recursive.c:2142
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4616,7 +4724,7 @@
"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
"些路徑放置於此：%s"
-#: merge-ort.c:2087
+#: merge-ort.c:2106
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4626,14 +4734,14 @@
"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"
"錄，但沒有目的地取得過半檔案。"
-#: merge-ort.c:2241 merge-recursive.c:2464
+#: merge-ort.c:2260 merge-recursive.c:2478
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
-#: merge-ort.c:2385 merge-recursive.c:3247
+#: merge-ort.c:2400 merge-recursive.c:3261
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4641,7 +4749,7 @@
msgstr ""
"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
-#: merge-ort.c:2392 merge-recursive.c:3254
+#: merge-ort.c:2407 merge-recursive.c:3268
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4650,7 +4758,7 @@
"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
"其移動到 %5$s。"
-#: merge-ort.c:2405 merge-recursive.c:3250
+#: merge-ort.c:2420 merge-recursive.c:3264
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4659,7 +4767,7 @@
"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
"動到 %s。"
-#: merge-ort.c:2413 merge-recursive.c:3257
+#: merge-ort.c:2428 merge-recursive.c:3271
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4668,14 +4776,14 @@
"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
"中，建議將其移動到 %5$s。"
-#: merge-ort.c:2569
+#: merge-ort.c:2584
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "
"%4$s。"
-#: merge-ort.c:2664
+#: merge-ort.c:2679
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4685,30 +4793,30 @@
"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"
"能會因此出現巢狀衝突標記。"
-#: merge-ort.c:2683 merge-ort.c:2707
+#: merge-ort.c:2698 merge-ort.c:2722
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"
-#: merge-ort.c:3182 merge-recursive.c:3008
+#: merge-ort.c:3212 merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr "不能讀取物件 %s"
-#: merge-ort.c:3185 merge-recursive.c:3011
+#: merge-ort.c:3215 merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr "物件 %s 不是一個資料物件"
-#: merge-ort.c:3613
+#: merge-ort.c:3644
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"
-#: merge-ort.c:3689
+#: merge-ort.c:3721
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4717,7 +4825,7 @@
"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"
"別記錄這兩方檔案。"
-#: merge-ort.c:3696
+#: merge-ort.c:3728
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4726,24 +4834,24 @@
"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"
"分別記錄這兩方檔案。"
-#: merge-ort.c:3796 merge-recursive.c:3087
+#: merge-ort.c:3819 merge-recursive.c:3101
msgid "content"
msgstr "內容"
-#: merge-ort.c:3798 merge-recursive.c:3091
+#: merge-ort.c:3821 merge-recursive.c:3105
msgid "add/add"
msgstr "新增/新增"
-#: merge-ort.c:3800 merge-recursive.c:3136
+#: merge-ort.c:3823 merge-recursive.c:3150
msgid "submodule"
msgstr "子模組"
-#: merge-ort.c:3802 merge-recursive.c:3137
+#: merge-ort.c:3825 merge-recursive.c:3151
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "衝突（%s）：合併衝突於 %s"
-#: merge-ort.c:3833
+#: merge-ort.c:3856
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4752,7 +4860,7 @@
"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
"上。"
-#: merge-ort.c:4120
+#: merge-ort.c:4152
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4762,12 +4870,12 @@
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4487
+#: merge-ort.c:4521
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "%s, %s, %s 樹的合併資訊收集失敗"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4776,103 +4884,103 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
msgid "Already up to date."
msgstr "已經是最新的。"
-#: merge-recursive.c:352
+#: merge-recursive.c:353
msgid "(bad commit)\n"
msgstr "（壞提交）\n"
-#: merge-recursive.c:375
+#: merge-recursive.c:381
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
-#: merge-recursive.c:384
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
-#: merge-recursive.c:872
+#: merge-recursive.c:881
#, c-format
msgid "failed to create path '%s'%s"
msgstr "建立路徑 '%s'%s 失敗"
-#: merge-recursive.c:883
+#: merge-recursive.c:892
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "刪除 %s 以便為子目錄留出空間\n"
-#: merge-recursive.c:897 merge-recursive.c:916
+#: merge-recursive.c:906 merge-recursive.c:925
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一個目錄/檔案衝突？"
-#: merge-recursive.c:906
+#: merge-recursive.c:915
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
-#: merge-recursive.c:947 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能讀取物件 %s '%s'"
-#: merge-recursive.c:952
+#: merge-recursive.c:961
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 應為資料物件"
-#: merge-recursive.c:977
+#: merge-recursive.c:986
#, c-format
msgid "failed to open '%s': %s"
msgstr "開啟 '%s' 失敗：%s"
-#: merge-recursive.c:988
+#: merge-recursive.c:997
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "建立符號連結 '%s' 失敗：%s"
-#: merge-recursive.c:993
+#: merge-recursive.c:1002
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何處理 %06o %s '%s'"
-#: merge-recursive.c:1223 merge-recursive.c:1235
+#: merge-recursive.c:1233 merge-recursive.c:1246
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模組 %s 快轉到如下提交："
-#: merge-recursive.c:1226 merge-recursive.c:1238
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快轉子模組 %s"
-#: merge-recursive.c:1261
+#: merge-recursive.c:1273
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1277
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "無法合併子模組 %s（非快轉）"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1278
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模組的一個可能的合併方案：\n"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1290
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "無法合併子模組 %s （發現多個合併）"
-#: merge-recursive.c:1420
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
-#: merge-recursive.c:1492
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4881,7 +4989,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1497
+#: merge-recursive.c:1511
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4890,7 +4998,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1504
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4899,7 +5007,7 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1523
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4908,41 +5016,41 @@
"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "rename"
msgstr "重新命名"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1558
msgid "renamed"
msgstr "重新命名"
-#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒絕遺失髒檔案 '%s'"
-#: merge-recursive.c:1605
+#: merge-recursive.c:1619
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
-#: merge-recursive.c:1663
+#: merge-recursive.c:1677
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
-#: merge-recursive.c:1694
+#: merge-recursive.c:1708
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1713
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
-#: merge-recursive.c:1726
+#: merge-recursive.c:1740
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4951,18 +5059,18 @@
"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1745
msgid " (left unresolved)"
msgstr " （留下未解決）"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1837
#, 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:2086
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4972,7 +5080,7 @@
"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
"多個其它目錄，沒有目錄包含大部分檔案。"
-#: merge-recursive.c:2220
+#: merge-recursive.c:2234
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4981,78 +5089,78 @@
"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
"命名目錄 %4$s->%5$s"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3075
+#: merge-recursive.c:3089
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3114
+#: merge-recursive.c:3128
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略過 %s（已經做過相同合併）"
-#: merge-recursive.c:3167
+#: merge-recursive.c:3181
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 為名新增"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3385
#, c-format
msgid "Removing %s"
msgstr "刪除 %s"
-#: merge-recursive.c:3394
+#: merge-recursive.c:3408
msgid "file/directory"
msgstr "檔案/目錄"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3413
msgid "directory/file"
msgstr "目錄/檔案"
-#: merge-recursive.c:3406
+#: merge-recursive.c:3420
#, 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:3415
+#: merge-recursive.c:3429
#, c-format
msgid "Adding %s"
msgstr "新增 %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3438
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "衝突（add/add）：合併衝突於 %s"
-#: merge-recursive.c:3477
+#: merge-recursive.c:3491
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "無法合併樹 %s 和 %s"
-#: merge-recursive.c:3571
+#: merge-recursive.c:3585
msgid "Merging:"
msgstr "合併："
-#: merge-recursive.c:3584
+#: merge-recursive.c:3598
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "發現 %u 個共同祖先："
-#: merge-recursive.c:3634
+#: merge-recursive.c:3648
msgid "merge returned no commit"
msgstr "合併未返回提交"
-#: merge-recursive.c:3799
+#: merge-recursive.c:3816
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析物件 '%s'"
-#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能寫入索引。"
@@ -5060,189 +5168,221 @@
msgid "failed to read the cache"
msgstr "讀取快取失敗"
-#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
-#: builtin/stash.c:267
+#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
+#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "無法寫新的索引檔案"
-#: midx.c:74
+#: midx.c:78
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的物件 ID fanout 大小錯誤"
-#: midx.c:105
+#: midx.c:109
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引檔案 %s 太小"
-#: midx.c:121
+#: midx.c:125
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
-#: midx.c:126
+#: midx.c:130
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被識別"
-#: midx.c:131
+#: midx.c:135
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名區塊"
-#: midx.c:150
+#: midx.c:154
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的物件 ID fanout 區塊"
-#: midx.c:152
+#: midx.c:156
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的物件 ID 查詢區塊"
-#: midx.c:154
+#: midx.c:158
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的物件位移區塊"
-#: midx.c:170
+#: midx.c:174
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
-#: midx.c:214
+#: midx.c:221
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
-#: midx.c:264
+#: midx.c:271
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
-#: midx.c:490
+#: midx.c:502
#, c-format
msgid "failed to add packfile '%s'"
msgstr "新增 packfile '%s' 失敗"
-#: midx.c:496
+#: midx.c:508
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "開啟包索引 '%s' 失敗"
-#: midx.c:564
+#: midx.c:576
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在 packfile 中定位物件 %d 失敗"
-#: midx.c:880 builtin/index-pack.c:1533
+#: midx.c:892
msgid "cannot store reverse index file"
msgstr "無法儲存倒排索引檔案"
-#: midx.c:920
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "無法解析橫列：%s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "橫列格式錯誤：%s"
+
+#: midx.c:1159
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略現有的多包索引：總和檢查碼不符"
-#: midx.c:943
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "無法載入包"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "無法開啟 %s 的索引"
+
+#: midx.c:1201
msgid "Adding packfiles to multi-pack-index"
msgstr "正在新增 packfile 至多包索引"
-#: midx.c:989
-#, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "沒有看到要捨棄的包檔案 %s"
-
-#: midx.c:1034
+#: midx.c:1244
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知偏好包：「%s」"
-#: midx.c:1039
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "無法選取偏好，沒有物件的 %s 包"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "沒有看到要捨棄的包檔案 %s"
+
+#: midx.c:1367
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "偏好包「%s」已經過期"
-#: midx.c:1055
+#: midx.c:1380
msgid "no pack files to index."
msgstr "沒有要索引的 pack 檔案。"
-#: midx.c:1135 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "無法寫入多包位圖"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: midx.c:1486 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "刪除 %s 失敗"
-#: midx.c:1166
+#: midx.c:1517
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位於 %s 的多包索引失敗"
-#: midx.c:1225
+#: midx.c:1577
msgid "multi-pack-index file exists, but failed to parse"
msgstr "有 multi-pack-index 檔案，但無法解析"
-#: midx.c:1233
+#: midx.c:1585
msgid "incorrect checksum"
msgstr "總和檢查碼不正確"
-#: midx.c:1236
+#: midx.c:1588
msgid "Looking for referenced packfiles"
msgstr "正在尋找引用的 packfile"
-#: midx.c:1251
+#: midx.c:1603
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1256
+#: midx.c:1608
msgid "the midx contains no oid"
msgstr "midx 沒有 oid"
-#: midx.c:1265
+#: midx.c:1617
msgid "Verifying OID order in multi-pack-index"
msgstr "正在驗證多包索引中的物件 ID 順序"
-#: midx.c:1274
+#: midx.c:1626
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1294
+#: midx.c:1646
msgid "Sorting objects by packfile"
msgstr "透過 packfile 為物件排序"
-#: midx.c:1301
+#: midx.c:1653
msgid "Verifying object offsets"
msgstr "正在驗證物件位移"
-#: midx.c:1317
+#: midx.c:1669
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "為 oid[%d] = %s 載入包條目失敗"
-#: midx.c:1323
+#: midx.c:1675
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "為 packfile %s 載入包索引失敗"
-#: midx.c:1332
+#: midx.c:1684
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1357
+#: midx.c:1709
msgid "Counting referenced objects"
msgstr "正在計算引用物件"
-#: midx.c:1367
+#: midx.c:1719
msgid "Finding and deleting unreferenced packfiles"
-msgstr "正在尋找並刪除沒有參考的 packfile"
+msgstr "正在尋找並刪除沒有引用的 packfile"
-#: midx.c:1558
+#: midx.c:1911
msgid "could not start pack-objects"
msgstr "不能開始 pack-objects"
-#: midx.c:1578
+#: midx.c:1931
msgid "could not finish pack-objects"
msgstr "不能結束 pack-objects"
@@ -5300,257 +5440,257 @@
msgid "Bad %s value: '%s'"
msgstr "壞的 %s 值：'%s'"
-#: object-file.c:526
+#: object-file.c:459
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
-#: object-file.c:584
+#: object-file.c:517
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "無法規範化備用物件路徑：%s"
-#: object-file.c:658
+#: object-file.c:591
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略備用物件庫，嵌套太深"
-#: object-file.c:665
+#: object-file.c:598
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "無法規範化物件目錄: %s"
-#: object-file.c:708
+#: object-file.c:641
msgid "unable to fdopen alternates lockfile"
msgstr "無法 fdopen 取代鎖檔案"
-#: object-file.c:726
+#: object-file.c:659
msgid "unable to read alternates file"
msgstr "無法讀取替代檔案"
-#: object-file.c:733
+#: object-file.c:666
msgid "unable to move new alternates file into place"
msgstr "無法將新的替代檔案移動到位"
-#: object-file.c:768
+#: object-file.c:701
#, c-format
msgid "path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: object-file.c:789
+#: object-file.c:722
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"
+msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
-#: object-file.c:795
+#: object-file.c:728
#, c-format
msgid "reference repository '%s' is not a local repository."
-msgstr "參考版本庫 '%s' 不是一個本機版本庫。"
+msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
-#: object-file.c:801
+#: object-file.c:734
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "參考版本庫 '%s' 是一個淺複製"
+msgstr "引用版本庫 '%s' 是一個淺複製"
-#: object-file.c:809
+#: object-file.c:742
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "參考版本庫 '%s' 已被移植"
+msgstr "引用版本庫 '%s' 已被移植"
-#: object-file.c:869
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找不到符合 %s 的物件目錄"
+
+#: object-file.c:823
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析備用引用時無效的行：%s"
-#: object-file.c:1019
+#: object-file.c:973
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
-#: object-file.c:1054
+#: object-file.c:1008
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失敗%s"
-#: object-file.c:1218
+#: object-file.c:1174
#, c-format
msgid "object file %s is empty"
msgstr "物件檔案 %s 為空"
-#: object-file.c:1353 object-file.c:2548
+#: object-file.c:1293 object-file.c:2499
#, c-format
msgid "corrupt loose object '%s'"
msgstr "損壞的鬆散物件 '%s'"
-#: object-file.c:1355 object-file.c:2552
+#: object-file.c:1295 object-file.c:2503
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "鬆散物件 '%s' 後面有垃圾資料"
-#: object-file.c:1397
-msgid "invalid object type"
-msgstr "無效的物件類型"
-
-#: object-file.c:1481
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
-
-#: object-file.c:1484
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "無法解開 %s 頭部"
-
-#: object-file.c:1490
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
-
-#: object-file.c:1493
+#: object-file.c:1417
#, c-format
msgid "unable to parse %s header"
msgstr "無法解析 %s 頭部"
-#: object-file.c:1717
+#: object-file.c:1419
+msgid "invalid object type"
+msgstr "無效的物件類型"
+
+#: object-file.c:1430
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "無法解開 %s 頭部"
+
+#: object-file.c:1434
+#, c-format
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的標頭過長，超出 %d 位元組"
+
+#: object-file.c:1664
#, c-format
msgid "failed to read object %s"
msgstr "讀取物件 %s 失敗"
-#: object-file.c:1721
+#: object-file.c:1668
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1725
+#: object-file.c:1672
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "鬆散物件 %s（儲存在 %s）已損壞"
-#: object-file.c:1729
+#: object-file.c:1676
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包物件 %s（儲存在 %s）已損壞"
-#: object-file.c:1834
+#: object-file.c:1781
#, c-format
msgid "unable to write file %s"
msgstr "無法寫檔案 %s"
-#: object-file.c:1841
+#: object-file.c:1788
#, c-format
msgid "unable to set permission to '%s'"
msgstr "無法為 '%s' 設定權限"
-#: object-file.c:1848
+#: object-file.c:1795
msgid "file write error"
msgstr "檔案寫錯誤"
-#: object-file.c:1868
+#: object-file.c:1815
msgid "error when closing loose object file"
msgstr "關閉鬆散物件檔案時發生錯誤"
-#: object-file.c:1933
+#: object-file.c:1882
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
-#: object-file.c:1935
+#: object-file.c:1884
msgid "unable to create temporary file"
msgstr "無法建立暫存檔"
-#: object-file.c:1959
+#: object-file.c:1908
msgid "unable to write loose object file"
msgstr "不能寫鬆散物件檔案"
-#: object-file.c:1965
+#: object-file.c:1914
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能壓縮新物件 %s（%d）"
-#: object-file.c:1969
+#: object-file.c:1918
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
-#: object-file.c:1973
+#: object-file.c:1922
#, c-format
msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不穩定物件源資料搞糊塗了"
+msgstr "被 %s 的不穩定物件來源資料混淆"
-#: object-file.c:1983 builtin/pack-objects.c:1237
+#: object-file.c:1933 builtin/pack-objects.c:1243
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上呼叫 utime() 失敗"
-#: object-file.c:2060
+#: object-file.c:2011
#, c-format
msgid "cannot read object for %s"
msgstr "不能讀取物件 %s"
-#: object-file.c:2111
+#: object-file.c:2062
msgid "corrupt commit"
msgstr "損壞的提交"
-#: object-file.c:2119
+#: object-file.c:2070
msgid "corrupt tag"
msgstr "損壞的標籤"
-#: object-file.c:2219
+#: object-file.c:2170
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 時讀取錯誤"
-#: object-file.c:2222
+#: object-file.c:2173
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 時讀入不完整"
-#: object-file.c:2295 object-file.c:2305
+#: object-file.c:2246 object-file.c:2256
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入資料庫失敗"
-#: object-file.c:2311
+#: object-file.c:2262
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支援的檔案類型"
-#: object-file.c:2335
+#: object-file.c:2286 builtin/fetch.c:1445
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一個有效的物件"
-#: object-file.c:2337
+#: object-file.c:2288
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一個有效的 '%s' 物件"
-#: object-file.c:2364 builtin/index-pack.c:192
+#: object-file.c:2315
#, c-format
msgid "unable to open %s"
msgstr "不能開啟 %s"
-#: object-file.c:2559 object-file.c:2612
+#: object-file.c:2510
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的雜湊值不符合（預期 %s）"
-#: object-file.c:2583
+#: object-file.c:2533
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2588
+#: object-file.c:2539
#, c-format
msgid "unable to unpack header of %s"
msgstr "無法解壓縮 %s 的頭部"
-#: object-file.c:2594
+#: object-file.c:2544
#, c-format
msgid "unable to parse header of %s"
msgstr "無法解析 %s 的頭部"
-#: object-file.c:2605
+#: object-file.c:2555
#, c-format
msgid "unable to unpack contents of %s"
msgstr "無法解壓縮 %s 的內容"
@@ -5677,12 +5817,25 @@
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
-#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包位圖缺少需要的反向索引"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：無法開啟包"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
#, c-format
msgid "unable to get disk usage of %s"
msgstr "無法取得 %s 的磁碟用量"
@@ -5712,45 +5865,45 @@
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
-#: pack-write.c:250
+#: pack-write.c:251
msgid "cannot both write and verify reverse index"
msgstr "無法同時寫入和驗證倒排索引"
-#: pack-write.c:271
+#: pack-write.c:270
#, c-format
msgid "could not stat: %s"
msgstr "無法 stat：%s"
-#: pack-write.c:283
+#: pack-write.c:282
#, c-format
msgid "failed to make %s readable"
msgstr "無法讓 %s 能夠寫入"
-#: pack-write.c:522
+#: pack-write.c:520
#, c-format
msgid "could not write '%s' promisor file"
msgstr "無法寫入「%s」promisor 檔案"
-#: packfile.c:625
+#: packfile.c:626
msgid "offset before end of packfile (broken .idx?)"
msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
-#: packfile.c:655
+#: packfile.c:656
#, c-format
msgid "packfile %s cannot be mapped%s"
msgstr "包檔案 %s 無法映射%s"
-#: packfile.c:1934
+#: packfile.c:1923
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
-#: packfile.c:1938
+#: packfile.c:1927
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "選項 `%s' 期望一個數字值"
@@ -5770,71 +5923,71 @@
msgid "malformed object name '%s'"
msgstr "格式錯誤的物件名 '%s'"
-#: parse-options.c:38
+#: parse-options.c:58
#, c-format
msgid "%s requires a value"
msgstr "%s 需要一個值"
-#: parse-options.c:73
+#: parse-options.c:93
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s 與 %s 不相容"
-#: parse-options.c:78
+#: parse-options.c:98
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s：和其它的不相容"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
-#: parse-options.c:94
+#: parse-options.c:114
#, c-format
msgid "%s isn't available"
msgstr "%s 不可用"
-#: parse-options.c:217
+#: parse-options.c:237
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"
-#: parse-options.c:386
+#: parse-options.c:393
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
#, c-format
msgid "alias of --%s"
msgstr "--%s 的別名"
-#: parse-options.c:879
+#: parse-options.c:891
#, c-format
msgid "unknown option `%s'"
msgstr "未知選項 `%s'"
-#: parse-options.c:881
+#: parse-options.c:893
#, c-format
msgid "unknown switch `%c'"
msgstr "未知開關 `%c'"
-#: parse-options.c:883
+#: parse-options.c:895
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字串中未知的非 ascii 字元選項：`%s'"
-#: parse-options.c:907
+#: parse-options.c:919
msgid "..."
msgstr "..."
-#: parse-options.c:926
+#: parse-options.c:933
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5842,98 +5995,122 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:932
+#: parse-options.c:948
#, c-format
msgid " or: %s"
msgstr " 或：%s"
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. function. The "%s" is a line in the (hopefully already
+#. translated) N_() usage string, which contained embedded
+#. newlines before we split it up.
+#.
+#: parse-options.c:969
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: parse-options.c:935
+#: parse-options.c:992
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:974
+#: parse-options.c:1039
msgid "-NUM"
msgstr "-數字"
-#: path.c:915
+#: path.c:922
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能設定 %s 為組可寫"
-#: pathspec.c:151
+#: pathspec.c:150
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"
-#: pathspec.c:169
+#: pathspec.c:168
msgid "Only one 'attr:' specification is allowed."
msgstr "只允許一個 'attr:' 規格。"
-#: pathspec.c:172
+#: pathspec.c:171
msgid "attr spec must not be empty"
msgstr "屬性規格不能為空"
-#: pathspec.c:215
+#: pathspec.c:214
#, c-format
msgid "invalid attribute name %s"
msgstr "無效的屬性名 %s"
-#: pathspec.c:280
+#: pathspec.c:279
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"
-#: pathspec.c:287
+#: pathspec.c:286
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"
-#: pathspec.c:327
+#: pathspec.c:326
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路徑規格包含無效的神奇前綴"
-#: pathspec.c:348
+#: pathspec.c:347
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"
-#: pathspec.c:353
+#: pathspec.c:352
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"
-#: pathspec.c:391
+#: pathspec.c:390
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
-#: pathspec.c:450
+#: pathspec.c:449
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不相容"
-#: pathspec.c:466
+#: pathspec.c:465
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
-#: pathspec.c:542
+#: pathspec.c:541
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助記符：'%c'）"
-#: pathspec.c:552
+#: pathspec.c:551
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
-#: pathspec.c:619
+#: pathspec.c:618
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路徑規格 '%s' 位於符號連結中"
-#: pathspec.c:664
+#: pathspec.c:663
#, c-format
msgid "line is badly quoted: %s"
msgstr "某行不應該被括號括住：%s"
@@ -5954,7 +6131,7 @@
msgid "flush packet write failed"
msgstr "flush 包寫錯誤"
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
msgid "protocol error: impossibly long line"
msgstr "協定錯誤：不可能的長行"
@@ -5962,7 +6139,7 @@
msgid "packet write with format failed"
msgstr "格式化包寫入錯誤"
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
msgid "packet write failed - data exceeds max packet size"
msgstr "寫封包失敗：資料超過了包的最大長度"
@@ -5971,25 +6148,25 @@
msgid "packet write failed: %s"
msgstr "封包寫入失敗：%s"
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
msgid "read error"
msgstr "讀取錯誤"
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
msgid "the remote end hung up unexpectedly"
msgstr "遠端意外掛斷了"
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "協定錯誤：錯誤的行長度字串：%.4s"
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
#, c-format
msgid "protocol error: bad line length %d"
msgstr "協定錯誤：錯誤的行長度 %d"
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "遠端錯誤：%s"
@@ -6003,7 +6180,7 @@
msgid "unable to create threaded lstat: %s"
msgstr "無法建立執行緒 lstat：%s"
-#: pretty.c:988
+#: pretty.c:1051
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
@@ -6032,32 +6209,32 @@
msgid "Removing duplicate objects"
msgstr "正在刪除重複物件"
-#: range-diff.c:78
+#: range-diff.c:67
msgid "could not start `log`"
msgstr "不能啟動 `log`"
-#: range-diff.c:80
+#: range-diff.c:69
msgid "could not read `log` output"
msgstr "不能讀取 `log` 的輸出"
-#: range-diff.c:101 sequencer.c:5550
+#: range-diff.c:97 sequencer.c:5605
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:115
+#: range-diff.c:111
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
-#: range-diff.c:140
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "無法解析 git 頭 '%.*s'"
-#: range-diff.c:307
+#: range-diff.c:304
msgid "failed to generate diff"
msgstr "生成 diff 失敗"
@@ -6084,7 +6261,7 @@
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"
-#: read-cache.c:753
+#: read-cache.c:753 builtin/submodule--helper.c:3241
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 沒有簽出一個提交"
@@ -6104,16 +6281,16 @@
msgid "unable to stat '%s'"
msgstr "無法對 %s 執行 stat"
-#: read-cache.c:1358
+#: read-cache.c:1373
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起來既是檔案又是目錄"
-#: read-cache.c:1573
+#: read-cache.c:1588
msgid "Refresh index"
msgstr "重新整理索引"
-#: read-cache.c:1705
+#: read-cache.c:1720
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6122,7 +6299,7 @@
"設定了 index.version，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1715
+#: read-cache.c:1730
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6131,144 +6308,144 @@
"設定了 GIT_INDEX_VERSION，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1771
+#: read-cache.c:1786
#, c-format
msgid "bad signature 0x%08x"
msgstr "壞的簽名 0x%08x"
-#: read-cache.c:1774
+#: read-cache.c:1789
#, c-format
msgid "bad index version %d"
msgstr "壞的索引版本 %d"
-#: read-cache.c:1783
+#: read-cache.c:1798
msgid "bad index file sha1 signature"
msgstr "壞的索引檔案 sha1 簽名"
-#: read-cache.c:1817
+#: read-cache.c:1832
#, c-format
msgid "index uses %.4s extension, which we do not understand"
-msgstr "索引使用不被支援的 %.4s 擴展"
+msgstr "索引使用不被支援的 %.4s 副檔名"
#
-#: read-cache.c:1819
+#: read-cache.c:1834
#, c-format
msgid "ignoring %.4s extension"
-msgstr "忽略 %.4s 擴展"
+msgstr "忽略 %.4s 副檔名"
-#: read-cache.c:1856
+#: read-cache.c:1871
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引條目格式 0x%08x"
-#: read-cache.c:1872
+#: read-cache.c:1887
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
-#: read-cache.c:1929
+#: read-cache.c:1944
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暫存條目"
-#: read-cache.c:1932
+#: read-cache.c:1947
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合併檔案 '%s' 有多個暫存條目"
-#: read-cache.c:1935
+#: read-cache.c:1950
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暫存條目"
-#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:333
+#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
+#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
msgid "index file corrupt"
msgstr "索引檔案損壞"
-#: read-cache.c:2185
+#: read-cache.c:2209
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "無法建立 load_cache_entries 執行緒：%s"
-#: read-cache.c:2198
+#: read-cache.c:2222
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "無法加入 load_cache_entries 執行緒：%s"
-#: read-cache.c:2231
+#: read-cache.c:2255
#, c-format
msgid "%s: index file open failed"
msgstr "%s：開啟索引檔案失敗"
-#: read-cache.c:2235
+#: read-cache.c:2259
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能對開啟的索引執行 stat 動作"
-#: read-cache.c:2239
+#: read-cache.c:2263
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引檔案比預期的小"
-#: read-cache.c:2243
+#: read-cache.c:2267
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s：無法 map 索引檔案%s"
-#: read-cache.c:2286
+#: read-cache.c:2310
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "無法建立 load_index_extensions 執行緒：%s"
-#: read-cache.c:2313
+#: read-cache.c:2337
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "無法加入 load_index_extensions 執行緒：%s"
-#: read-cache.c:2351
+#: read-cache.c:2375
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "無法重新整理共享索引 '%s'"
-#: read-cache.c:2398
+#: read-cache.c:2434
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
-#: read-cache.c:3075
+#: read-cache.c:3108
msgid "failed to convert to a sparse-index"
msgstr "無法轉換成稀疏索引"
-#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3179
#, c-format
msgid "could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: read-cache.c:3159
+#: read-cache.c:3192
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能開啟 git 目錄：%s"
-#: read-cache.c:3171
+#: read-cache.c:3204
#, c-format
msgid "unable to unlink: %s"
msgstr "無法刪除：%s"
-#: read-cache.c:3200
+#: read-cache.c:3233
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修復 '%s' 的權限位"
-#: read-cache.c:3349
+#: read-cache.c:3390
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暫存區 #0"
@@ -6339,7 +6516,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6347,7 +6524,7 @@
"\n"
"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6355,7 +6532,7 @@
"\n"
"如果您在這裡刪除一行，對應的提交將會遺失。\n"
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6369,7 +6546,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -6379,14 +6556,14 @@
"然而，如果您刪除全部內容，重定基底動作將會終止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
-#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
+#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: builtin/rebase.c:190
#, c-format
msgid "could not write '%s'"
msgstr "不能寫入 '%s'"
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
#, c-format
msgid "could not write '%s'."
msgstr "不能寫入 '%s'。"
@@ -6416,12 +6593,10 @@
"可選值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
#, c-format
-msgid "could not read '%s'."
-msgstr "不能讀取 '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：「preserve」已經改成「merges」"
#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
@@ -6442,257 +6617,277 @@
msgid "ahead %d, behind %d"
msgstr "領先 %d，落後 %d"
-#: ref-filter.c:230
+#: ref-filter.c:235
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<顏色>)"
-#: ref-filter.c:232
+#: ref-filter.c:237
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "無法識別的顏色：%%(color:%s)"
-#: ref-filter.c:254
+#: ref-filter.c:259
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整數值 refname:lstrip=%s"
-#: ref-filter.c:258
+#: ref-filter.c:263
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整數值 refname:rstrip=%s"
-#: ref-filter.c:260
+#: ref-filter.c:265
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "無法識別的 %%(%s) 參數：%s"
-#: ref-filter.c:315
+#: ref-filter.c:320
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不帶參數"
-#: ref-filter.c:339
+#: ref-filter.c:344
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "無法識別的 %%(objectsize) 參數：%s"
-#: ref-filter.c:347
+#: ref-filter.c:352
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不帶參數"
-#: ref-filter.c:359
+#: ref-filter.c:364
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不帶參數"
-#: ref-filter.c:372
+#: ref-filter.c:377
#, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "無法識別的 %%(subject) 引數：%s"
-#: ref-filter.c:391
+#: ref-filter.c:396
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr "預期是 %%(trailers:key=<value>)"
-#: ref-filter.c:393
+#: ref-filter.c:398
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 參數：%s"
-#: ref-filter.c:424
+#: ref-filter.c:429
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一個正數 contents:lines=%s"
-#: ref-filter.c:426
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "無法識別的 %%(contents) 參數：%s"
-#: ref-filter.c:441
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "無法識別的 %%(raw) 引數：%s"
+
+#: ref-filter.c:458
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
-#: ref-filter.c:445
+#: ref-filter.c:462
#, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"
-#: ref-filter.c:459
+#: ref-filter.c:476
#, c-format
msgid "unrecognized email option: %s"
msgstr "無法識別的 email 選項：%s"
-#: ref-filter.c:489
+#: ref-filter.c:506
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<寬度>,<位置>)"
-#: ref-filter.c:501
+#: ref-filter.c:518
#, c-format
msgid "unrecognized position:%s"
msgstr "無法識別的位置：%s"
-#: ref-filter.c:508
+#: ref-filter.c:525
#, c-format
msgid "unrecognized width:%s"
msgstr "無法識別的寬度：%s"
-#: ref-filter.c:517
+#: ref-filter.c:534
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "無法識別的 %%(align) 參數：%s"
-#: ref-filter.c:525
+#: ref-filter.c:542
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一個正數的寬度"
-#: ref-filter.c:543
+#: ref-filter.c:560
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "無法識別的 %%(if) 參數：%s"
-#: ref-filter.c:645
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 未取引數"
+
+#: ref-filter.c:680
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式錯誤的欄位名：%.*s"
-#: ref-filter.c:672
+#: ref-filter.c:707
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的欄位名：%.*s"
-#: ref-filter.c:676
+#: ref-filter.c:711
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"
-#: ref-filter.c:801
+#: ref-filter.c:844
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"
-#: ref-filter.c:865
+#: ref-filter.c:910
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"
-#: ref-filter.c:867
+#: ref-filter.c:912
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:869
+#: ref-filter.c:914
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之後"
-#: ref-filter.c:897
+#: ref-filter.c:946
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"
-#: ref-filter.c:899
+#: ref-filter.c:948
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"
-#: ref-filter.c:901
+#: ref-filter.c:950
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:916
+#: ref-filter.c:965
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
-#: ref-filter.c:973
+#: ref-filter.c:1027
#, c-format
msgid "malformed format string %s"
msgstr "錯誤的格式化字串 %s"
-#: ref-filter.c:1621
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "本命令拒絕 atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
+
+#: ref-filter.c:1706
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（無分支，重定 %s 的基底）"
-#: ref-filter.c:1624
+#: ref-filter.c:1709
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "（無分支，重定 %s 分離開頭指標的基底）"
-#: ref-filter.c:1627
+#: ref-filter.c:1712
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（無分支，二分搜尋從 %s 開始）"
-#: ref-filter.c:1631
+#: ref-filter.c:1716
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（開頭指標分離於 %s）"
-#: ref-filter.c:1634
+#: ref-filter.c:1719
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（開頭指標分離自 %s）"
-#: ref-filter.c:1637
+#: ref-filter.c:1722
msgid "(no branch)"
msgstr "（無分支）"
-#: ref-filter.c:1669 ref-filter.c:1880
+#: ref-filter.c:1754 ref-filter.c:1972
#, c-format
msgid "missing object %s for %s"
msgstr "缺少 %2$s 的物件 %1$s"
-#: ref-filter.c:1679
+#: ref-filter.c:1764
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-#: ref-filter.c:2064
+#: ref-filter.c:2155
#, c-format
msgid "malformed object at '%s'"
msgstr "格式錯誤的物件 '%s'"
-#: ref-filter.c:2153
+#: ref-filter.c:2245
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略帶有錯誤名稱 %s 的引用"
-#: ref-filter.c:2158 refs.c:676
+#: ref-filter.c:2250 refs.c:673
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略損壞的引用 %s"
-#: ref-filter.c:2502
+#: ref-filter.c:2623
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2596
+#: ref-filter.c:2726
#, c-format
msgid "malformed object name %s"
msgstr "格式錯誤的物件名 %s"
-#: ref-filter.c:2601
+#: ref-filter.c:2731
#, c-format
msgid "option `%s' must point to a commit"
msgstr "選項 `%s' 必須指向一個提交"
-#: refs.c:264
+#: refs.c:261
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 沒有指向一個有效的物件！"
-#: refs.c:566
+#: refs.c:563
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6717,81 +6912,81 @@
"\n"
"\tgit branch -m <name>\n"
-#: refs.c:588
+#: refs.c:585
#, c-format
msgid "could not retrieve `%s`"
msgstr "無法擷取「%s」"
-#: refs.c:598
+#: refs.c:595
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "分支名稱無效：%s = %s"
-#: refs.c:674
+#: refs.c:671
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略懸空符號引用 %s"
-#: refs.c:922
+#: refs.c:920
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日誌在 %s 之後有缺口"
-#: refs.c:929
+#: refs.c:927
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日誌意外終止於 %s"
-#: refs.c:994
+#: refs.c:992
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日誌為空"
-#: refs.c:1086
+#: refs.c:1084
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-#: refs.c:1157
+#: refs.c:1155
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
-#: refs.c:2051
+#: refs.c:2062
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允許對引用 '%s' 多次更新"
-#: refs.c:2131
+#: refs.c:2142
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔離環境中禁止更新引用"
-#: refs.c:2142
+#: refs.c:2153
msgid "ref updates aborted by hook"
msgstr "引用更新被掛鉤拒絕"
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，無法建立 '%s'"
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "無法同時處理 '%s' 和 '%s'"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
#, c-format
msgid "could not remove reference %s"
msgstr "無法刪除引用 %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "無法刪除引用 %s：%s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "無法刪除引用：%s"
@@ -6799,7 +6994,7 @@
#: refspec.c:170
#, c-format
msgid "invalid refspec '%s'"
-msgstr "無效的引用表達式：'%s'"
+msgstr "無效的引用規格：「%s」"
#: remote.c:351
#, c-format
@@ -6842,12 +7037,12 @@
#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
-msgstr "源引用表達式 %s 沒有符合"
+msgstr "來源引用規格 %s 沒有符合項目"
#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
-msgstr "源引用表達式 %s 符合超過一個"
+msgstr "來源引用規格 %s 符合超過一個"
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
@@ -6866,14 +7061,14 @@
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-"您提供的目標不是一個完整的引用名稱（即以 \"refs/\" 開頭）。我們\n"
-"試著猜測您的想法：\n"
+"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n"
+"我們覺得您可能想要：\n"
"\n"
-"- 在遠端查詢和 '%s' 符合的引用。\n"
-"- 檢查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
-" 引用。如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
+"- 在遠端查詢符合「%s」的引用。\n"
+"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n"
+" 如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"
"\n"
-"都不行，所以我們已放棄。您必須給出完整的引用。"
+"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"
#: remote.c:1123
#, c-format
@@ -6882,8 +7077,9 @@
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
-"'%s:refs/heads/%s' 推送嗎？"
+"引用規格的 <src> 是個提交物件。\n"
+"您是想透過推送至「%s:refs/heads/%s」\n"
+"來建立新分支嗎？"
#: remote.c:1128
#, c-format
@@ -6892,8 +7088,9 @@
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個標籤物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"來建立新標籤嗎？"
#: remote.c:1133
#, c-format
@@ -6902,8 +7099,9 @@
"Did you mean to tag a new tree by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個樹狀物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新樹狀物件貼上標籤嗎？"
#: remote.c:1138
#, c-format
@@ -6912,8 +7110,9 @@
"Did you mean to tag a new blob by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
-"引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
-"'%s:refs/tags/%s' 推送嗎？"
+"引用規格的 <src> 是個資料 (blob) 物件。\n"
+"您是想透過推送至「%s:refs/tags/%s」\n"
+"為新資料物件貼上標籤嗎？"
#: remote.c:1174
#, c-format
@@ -6928,12 +7127,12 @@
#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
-msgstr "目標引用表達式 %s 符合超過一個"
+msgstr "目的地引用規格 %s 符合超過一個"
#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
-msgstr "目標引用 %s 接收超過一個源"
+msgstr "目的地引用 %s 接收超過一個來源"
#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
@@ -6957,7 +7156,7 @@
#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
+msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"
#: remote.c:1769
#, c-format
@@ -6971,11 +7170,11 @@
#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
-msgstr "推送無目標（push.default 是 'nothing'）"
+msgstr "推送沒有目的地（push.default 是 'nothing'）"
#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
-msgstr "無法解析 'simple' 推送至一個單獨的目標"
+msgstr "無法解析 'simple' 推送至單獨目的地"
#: remote.c:1943
#, c-format
@@ -7083,7 +7282,7 @@
msgid "there were errors while writing '%s' (%s)"
msgstr "寫入 '%s' (%s) 時發生錯誤"
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
#, c-format
msgid "failed to flush '%s'"
msgstr "重新整理 '%s' 失敗"
@@ -7128,8 +7327,8 @@
msgid "Recorded preimage for '%s'"
msgstr "為 '%s' 記錄 preimage"
-#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
#, c-format
msgid "could not create directory '%s'"
msgstr "不能建立目錄 '%s'"
@@ -7167,46 +7366,41 @@
msgid "could not determine HEAD revision"
msgstr "不能確定 HEAD 版本"
-#: reset.c:69 reset.c:75 sequencer.c:3689
+#: reset.c:70 reset.c:76 sequencer.c:3705
#, c-format
msgid "failed to find tree of %s"
msgstr "無法找到 %s 指向的樹"
-#: revision.c:2344
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input 與 --no-walk 不相容"
+
+#: revision.c:2346
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> 已不受支援"
-#: revision.c:2684
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk 與 --unsorted-input 不相容"
+
+#: revision.c:2690
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
-#: revision.c:2687
+#: revision.c:2693
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的目前分支 '%s' 尚無任何提交"
-#: revision.c:2893
+#: revision.c:2895
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
-#: run-command.c:766
-msgid "open /dev/null failed"
-msgstr "不能開啟 /dev/null"
-
-#: run-command.c:1274
+#: run-command.c:1278
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能建立 async 執行緒：%s"
-#: run-command.c:1344
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
-"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
-
#: send-pack.c:150
msgid "unexpected flush packet while reading remote unpack status"
msgstr "讀取遠端解包狀態時收到意外的 flush 包"
@@ -7225,69 +7419,70 @@
msgid "failed to sign the push certificate"
msgstr "為推送證書籤名失敗"
-#: send-pack.c:433
+#: send-pack.c:435
msgid "send-pack: unable to fork off fetch subprocess"
msgstr "send-pack：無法 fork 一個 fetch 子處理程序"
-#: send-pack.c:455
+#: send-pack.c:457
msgid "push negotiation failed; proceeding anyway with push"
msgstr "push 協商失敗。繼續使用 push 處理"
-#: send-pack.c:526
+#: send-pack.c:528
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "接收端不支援此版本庫的雜湊算法"
-#: send-pack.c:535
+#: send-pack.c:537
msgid "the receiving end does not support --signed push"
msgstr "接收端不支援 --signed 推送"
-#: send-pack.c:537
+#: send-pack.c:539
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未傳送推送證書，因為接收端不支援 --signed 推送"
-#: send-pack.c:544
+#: send-pack.c:546
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支援 --atomic 推送"
-#: send-pack.c:549
+#: send-pack.c:551
msgid "the receiving end does not support push options"
msgstr "接收端不支援推送選項"
-#: sequencer.c:196
+#: sequencer.c:197
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "無效的提交說明清理模式 '%s'"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "could not delete '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
#, c-format
msgid "could not remove '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:354
+#: sequencer.c:355
msgid "revert"
msgstr "復原"
-#: sequencer.c:356
+#: sequencer.c:357
msgid "cherry-pick"
msgstr "摘取"
-#: sequencer.c:358
+#: sequencer.c:359
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:360
+#: sequencer.c:361
#, c-format
msgid "unknown action: %d"
msgstr "未知動作：%d"
-#: sequencer.c:419
+#: sequencer.c:420
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -7295,52 +7490,75 @@
"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
"指令標記修正後的檔案"
-#: sequencer.c:422
+#: sequencer.c:423
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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
msgstr ""
-"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
-"對修正後的檔案做標記，然後用 'git commit' 提交"
+"解決衝突後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，再執行\n"
+"\"git cherry-pick --continue\"。\n"
+"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n"
+"若要取消並返回 \"git cherry-pick\" 前的狀態，\n"
+"請執行 \"git cherry-pick --abort\"。"
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解決衝突後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，再執行\n"
+"\"git revert --continue\"。\n"
+"亦可以使用 \"git revert --skip\" 略過提交。\n"
+"若要取消並返回 \"git revert\" 前的狀態，\n"
+"請執行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3290
#, c-format
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
#, c-format
msgid "could not write to '%s'"
msgstr "不能寫入 '%s'"
-#: sequencer.c:442
+#: sequencer.c:455
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能將換行符號寫入 '%s'"
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3555
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
#, c-format
msgid "failed to finalize '%s'"
msgstr "無法完成 '%s'"
-#: sequencer.c:486
+#: sequencer.c:499
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本機修改將被%s覆蓋。"
-#: sequencer.c:490
+#: sequencer.c:503
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或儲藏後再繼續。"
-#: sequencer.c:522
+#: sequencer.c:535
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快轉"
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "無效的清理模式 %s"
@@ -7348,65 +7566,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:671
+#: sequencer.c:685
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：無法寫入新索引檔案"
-#: sequencer.c:685
+#: sequencer.c:699
msgid "unable to update cache tree"
msgstr "不能更新快取樹"
-#: sequencer.c:699
+#: sequencer.c:713
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:779
+#: sequencer.c:793
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中沒有 key"
-#: sequencer.c:790
+#: sequencer.c:804
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "無法為 '%s' 的值去引號"
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
#, c-format
msgid "could not open '%s' for reading"
msgstr "無法開啟 '%s' 進行讀取"
-#: sequencer.c:837
+#: sequencer.c:851
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已經給出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:842
+#: sequencer.c:856
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:847
+#: sequencer.c:861
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已經給出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:851
+#: sequencer.c:865
#, c-format
msgid "unknown variable '%s'"
msgstr "未知變數 '%s'"
-#: sequencer.c:856
+#: sequencer.c:870
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:858
+#: sequencer.c:872
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:860
+#: sequencer.c:874
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:925
+#: sequencer.c:939
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -7435,11 +7653,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1212
+#: sequencer.c:1229
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 掛鉤失敗"
-#: sequencer.c:1218
+#: sequencer.c:1235
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7453,17 +7671,17 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"
-"與否。您可以對其進行設定以免再出現本提示訊息。執行如下指令在編輯器\n"
-"中編輯您的設定檔案：\n"
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n"
+"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n"
"\n"
" git config --global --edit\n"
"\n"
-"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n"
+"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1231
+#: sequencer.c:1248
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7476,354 +7694,359 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"
-"與否。您可以對其進行設定以免再出現本提示訊息：\n"
+"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n"
+"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
-"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n"
+"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1273
+#: sequencer.c:1290
msgid "couldn't look up newly created commit"
msgstr "無法找到新建立的提交"
-#: sequencer.c:1275
+#: sequencer.c:1292
msgid "could not parse newly created commit"
msgstr "不能解析新建立的提交"
-#: sequencer.c:1321
+#: sequencer.c:1338
msgid "unable to resolve HEAD after creating commit"
msgstr "建立提交後，不能解析 HEAD"
-#: sequencer.c:1323
+#: sequencer.c:1340
msgid "detached HEAD"
msgstr "分離 HEAD"
# 譯者：中文字串拼接，可刪除前導空格
-#: sequencer.c:1327
+#: sequencer.c:1344
msgid " (root-commit)"
msgstr " (根提交)"
-#: sequencer.c:1348
+#: sequencer.c:1365
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1350
+#: sequencer.c:1367
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一個提交！"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 無法寫入樹狀物件"
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能從 '%s' 讀取提交說明"
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
#, c-format
msgid "invalid author identity '%s'"
msgstr "無效的作者身分 '%s'"
-#: sequencer.c:1491
+#: sequencer.c:1508
msgid "corrupt author: missing date information"
msgstr "作者資訊損壞：缺少日期資訊"
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
-#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
+#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "寫提交物件失敗"
-#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1606
+#: sequencer.c:1623
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1611
+#: sequencer.c:1628
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
#, c-format
msgid "unknown command: %d"
msgstr "未知指令：%d"
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
msgid "This is the 1st commit message:"
msgstr "這是第一個提交說明："
-#: sequencer.c:1737
+#: sequencer.c:1754
#, c-format
msgid "This is the commit message #%d:"
msgstr "這是提交說明 #%d："
-#: sequencer.c:1738
+#: sequencer.c:1755
msgid "The 1st commit message will be skipped:"
msgstr "略過第 1 個提交說明："
-#: sequencer.c:1739
+#: sequencer.c:1756
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "略過第 %d 個提交說明："
-#: sequencer.c:1740
+#: sequencer.c:1757
#, c-format
msgid "This is a combination of %d commits."
msgstr "這是整合 %d 個提交的集合提交。"
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
#, c-format
msgid "cannot write '%s'"
msgstr "不能寫 '%s'"
-#: sequencer.c:1934
+#: sequencer.c:1951
msgid "need a HEAD to fixup"
msgstr "需要一個 HEAD 來修復"
-#: sequencer.c:1936 sequencer.c:3582
+#: sequencer.c:1953 sequencer.c:3601
msgid "could not read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:1938
+#: sequencer.c:1955
msgid "could not read HEAD's commit message"
msgstr "不能讀取 HEAD 的提交說明"
-#: sequencer.c:1962
+#: sequencer.c:1979
#, c-format
msgid "could not read commit message of %s"
msgstr "不能讀取 %s 的提交說明"
-#: sequencer.c:2072
+#: sequencer.c:2089
msgid "your index file is unmerged."
msgstr "您的索引檔案未完成合併。"
-#: sequencer.c:2079
+#: sequencer.c:2096
msgid "cannot fixup root commit"
msgstr "不能修復根提交"
-#: sequencer.c:2098
+#: sequencer.c:2115
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 沒有第 %d 個父提交"
-#: sequencer.c:2120
+#: sequencer.c:2137
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交說明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:2205
+#: sequencer.c:2222
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能將 '%s' 重新命名為 '%s'"
-#: sequencer.c:2265
+#: sequencer.c:2282
#, c-format
msgid "could not revert %s... %s"
msgstr "不能還原 %s... %s"
-#: sequencer.c:2266
+#: sequencer.c:2283
#, c-format
msgid "could not apply %s... %s"
msgstr "不能套用 %s... %s"
-#: sequencer.c:2287
+#: sequencer.c:2304
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-#: sequencer.c:2345
+#: sequencer.c:2362
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：無法讀取索引"
-#: sequencer.c:2352
+#: sequencer.c:2370
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：無法重新整理索引"
-#: sequencer.c:2425
+#: sequencer.c:2450
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受參數：'%s'"
-#: sequencer.c:2434
+#: sequencer.c:2459
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的參數"
-#: sequencer.c:2477
+#: sequencer.c:2502
#, c-format
msgid "could not parse '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:2538
+#: sequencer.c:2563
#, c-format
msgid "invalid line %d: %.*s"
msgstr "無效行 %d：%.*s"
-#: sequencer.c:2549
+#: sequencer.c:2574
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "沒有父提交的情況下不能 '%s'"
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能讀取 '%s'。"
+
+#: sequencer.c:2660
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一個進行中的揀選"
-#: sequencer.c:2644
+#: sequencer.c:2669
msgid "cancelling a revert in progress"
msgstr "正在取消一個進行中的還原"
-#: sequencer.c:2690
+#: sequencer.c:2709
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "請用 'git rebase --edit-todo' 來修改。"
-#: sequencer.c:2692
+#: sequencer.c:2711
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清單：'%s'"
-#: sequencer.c:2697
+#: sequencer.c:2716
msgid "no commits parsed."
msgstr "沒有解析提交。"
-#: sequencer.c:2708
+#: sequencer.c:2727
msgid "cannot cherry-pick during a revert."
msgstr "不能在還原提交中執行揀選。"
-#: sequencer.c:2710
+#: sequencer.c:2729
msgid "cannot revert during a cherry-pick."
msgstr "不能在揀選中執行還原提交。"
-#: sequencer.c:2788
+#: sequencer.c:2807
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值無效：%s"
-#: sequencer.c:2897
+#: sequencer.c:2916
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2917
+#: sequencer.c:2936
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式錯誤的選項清單：'%s'"
-#: sequencer.c:3012 sequencer.c:4868
+#: sequencer.c:3031 sequencer.c:4905
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3029
+#: sequencer.c:3048
msgid "revert is already in progress"
msgstr "一個還原動作已在進行"
-#: sequencer.c:3031
+#: sequencer.c:3050
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3034
+#: sequencer.c:3053
msgid "cherry-pick is already in progress"
msgstr "揀選動作已在進行"
-#: sequencer.c:3036
+#: sequencer.c:3055
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3050
+#: sequencer.c:3069
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c:3065
+#: sequencer.c:3084
msgid "could not lock HEAD"
msgstr "不能鎖定 HEAD"
-#: sequencer.c:3125 sequencer.c:4581
+#: sequencer.c:3144 sequencer.c:4615
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
msgid "cannot abort from a branch yet to be born"
msgstr "不能從尚未建立的分支終止"
-#: sequencer.c:3159 builtin/grep.c:758
+#: sequencer.c:3178 builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "不能開啟 '%s'"
-#: sequencer.c:3161
+#: sequencer.c:3180
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能讀取 '%s'：%s"
-#: sequencer.c:3162
+#: sequencer.c:3181
msgid "unexpected end of file"
msgstr "意外的檔案結束"
-#: sequencer.c:3168
+#: sequencer.c:3187
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-#: sequencer.c:3179
+#: sequencer.c:3198
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
-#: sequencer.c:3220
+#: sequencer.c:3239
msgid "no revert in progress"
msgstr "沒有正在進行的還原"
-#: sequencer.c:3229
+#: sequencer.c:3248
msgid "no cherry-pick in progress"
msgstr "沒有正在進行的揀選"
-#: sequencer.c:3239
+#: sequencer.c:3258
msgid "failed to skip the commit"
msgstr "無法略過這個提交"
-#: sequencer.c:3246
+#: sequencer.c:3265
msgid "there is nothing to skip"
msgstr "沒有要略過的"
-#: sequencer.c:3249
+#: sequencer.c:3268
#, c-format
msgid ""
"have you committed already?\n"
@@ -7832,16 +8055,16 @@
"您已經提交了嗎？\n"
"試試 \"git %s --continue\""
-#: sequencer.c:3411 sequencer.c:4472
+#: sequencer.c:3430 sequencer.c:4506
msgid "cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:3428
+#: sequencer.c:3447
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: sequencer.c:3436
+#: sequencer.c:3455
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7860,28 +8083,28 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3446
+#: sequencer.c:3465
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能套用 %s... %.*s"
-#: sequencer.c:3453
+#: sequencer.c:3472
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合併 %.*s"
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
-#: sequencer.c:3483
+#: sequencer.c:3502
#, c-format
msgid "Executing: %s\n"
msgstr "執行：%s\n"
# 譯者：請維持前導空格
-#: sequencer.c:3498
+#: sequencer.c:3517
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7896,11 +8119,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3504
+#: sequencer.c:3523
msgid "and made changes to the index and/or the working tree\n"
msgstr "並且修改索引和/或工作區\n"
-#: sequencer.c:3510
+#: sequencer.c:3529
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7917,90 +8140,90 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3572
+#: sequencer.c:3591
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的標籤名稱：'%.*s'"
-#: sequencer.c:3645
+#: sequencer.c:3664
msgid "writing fake root commit"
msgstr "寫偽根提交"
-#: sequencer.c:3650
+#: sequencer.c:3669
msgid "writing squash-onto"
msgstr "寫入 squash-onto"
-#: sequencer.c:3734
+#: sequencer.c:3748
#, c-format
msgid "could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:3767
+#: sequencer.c:3780
msgid "cannot merge without a current revision"
msgstr "沒有目前版本不能合併"
-#: sequencer.c:3789
+#: sequencer.c:3802
#, c-format
msgid "unable to parse '%.*s'"
msgstr "無法解析 '%.*s'"
-#: sequencer.c:3798
+#: sequencer.c:3811
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "無可用合併：'%.*s'"
-#: sequencer.c:3810
+#: sequencer.c:3823
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章魚合並不能在一個新的根提交上執行"
-#: sequencer.c:3826
+#: sequencer.c:3878
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能取得 '%s' 的提交說明"
-#: sequencer.c:4009
+#: sequencer.c:4024
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能嘗試合併 '%.*s'"
-#: sequencer.c:4025
+#: sequencer.c:4040
msgid "merge: Unable to write new index file"
msgstr "合併：無法寫入新索引檔案"
-#: sequencer.c:4099
+#: sequencer.c:4121
msgid "Cannot autostash"
msgstr "無法 autostash"
-#: sequencer.c:4102
+#: sequencer.c:4124
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 回應：'%s'"
-#: sequencer.c:4108
+#: sequencer.c:4130
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能為 '%s' 建立目錄"
-#: sequencer.c:4111
+#: sequencer.c:4133
#, c-format
msgid "Created autostash: %s\n"
msgstr "建立了 autostash：%s\n"
-#: sequencer.c:4115
+#: sequencer.c:4137
msgid "could not reset --hard"
msgstr "無法 reset --hard"
-#: sequencer.c:4140
+#: sequencer.c:4162
#, c-format
msgid "Applied autostash.\n"
msgstr "已套用 autostash。\n"
-#: sequencer.c:4152
+#: sequencer.c:4174
#, c-format
msgid "cannot store %s"
msgstr "不能儲存 %s"
-#: sequencer.c:4155
+#: sequencer.c:4177
#, c-format
msgid ""
"%s\n"
@@ -8011,29 +8234,29 @@
"您的修改安全地儲存在儲藏區中。\n"
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4160
+#: sequencer.c:4182
msgid "Applying autostash resulted in conflicts."
msgstr "因套用自動儲藏而導致衝突。"
-#: sequencer.c:4161
+#: sequencer.c:4183
msgid "Autostash exists; creating a new stash entry."
msgstr "已有自動儲藏；建立新儲藏項目。"
-#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
msgid "could not detach HEAD"
msgstr "不能分離開頭指標"
-#: sequencer.c:4248
+#: sequencer.c:4270
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4250
+#: sequencer.c:4272
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4258
+#: sequencer.c:4304
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8053,58 +8276,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4304
+#: sequencer.c:4350
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在重定基底 (%d/%d)%s"
-#: sequencer.c:4350
+#: sequencer.c:4396
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4421
+#: sequencer.c:4466
#, c-format
msgid "unknown command %d"
msgstr "未知指令 %d"
-#: sequencer.c:4480
+#: sequencer.c:4514
msgid "could not read orig-head"
msgstr "不能讀取 orig-head"
-#: sequencer.c:4485
+#: sequencer.c:4519
msgid "could not read 'onto'"
msgstr "不能讀取 'onto'"
-#: sequencer.c:4499
+#: sequencer.c:4533
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 為 %s"
-#: sequencer.c:4559
+#: sequencer.c:4593
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功重定基底並更新 %s。\n"
-#: sequencer.c:4611
+#: sequencer.c:4645
msgid "cannot rebase: You have unstaged changes."
msgstr "不能重定基底：您有未暫存的變更。"
-#: sequencer.c:4620
+#: sequencer.c:4654
msgid "cannot amend non-existing commit"
msgstr "不能修補不存在的提交"
-#: sequencer.c:4622
+#: sequencer.c:4656
#, c-format
msgid "invalid file: '%s'"
msgstr "無效檔案：'%s'"
-#: sequencer.c:4624
+#: sequencer.c:4658
#, c-format
msgid "invalid contents: '%s'"
msgstr "無效內容：'%s'"
-#: sequencer.c:4627
+#: sequencer.c:4661
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8113,50 +8336,59 @@
"\n"
"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-#: sequencer.c:4663 sequencer.c:4702
+#: sequencer.c:4697 sequencer.c:4736
#, c-format
msgid "could not write file: '%s'"
msgstr "不能寫入檔案：'%s'"
-#: sequencer.c:4718
+#: sequencer.c:4752
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能刪除 CHERRY_PICK_HEAD"
-#: sequencer.c:4725
+#: sequencer.c:4762
msgid "could not commit staged changes."
msgstr "不能提交暫存的修改。"
-#: sequencer.c:4845
+#: sequencer.c:4882
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能揀選一個%s"
-#: sequencer.c:4849
+#: sequencer.c:4886
#, c-format
msgid "%s: bad revision"
msgstr "%s：錯誤的版本"
-#: sequencer.c:4884
+#: sequencer.c:4921
msgid "can't revert as initial commit"
msgstr "不能作為初始提交還原提交"
-#: sequencer.c:5361
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "已略過先前套用的 %s 提交"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 以包含略過提交"
+
+#: sequencer.c:5408
msgid "make_script: unhandled options"
msgstr "make_script：有未能處理的選項"
-#: sequencer.c:5364
+#: sequencer.c:5411
msgid "make_script: error preparing revisions"
msgstr "make_script：準備版本時錯誤"
-#: sequencer.c:5614 sequencer.c:5631
+#: sequencer.c:5669 sequencer.c:5686
msgid "nothing to do"
msgstr "無事可做"
-#: sequencer.c:5650
+#: sequencer.c:5705
msgid "could not skip unnecessary pick commands"
msgstr "無法略過不必要的揀選"
-#: sequencer.c:5750
+#: sequencer.c:5805
msgid "the script was already rearranged."
msgstr "腳本已經重新編排。"
@@ -8310,27 +8542,15 @@
"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
"檔案所有者必須始終擁有讀寫權限。"
-#: setup.c:1430
-msgid "open /dev/null or dup failed"
-msgstr "不能開啟或者複製 /dev/null"
-
-#: setup.c:1445
+#: setup.c:1443
msgid "fork failed"
msgstr "fork 失敗"
-#: setup.c:1450 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
msgid "setsid failed"
msgstr "setsid 失敗"
-#: sparse-index.c:162
-msgid "attempting to use sparse-index without cone mode"
-msgstr "嘗試不在 cone 模式使用稀疏索引"
-
-#: sparse-index.c:176
-msgid "unable to update cache-tree, staying full"
-msgstr "無法更新快取樹，保持完整"
-
-#: sparse-index.c:263
+#: sparse-index.c:273
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"
@@ -8385,13 +8605,13 @@
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
#, c-format
msgid "could not open '%s' for writing"
msgstr "無法開啟 '%s' 進行寫入"
-#: strbuf.c:1177
+#: strbuf.c:1183
#, c-format
msgid "could not edit '%s'"
msgstr "無法編輯 '%s'"
@@ -8415,7 +8635,7 @@
msgid "invalid value for %s"
msgstr "%s 的值無效"
-#: submodule-config.c:766
+#: submodule-config.c:767
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 條目 %s"
@@ -8438,70 +8658,70 @@
msgid "staging updated .gitmodules failed"
msgstr "將更新後 .gitmodules 新增暫存區失敗"
-#: submodule.c:328
+#: submodule.c:358
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位於未簽出的子模組 '%s'"
-#: submodule.c:359
+#: submodule.c:389
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
-#: submodule.c:436
+#: submodule.c:466
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "無效 --ignore-submodules 參數：%s"
-#: submodule.c:805
+#: submodule.c:844
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"
-#: submodule.c:908
+#: submodule.c:954
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"
-#: submodule.c:993
+#: submodule.c:1042
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令"
-#: submodule.c:1116
+#: submodule.c:1165
#, c-format
msgid "process for submodule '%s' failed"
msgstr "處理 '%s' 子模組失敗"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
msgid "Failed to resolve HEAD as a valid ref."
msgstr "無法將 HEAD 解析為有效引用。"
-#: submodule.c:1156
+#: submodule.c:1205
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送 '%s' 子模組\n"
-#: submodule.c:1159
+#: submodule.c:1208
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "無法推送 '%s' 子模組\n"
-#: submodule.c:1451
+#: submodule.c:1491
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在抓取 %s%s 子模組\n"
-#: submodule.c:1485
+#: submodule.c:1525
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "無法存取子模組 '%s'\n"
-#: submodule.c:1640
+#: submodule.c:1680
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8510,77 +8730,77 @@
"抓取子模組時發生錯誤：\n"
"%s"
-#: submodule.c:1665
+#: submodule.c:1705
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "無法將 '%s' 識別為一個 git 版本庫"
-#: submodule.c:1682
+#: submodule.c:1722
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
-#: submodule.c:1723
+#: submodule.c:1763
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
-#: submodule.c:1798
+#: submodule.c:1838
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中啟動 'git status'"
-#: submodule.c:1811
+#: submodule.c:1851
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中執行 'git status'"
-#: submodule.c:1826
+#: submodule.c:1868
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
-#: submodule.c:1853 submodule.c:2163
+#: submodule.c:1895 submodule.c:2210
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "無法遞迴子模組路徑 '%s'"
-#: submodule.c:1874
+#: submodule.c:1917
msgid "could not reset submodule index"
msgstr "無法重設子模組的索引"
-#: submodule.c:1916
+#: submodule.c:1959
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模組 '%s' 中有髒索引"
-#: submodule.c:1968
+#: submodule.c:2013
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模組 '%s' 無法被更新。"
-#: submodule.c:2036
+#: submodule.c:2081
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
-#: submodule.c:2057
+#: submodule.c:2102
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
-#: submodule.c:2069 submodule.c:2128
+#: submodule.c:2114 submodule.c:2174
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查詢子模組 '%s' 的名稱"
-#: submodule.c:2073
+#: submodule.c:2118
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "拒絕移動「%s」至現存 git 目錄"
-#: submodule.c:2080
+#: submodule.c:2124
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8591,11 +8811,11 @@
"'%s' 遷移至\n"
"'%s'\n"
-#: submodule.c:2208
+#: submodule.c:2255
msgid "could not start ls-files in .."
msgstr "無法在 .. 中啟動 ls-files"
-#: submodule.c:2248
+#: submodule.c:2295
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -8617,7 +8837,7 @@
msgstr "鍵 '%2$s' 的未知取值 '%1$s'"
#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
#, c-format
msgid "more than one %s"
msgstr "多於一個 %s"
@@ -8632,11 +8852,11 @@
msgid "could not read input file '%s'"
msgstr "不能讀取輸入檔案 '%s'"
-#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
msgid "could not read from stdin"
msgstr "不能自標準輸入讀取"
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
#, c-format
msgid "could not stat %s"
msgstr "不能對 %s 呼叫 stat"
@@ -8682,7 +8902,7 @@
#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
-msgstr "遠端協助工具需要實現 refspec 能力"
+msgstr "遠端協助工具需要實現 refspec 引用規格能力"
#: transport-helper.c:287 transport-helper.c:429
#, c-format
@@ -8702,7 +8922,7 @@
msgid "error while running fast-import"
msgstr "執行 fast-import 發生錯誤"
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
#, c-format
msgid "could not read ref %s"
msgstr "無法讀取引用 %s"
@@ -8720,7 +8940,7 @@
msgid "invalid remote service path"
msgstr "無效的遠端服務路徑"
-#: transport-helper.c:661 transport.c:1477
+#: transport-helper.c:661 transport.c:1475
msgid "operation not supported by protocol"
msgstr "協定不支援該動作"
@@ -8729,7 +8949,7 @@
msgid "can't connect to subservice %s"
msgstr "不能連線到子服務 %s"
-#: transport-helper.c:693 transport.c:400
+#: transport-helper.c:693 transport.c:404
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only 需要 v2 版協定"
@@ -8742,59 +8962,59 @@
msgid "expected ok/error, helper said '%s'"
msgstr "預期 ok/error，協助工具說 '%s'"
-#: transport-helper.c:855
+#: transport-helper.c:859
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "協助工具報告 %s 的意外狀態"
-#: transport-helper.c:938
+#: transport-helper.c:942
#, c-format
msgid "helper %s does not support dry-run"
msgstr "協助工具 %s 不支援 dry-run"
-#: transport-helper.c:941
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support --signed"
msgstr "協助工具 %s 不支援 --signed"
-#: transport-helper.c:944
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "協助工具 %s 不支援 --signed=if-asked"
-#: transport-helper.c:949
+#: transport-helper.c:953
#, c-format
msgid "helper %s does not support --atomic"
msgstr "協助工具 %s 不支援 --atomic"
-#: transport-helper.c:953
+#: transport-helper.c:957
#, c-format
msgid "helper %s does not support --%s"
msgstr "協助工具 %s 不支援 --%s"
-#: transport-helper.c:960
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "協助工具 %s 不支援 'push-option'"
-#: transport-helper.c:1060
+#: transport-helper.c:1064
msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支援 push，需要引用表達式"
+msgstr "remote-heper 不支援 push，需要引用規格"
-#: transport-helper.c:1065
+#: transport-helper.c:1069
#, c-format
msgid "helper %s does not support 'force'"
msgstr "協助工具 %s 不支援 'force'"
-#: transport-helper.c:1112
+#: transport-helper.c:1116
msgid "couldn't run fast-export"
msgstr "無法執行 fast-export"
-#: transport-helper.c:1117
+#: transport-helper.c:1121
msgid "error while running fast-export"
msgstr "執行 fast-export 時發生錯誤"
-#: transport-helper.c:1142
+#: transport-helper.c:1146
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8803,52 +9023,52 @@
"沒有共同的引用並且也沒有指定，什麼也不會做。\n"
"您或許得指定一個分支。\n"
-#: transport-helper.c:1224
+#: transport-helper.c:1228
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支援的物件格式「%s」"
-#: transport-helper.c:1233
+#: transport-helper.c:1237
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式錯誤的回應：%s"
-#: transport-helper.c:1385
+#: transport-helper.c:1389
#, c-format
msgid "read(%s) failed"
msgstr "讀取（%s）失敗"
-#: transport-helper.c:1412
+#: transport-helper.c:1416
#, c-format
msgid "write(%s) failed"
msgstr "寫（%s）失敗"
-#: transport-helper.c:1461
+#: transport-helper.c:1465
#, c-format
msgid "%s thread failed"
msgstr "%s 執行緒失敗"
-#: transport-helper.c:1465
+#: transport-helper.c:1469
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 執行緒等待失敗：%s"
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能啟動執行緒來複製資料：%s"
-#: transport-helper.c:1525
+#: transport-helper.c:1529
#, c-format
msgid "%s process failed to wait"
msgstr "%s 進程等待失敗"
-#: transport-helper.c:1529
+#: transport-helper.c:1533
#, c-format
msgid "%s process failed"
msgstr "%s 進程失敗"
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
msgid "can't start thread for copying data"
msgstr "不能啟動執行緒來複製資料"
@@ -8862,53 +9082,53 @@
msgid "could not read bundle '%s'"
msgstr "無法讀取 bundle '%s'"
-#: transport.c:223
+#: transport.c:227
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "傳輸：無效的深度選項 '%s'"
-#: transport.c:275
+#: transport.c:279
msgid "see protocol.version in 'git help config' for more details"
msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-#: transport.c:276
+#: transport.c:280
msgid "server options require protocol version 2 or later"
msgstr "服務端選項需要版本 2 協定或更高"
-#: transport.c:403
+#: transport.c:407
msgid "server does not support wait-for-done"
msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"
-#: transport.c:755
+#: transport.c:759
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 設定"
-#: transport.c:830
+#: transport.c:834
msgid "support for protocol v2 not implemented yet"
msgstr "協定 v2 的支援尚未實現"
-#: transport.c:965
+#: transport.c:967
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "設定 '%s' 的取值未知：%s"
-#: transport.c:1031
+#: transport.c:1033
#, c-format
msgid "transport '%s' not allowed"
msgstr "傳輸 '%s' 不允許"
-#: transport.c:1084
+#: transport.c:1082
msgid "git-over-rsync is no longer supported"
msgstr "不再支援 git-over-rsync"
-#: transport.c:1187
+#: transport.c:1185
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
-msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"
+msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n"
-#: transport.c:1191
+#: transport.c:1189
#, c-format
msgid ""
"\n"
@@ -8935,11 +9155,11 @@
"以推送至遠端。\n"
"\n"
-#: transport.c:1199
+#: transport.c:1197
msgid "Aborting."
msgstr "正在終止。"
-#: transport.c:1346
+#: transport.c:1344
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模組"
@@ -9200,16 +9420,16 @@
"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"
"並且碰撞組中只有一個檔案存在工作區中：\n"
-#: unpack-trees.c:1618
+#: unpack-trees.c:1620
msgid "Updating index flags"
msgstr "正在更新索引旗標"
-#: unpack-trees.c:2718
+#: unpack-trees.c:2772
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作區和未追蹤提交有重複項目：%s"
-#: upload-pack.c:1548
+#: upload-pack.c:1561
msgid "expected flush after fetch arguments"
msgstr "在 fetch 引數應為一個 flush 包"
@@ -9246,7 +9466,7 @@
msgid "Fetching objects"
msgstr "正在抓取物件"
-#: worktree.c:236 builtin/am.c:2152
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "讀取 '%s' 失敗"
@@ -9302,7 +9522,7 @@
#: worktree.c:732
msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "無法定位版本庫；.git 檔案未參考版本庫"
+msgstr "無法定位版本庫：.git 檔案未指向版本庫"
#: worktree.c:736
msgid "unable to locate repository; .git file broken"
@@ -9342,17 +9562,27 @@
msgid "gitdir file points to non-existent location"
msgstr "gitdir 檔案指向的位置不存在"
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "無法 setenv '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能建立 '%s'"
+
+#: wrapper.c:205 wrapper.c:375
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "無法開啟 '%s' 進行讀寫"
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
#, c-format
msgid "unable to access '%s'"
msgstr "不能存取 '%s'"
-#: wrapper.c:607
+#: wrapper.c:615
msgid "unable to get current working directory"
msgstr "不能取得目前工作目錄"
@@ -9914,25 +10144,25 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的變更。"
-#: compat/simple-ipc/ipc-unix-socket.c:182
+#: compat/simple-ipc/ipc-unix-socket.c:183
msgid "could not send IPC command"
msgstr "無法傳送 IPC 命令"
-#: compat/simple-ipc/ipc-unix-socket.c:189
+#: compat/simple-ipc/ipc-unix-socket.c:190
msgid "could not read IPC response"
msgstr "無法讀取 IPC 回應"
-#: compat/simple-ipc/ipc-unix-socket.c:866
+#: compat/simple-ipc/ipc-unix-socket.c:870
#, c-format
msgid "could not start accept_thread '%s'"
msgstr "無法啟動 accept_thread “%s”"
-#: compat/simple-ipc/ipc-unix-socket.c:878
+#: compat/simple-ipc/ipc-unix-socket.c:882
#, c-format
msgid "could not start worker[0] for '%s'"
msgstr "無法啟動「%s」的 worker[0]"
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
#, c-format
msgid "failed to unlink '%s'"
msgstr "刪除 '%s' 失敗"
@@ -9941,131 +10171,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<選項>] [--] <路徑規格>..."
-#: builtin/add.c:61
+#: builtin/add.c:64
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "無法 chmod %cx ‘%s’"
-#: builtin/add.c:99
+#: builtin/add.c:106
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差異狀態 %c"
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
msgid "updating files failed"
msgstr "更新檔案失敗"
-#: builtin/add.c:114
+#: builtin/add.c:121
#, c-format
msgid "remove '%s'\n"
msgstr "刪除 '%s'\n"
-#: builtin/add.c:198
+#: builtin/add.c:205
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後尚未被暫存的變更："
-#: builtin/add.c:307 builtin/rev-parse.c:993
+#: builtin/add.c:317 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能讀取索引"
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "無法為寫入開啟 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:330
msgid "Could not write patch"
msgstr "不能生成修補檔"
-#: builtin/add.c:325
+#: builtin/add.c:333
msgid "editing patch failed"
msgstr "編輯修補檔失敗"
-#: builtin/add.c:328
+#: builtin/add.c:336
#, c-format
msgid "Could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/add.c:330
+#: builtin/add.c:338
msgid "Empty patch. Aborted."
msgstr "空修補檔。異常終止。"
-#: builtin/add.c:335
+#: builtin/add.c:343
#, c-format
msgid "Could not apply '%s'"
msgstr "不能套用 '%s'"
-#: builtin/add.c:343
+#: builtin/add.c:351
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
-#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
+#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "測試執行"
-#: builtin/add.c:366
+#: builtin/add.c:374
msgid "interactive picking"
msgstr "互動式揀選"
-#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
msgid "select hunks interactively"
msgstr "互動式挑選資料區塊"
-#: builtin/add.c:368
+#: builtin/add.c:376
msgid "edit current diff and apply"
msgstr "編輯目前差異並套用"
-#: builtin/add.c:369
+#: builtin/add.c:377
msgid "allow adding otherwise ignored files"
msgstr "允許新增忽略的檔案"
-#: builtin/add.c:370
+#: builtin/add.c:378
msgid "update tracked files"
msgstr "更新已追蹤的檔案"
-#: builtin/add.c:371
+#: builtin/add.c:379
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"
-#: builtin/add.c:372
+#: builtin/add.c:380
msgid "record only the fact that the path will be added later"
msgstr "只記錄，該路徑稍後再新增"
-#: builtin/add.c:373
+#: builtin/add.c:381
msgid "add changes from all tracked and untracked files"
msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
-#: builtin/add.c:376
+#: builtin/add.c:384
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作區中移除的路徑（和 --no-all 相同）"
-#: builtin/add.c:378
+#: builtin/add.c:386
msgid "don't add, only refresh the index"
msgstr "不新增，只重新整理索引"
-#: builtin/add.c:379
+#: builtin/add.c:387
msgid "just skip files which cannot be added because of errors"
msgstr "略過因發生錯誤不能新增的檔案"
-#: builtin/add.c:380
+#: builtin/add.c:388
msgid "check if - even missing - files are ignored in dry run"
msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "允許更新稀疏簽出 cone 外的項目"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆蓋列表裡檔案的可執行位"
-#: builtin/add.c:384
+#: builtin/add.c:393
msgid "warn when adding an embedded repository"
msgstr "建立一個嵌入式版本庫時給予警告"
-#: builtin/add.c:386
+#: builtin/add.c:395
msgid "backend for `git stash -p`"
msgstr "`git stash -p` 的後端"
-#: builtin/add.c:404
+#: builtin/add.c:413
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -10094,12 +10323,12 @@
"\n"
"參見 \"git help submodule\" 取得更多訊息。"
-#: builtin/add.c:432
+#: builtin/add.c:442
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在新增嵌入式 git 版本庫：%s"
-#: builtin/add.c:451
+#: builtin/add.c:462
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -10109,51 +10338,51 @@
"如要關閉此訊息，請執行\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:460
+#: builtin/add.c:477
msgid "adding files failed"
msgstr "新增檔案失敗"
-#: builtin/add.c:488
+#: builtin/add.c:513
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr "--dry-run 和 --interactive/--patch 不相容"
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
-#: builtin/add.c:507
+#: builtin/add.c:532
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file 與 --edit 不相容"
-#: builtin/add.c:519
+#: builtin/add.c:544
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 選項互斥"
-#: builtin/add.c:522
+#: builtin/add.c:547
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
-#: builtin/add.c:526
+#: builtin/add.c:551
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
-#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
+#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
-#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
+#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
+#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-#: builtin/add.c:555
+#: builtin/add.c:583
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "沒有指定檔案，也沒有檔案被新增。\n"
-#: builtin/add.c:557
+#: builtin/add.c:585
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -10163,105 +10392,105 @@
"如要關閉此訊息，請執行\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:365
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "不能解析作者腳本"
-#: builtin/am.c:455
+#: builtin/am.c:456
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
-#: builtin/am.c:497
+#: builtin/am.c:498
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的輸入行：'%s'。"
-#: builtin/am.c:535
+#: builtin/am.c:536
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "從 '%s' 複製註解到 '%s' 時失敗"
-#: builtin/am.c:561
+#: builtin/am.c:562
msgid "fseek failed"
msgstr "fseek 失敗"
-#: builtin/am.c:749
+#: builtin/am.c:750
#, c-format
msgid "could not parse patch '%s'"
msgstr "無法解析修補檔 '%s'"
-#: builtin/am.c:814
+#: builtin/am.c:815
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
-#: builtin/am.c:862
+#: builtin/am.c:863
msgid "invalid timestamp"
msgstr "無效的時間戳"
-#: builtin/am.c:867 builtin/am.c:879
+#: builtin/am.c:868 builtin/am.c:880
msgid "invalid Date line"
msgstr "無效的日期行"
-#: builtin/am.c:874
+#: builtin/am.c:875
msgid "invalid timezone offset"
msgstr "無效的時區位移值"
-#: builtin/am.c:967
+#: builtin/am.c:968
msgid "Patch format detection failed."
msgstr "修補檔格式偵測失敗。"
-#: builtin/am.c:972 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
#, c-format
msgid "failed to create directory '%s'"
msgstr "建立目錄 '%s' 失敗"
-#: builtin/am.c:977
+#: builtin/am.c:978
msgid "Failed to split patches."
msgstr "分割修補檔失敗。"
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "當您解決這一問題，執行 \"%s --continue\"。"
-#: builtin/am.c:1127
+#: builtin/am.c:1128
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"
-#: builtin/am.c:1128
+#: builtin/am.c:1129
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"
-#: builtin/am.c:1223
+#: builtin/am.c:1224
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"
-#: builtin/am.c:1251
+#: builtin/am.c:1252
msgid "Patch is empty."
msgstr "修補檔為空。"
-#: builtin/am.c:1316
+#: builtin/am.c:1317
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺少作者行"
-#: builtin/am.c:1319
+#: builtin/am.c:1320
#, c-format
msgid "invalid ident line: %.*s"
msgstr "無效的身份標記：%.*s"
-#: builtin/am.c:1538
+#: builtin/am.c:1539
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
-#: builtin/am.c:1540
+#: builtin/am.c:1541
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."
-#: builtin/am.c:1559
+#: builtin/am.c:1560
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10269,24 +10498,24 @@
"您是否曾手動編輯過您的修補檔？\n"
"無法套用修補檔到索引中的資料物件上。"
-#: builtin/am.c:1565
+#: builtin/am.c:1566
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基礎版本上修補及進行三方合併..."
-#: builtin/am.c:1591
+#: builtin/am.c:1592
msgid "Failed to merge in the changes."
msgstr "無法合併變更。"
-#: builtin/am.c:1623
+#: builtin/am.c:1624
msgid "applying to an empty history"
msgstr "正套用到一個空歷史上"
-#: builtin/am.c:1675 builtin/am.c:1679
+#: builtin/am.c:1676 builtin/am.c:1680
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "無法繼續：%s 不存在。"
-#: builtin/am.c:1697
+#: builtin/am.c:1698
msgid "Commit Body is:"
msgstr "提交內容為："
@@ -10295,35 +10524,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1707
+#: builtin/am.c:1708
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： "
-#: builtin/am.c:1753 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
msgid "unable to write index file"
msgstr "無法寫入索引檔案"
-#: builtin/am.c:1757
+#: builtin/am.c:1758
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
-#: builtin/am.c:1797 builtin/am.c:1865
+#: builtin/am.c:1798 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "套用：%.*s"
-#: builtin/am.c:1814
+#: builtin/am.c:1815
msgid "No changes -- Patch already applied."
msgstr "沒有變更——修補檔已經套用過。"
-#: builtin/am.c:1820
+#: builtin/am.c:1821
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打修補檔失敗於 %s %.*s"
-#: builtin/am.c:1824
+#: builtin/am.c:1825
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
@@ -10348,175 +10577,175 @@
"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
-#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析物件 '%s'。"
-#: builtin/am.c:2034
+#: builtin/am.c:2035 builtin/am.c:2111
msgid "failed to clean index"
msgstr "清空索引失敗"
-#: builtin/am.c:2078
+#: builtin/am.c:2079
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:2185
+#: builtin/am.c:2187
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "無效的 --patch-format 值：%s"
-#: builtin/am.c:2227
+#: builtin/am.c:2229
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "無效的 --show-current-patch 值：%s"
-#: builtin/am.c:2231
+#: builtin/am.c:2233
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
-#: builtin/am.c:2262
+#: builtin/am.c:2264
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2263
+#: builtin/am.c:2265
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<選項>] (--continue | --skip | --abort)"
-#: builtin/am.c:2269
+#: builtin/am.c:2271
msgid "run interactively"
msgstr "以互動式方式執行"
-#: builtin/am.c:2271
+#: builtin/am.c:2273
msgid "historical option -- no-op"
msgstr "老的參數 —— 無作用"
-#: builtin/am.c:2273
+#: builtin/am.c:2275
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允許使用三方合併"
-#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:945
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
msgid "be quiet"
msgstr "靜默模式"
-#: builtin/am.c:2276
+#: builtin/am.c:2278
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交說明結尾加入 Signed-off-by"
-#: builtin/am.c:2279
+#: builtin/am.c:2281
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字元集（預設）"
-#: builtin/am.c:2281
+#: builtin/am.c:2283
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -k 參數"
-#: builtin/am.c:2283
+#: builtin/am.c:2285
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -b 參數"
-#: builtin/am.c:2285
+#: builtin/am.c:2287
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -m 參數"
-#: builtin/am.c:2287
+#: builtin/am.c:2289
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
-#: builtin/am.c:2290
+#: builtin/am.c:2292
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
-#: builtin/am.c:2293
+#: builtin/am.c:2295
msgid "strip everything before a scissors line"
msgstr "捨棄裁切線前的所有內容"
-#: builtin/am.c:2295
+#: builtin/am.c:2297
msgid "pass it through git-mailinfo"
msgstr "透過 git-mailinfo 傳遞"
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
-#: builtin/am.c:2325
+#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
+#: builtin/am.c:2327
msgid "pass it through git-apply"
msgstr "傳遞給 git-apply"
-#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
+#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
msgid "n"
msgstr "n"
-#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2322
+#: builtin/am.c:2324
msgid "format the patch(es) are in"
msgstr "修補檔的格式"
-#: builtin/am.c:2328
+#: builtin/am.c:2330
msgid "override error message when patch failure occurs"
msgstr "打修補檔失敗時顯示的錯誤訊息"
-#: builtin/am.c:2330
+#: builtin/am.c:2332
msgid "continue applying patches after resolving a conflict"
msgstr "衝突解決後繼續套用修補檔"
-#: builtin/am.c:2333
+#: builtin/am.c:2335
msgid "synonyms for --continue"
msgstr "和 --continue 同義"
-#: builtin/am.c:2336
+#: builtin/am.c:2338
msgid "skip the current patch"
msgstr "略過目前修補檔"
-#: builtin/am.c:2339
+#: builtin/am.c:2341
msgid "restore the original branch and abort the patching operation"
msgstr "還原原始分支並中止修補動作"
-#: builtin/am.c:2342
+#: builtin/am.c:2344
msgid "abort the patching operation but keep HEAD where it is"
msgstr "終止修補動作但保持 HEAD 不變"
-#: builtin/am.c:2346
+#: builtin/am.c:2348
msgid "show the patch being applied"
msgstr "顯示正在套用的修補檔"
-#: builtin/am.c:2351
+#: builtin/am.c:2353
msgid "lie about committer date"
msgstr "將作者日期作為提交日期"
-#: builtin/am.c:2353
+#: builtin/am.c:2355
msgid "use current timestamp for author date"
msgstr "用目前時間作為作者日期"
-#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
msgid "GPG-sign commits"
msgstr "使用 GPG 簽名提交"
-#: builtin/am.c:2359
+#: builtin/am.c:2361
msgid "(internal use for git-rebase)"
msgstr "（內部使用，用於 git-rebase）"
-#: builtin/am.c:2377
+#: builtin/am.c:2379
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."
@@ -10524,16 +10753,16 @@
"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
"請不要再使用它了。"
-#: builtin/am.c:2384
+#: builtin/am.c:2386
msgid "failed to read the index"
msgstr "讀取索引失敗"
-#: builtin/am.c:2399
+#: builtin/am.c:2401
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
-#: builtin/am.c:2423
+#: builtin/am.c:2425
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10542,11 +10771,11 @@
"發現了錯誤的 %s 目錄。\n"
"使用 \"git am --abort\" 刪除它。"
-#: builtin/am.c:2429
+#: builtin/am.c:2431
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解決動作未進行，我們不會繼續。"
-#: builtin/am.c:2439
+#: builtin/am.c:2441
msgid "interactive mode requires patches on the command line"
msgstr "互動式模式需要指令列上提供修補檔"
@@ -10554,44 +10783,35 @@
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<選項>] [<修補檔>...]"
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "不能建立歸檔檔案 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
msgid "could not redirect output"
msgstr "不能重定向輸出"
-#: builtin/archive.c:37
+#: builtin/archive.c:35
msgid "git archive: Remote with no URL"
msgstr "git archive：未提供遠端 URL"
-#: builtin/archive.c:61
+#: builtin/archive.c:59
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包"
-#: builtin/archive.c:64
+#: builtin/archive.c:62
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:65
+#: builtin/archive.c:63
msgid "git archive: protocol error"
msgstr "git archive：協定錯誤"
-#: builtin/archive.c:69
+#: builtin/archive.c:67
msgid "git archive: expected a flush"
msgstr "git archive：應有一個 flush 包"
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]"
-
#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10629,72 +10849,85 @@
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
#, c-format
msgid "could not write to file '%s'"
msgstr "無法寫入 '%s' 檔案"
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "無法開啟「%s」檔案進行讀取"
+
+#: builtin/bisect--helper.c:170
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一個有效的術語"
-#: builtin/bisect--helper.c:159
+#: builtin/bisect--helper.c:174
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用內建指令 '%s' 作為術語"
-#: builtin/bisect--helper.c:169
+#: builtin/bisect--helper.c:184
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改術語 '%s' 的含義"
-#: builtin/bisect--helper.c:179
+#: builtin/bisect--helper.c:194
msgid "please use two different terms"
msgstr "請使用兩個不同的術語"
-#: builtin/bisect--helper.c:195
+#: builtin/bisect--helper.c:210
#, c-format
msgid "We are not bisecting.\n"
msgstr "我們沒有在二分搜尋。\n"
-#: builtin/bisect--helper.c:203
+#: builtin/bisect--helper.c:218
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一個有效的提交"
-#: builtin/bisect--helper.c:212
+#: builtin/bisect--helper.c:227
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:256
+#: builtin/bisect--helper.c:271
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "壞的 bisect_write 參數：%s"
-#: builtin/bisect--helper.c:261
+#: builtin/bisect--helper.c:276
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "無法取得版本 '%s' 的物件 ID"
-#: builtin/bisect--helper.c:273
+#: builtin/bisect--helper.c:288
#, c-format
msgid "couldn't open the file '%s'"
msgstr "無法開啟檔案 '%s'"
-#: builtin/bisect--helper.c:299
+#: builtin/bisect--helper.c:314
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"
-#: builtin/bisect--helper.c:326
+#: builtin/bisect--helper.c:341
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10703,7 +10936,7 @@
"您需要給我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:345
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10714,7 +10947,7 @@
"然後需要提供我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
-#: builtin/bisect--helper.c:350
+#: builtin/bisect--helper.c:365
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一個 %s 提交的情況下二分搜尋"
@@ -10724,22 +10957,22 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:358
+#: builtin/bisect--helper.c:373
msgid "Are you sure [Y/n]? "
msgstr "您確認嗎[Y/n]？ "
-#: builtin/bisect--helper.c:419
+#: builtin/bisect--helper.c:434
msgid "no terms defined"
msgstr "未定義術語"
-#: builtin/bisect--helper.c:422
+#: builtin/bisect--helper.c:437
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n"
-#: builtin/bisect--helper.c:432
+#: builtin/bisect--helper.c:447
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10748,52 +10981,52 @@
"指令 'git bisect terms' 的參數 %s 無效。\n"
"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
msgid "revision walk setup failed\n"
msgstr "版本遍歷設定失敗\n"
-#: builtin/bisect--helper.c:521
+#: builtin/bisect--helper.c:536
#, c-format
msgid "could not open '%s' for appending"
msgstr "無法開啟 '%s' 進行附加"
-#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
msgid "'' is not a valid term"
msgstr "'' 不是一個有效的術語"
-#: builtin/bisect--helper.c:663
+#: builtin/bisect--helper.c:678
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未識別的選項：'%s'"
-#: builtin/bisect--helper.c:667
+#: builtin/bisect--helper.c:682
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起來不是一個有效的版本"
-#: builtin/bisect--helper.c:698
+#: builtin/bisect--helper.c:713
msgid "bad HEAD - I need a HEAD"
msgstr "壞的 HEAD - 我需要一個 HEAD"
-#: builtin/bisect--helper.c:713
+#: builtin/bisect--helper.c:728
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:734
+#: builtin/bisect--helper.c:749
msgid "won't bisect on cg-seek'ed tree"
msgstr "不會在做了 cg-seek 的樹上做二分搜尋"
-#: builtin/bisect--helper.c:737
+#: builtin/bisect--helper.c:752
msgid "bad HEAD - strange symbolic ref"
msgstr "壞的 HEAD - 奇怪的符號引用"
-#: builtin/bisect--helper.c:757
+#: builtin/bisect--helper.c:772
#, c-format
msgid "invalid ref: '%s'"
msgstr "無效的引用：'%s'"
-#: builtin/bisect--helper.c:815
+#: builtin/bisect--helper.c:830
msgid "You need to start by \"git bisect start\"\n"
msgstr "您需要執行 \"git bisect start\" 來開始\n"
@@ -10802,104 +11035,149 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:826
+#: builtin/bisect--helper.c:841
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想讓我為您這樣做嗎[Y/n]？ "
-#: builtin/bisect--helper.c:844
+#: builtin/bisect--helper.c:859
msgid "Please call `--bisect-state` with at least one argument"
msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"
-#: builtin/bisect--helper.c:857
+#: builtin/bisect--helper.c:872
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect %s' 只能有一個參數。"
-#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
#, c-format
msgid "Bad rev input: %s"
msgstr "<修訂版> 輸入格式錯誤：%s"
-#: builtin/bisect--helper.c:889
+#: builtin/bisect--helper.c:904
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "修訂版輸入有誤（不是提交）：%s"
-#: builtin/bisect--helper.c:921
+#: builtin/bisect--helper.c:936
msgid "We are not bisecting."
msgstr "我們沒有在二分搜尋。"
-#: builtin/bisect--helper.c:971
+#: builtin/bisect--helper.c:986
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "「%s」？？您在說什麼？"
-#: builtin/bisect--helper.c:983
+#: builtin/bisect--helper.c:998
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "無法讀取「%s」檔案來重放"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "二分搜尋執行失敗：沒有提供指令。"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "正在執行 %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "無法開啟「%s」檔案進行寫入"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "二分搜尋不能繼續執行"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "二分搜尋執行成功"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分搜尋發現到第一個有問題的提交"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
+
+#: builtin/bisect--helper.c:1192
msgid "reset the bisection state"
msgstr "清除二分搜尋狀態"
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1194
msgid "check whether bad or good terms exist"
msgstr "檢查壞的或好的術語是否存在"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1196
msgid "print out the bisect terms"
msgstr "列印二分搜尋術語"
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1198
msgid "start the bisect session"
msgstr "啟動二分搜尋過程"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1200
msgid "find the next bisection commit"
msgstr "尋找下一個二分搜尋提交"
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1202
msgid "mark the state of ref (or refs)"
msgstr "標記 ref (或 refs) 的狀態"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1204
msgid "list the bisection steps so far"
msgstr "列出迄今的二分搜尋步驟"
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1206
msgid "replay the bisection process from the given file"
msgstr "從指定檔案重放二分搜尋過程"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1208
msgid "skip some commits for checkout"
msgstr "略過要簽出的部分提交"
-#: builtin/bisect--helper.c:1074
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "視覺化二分搜尋過程"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "使用 <cmd>... 自動進行二分搜尋。"
+
+#: builtin/bisect--helper.c:1214
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 無日誌"
-#: builtin/bisect--helper.c:1089
+#: builtin/bisect--helper.c:1229
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 無需參數或者需要一個提交"
-#: builtin/bisect--helper.c:1094
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需要 2 或 3 個參數"
-
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1234
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 個參數"
-#: builtin/bisect--helper.c:1109
+#: builtin/bisect--helper.c:1243
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 個引數"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1254
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 需要 0 個引數"
-#: builtin/bisect--helper.c:1125
+#: builtin/bisect--helper.c:1259
msgid "no logfile given"
msgstr "未提供日誌檔案"
@@ -10911,149 +11189,151 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
-#: builtin/blame.c:410
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr "期望一個顏色：%s"
-#: builtin/blame.c:417
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr "必須以一個顏色結尾"
-#: builtin/blame.c:728
+#: builtin/blame.c:724
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
-#: builtin/blame.c:746
+#: builtin/blame.c:742
msgid "invalid value for blame.coloring"
msgstr "設定 blame.coloring 中的無效取值"
-#: builtin/blame.c:845
+#: builtin/blame.c:841
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:867
+#: builtin/blame.c:863
msgid "show blame entries as we find them, incrementally"
msgstr "增量式顯示發現的 blame 條目"
-#: builtin/blame.c:868
+#: builtin/blame.c:864
msgid "do not show object names of boundary commits (Default: off)"
msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
-#: builtin/blame.c:869
+#: builtin/blame.c:865
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不將根提交看作邊界（預設值：off）"
-#: builtin/blame.c:870
+#: builtin/blame.c:866
msgid "show work cost statistics"
msgstr "顯示工作量統計"
-#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:566 builtin/send-pack.c:198
+#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
+#: builtin/merge.c:298 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "強制顯示進度報告"
-#: builtin/blame.c:872
+#: builtin/blame.c:868
msgid "show output score for blame entries"
msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
-#: builtin/blame.c:873
+#: builtin/blame.c:869
msgid "show original filename (Default: auto)"
msgstr "顯示原始檔案名稱（預設值：auto）"
-#: builtin/blame.c:874
+#: builtin/blame.c:870
msgid "show original linenumber (Default: off)"
msgstr "顯示原始檔案名稱（預設值：off）"
-#: builtin/blame.c:875
+#: builtin/blame.c:871
msgid "show in a format designed for machine consumption"
msgstr "顯示成適合機器讀取的格式"
-#: builtin/blame.c:876
+#: builtin/blame.c:872
msgid "show porcelain format with per-line commit information"
msgstr "顯示每一列適合機器的提交說明"
-#: builtin/blame.c:877
+#: builtin/blame.c:873
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）"
-#: builtin/blame.c:878
+#: builtin/blame.c:874
msgid "show raw timestamp (Default: off)"
msgstr "顯示原始時間戳（預設值：off）"
-#: builtin/blame.c:879
+#: builtin/blame.c:875
msgid "show long commit SHA1 (Default: off)"
msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
-#: builtin/blame.c:880
+#: builtin/blame.c:876
msgid "suppress author name and timestamp (Default: off)"
msgstr "隱藏作者名字及時間戳（預設值：off）"
-#: builtin/blame.c:881
+#: builtin/blame.c:877
msgid "show author email instead of name (Default: off)"
msgstr "顯示作者信箱而非名稱（預設值：off）"
-#: builtin/blame.c:882
+#: builtin/blame.c:878
msgid "ignore whitespace differences"
msgstr "忽略空白差異"
-#: builtin/blame.c:883 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1823
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:883
+#: builtin/blame.c:879
msgid "ignore <rev> when blaming"
msgstr "在執行 blame 動作時忽略 <修訂版>"
-#: builtin/blame.c:884
+#: builtin/blame.c:880
msgid "ignore revisions from <file>"
msgstr "忽略 <檔案> 中的修訂版"
-#: builtin/blame.c:885
+#: builtin/blame.c:881
msgid "color redundant metadata from previous line differently"
msgstr "使用顏色間隔輸出與前一行不同的重複元訊息"
-#: builtin/blame.c:886
+#: builtin/blame.c:882
msgid "color lines by age"
msgstr "依據時間著色"
-#: builtin/blame.c:887
+#: builtin/blame.c:883
msgid "spend extra cycles to find better match"
msgstr "循環更多次以找到更佳符合"
-#: builtin/blame.c:888
+#: builtin/blame.c:884
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
-#: builtin/blame.c:889
+#: builtin/blame.c:885
msgid "use <file>'s contents as the final image"
msgstr "將 <檔案> 的內容當成是最終 image"
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
msgid "score"
msgstr "得分"
-#: builtin/blame.c:890
+#: builtin/blame.c:886
msgid "find line copies within and across files"
msgstr "找到檔案內及跨檔案的複製列"
-#: builtin/blame.c:891
+#: builtin/blame.c:887
msgid "find line movements within and across files"
msgstr "找到檔案內及跨檔案的移動列"
-#: builtin/blame.c:892
+#: builtin/blame.c:888
msgid "range"
msgstr "range"
-#: builtin/blame.c:893
+#: builtin/blame.c:889
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
-#: builtin/blame.c:945
+#: builtin/blame.c:944
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
@@ -11065,17 +11345,17 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 年 11 個月前"
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "檔案 %s 只有 %lu 行"
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
msgid "Blaming lines"
msgstr "追蹤程式碼行"
@@ -11178,74 +11458,74 @@
msgid "Deleted branch %s (was %s).\n"
msgstr "已刪除分支 %s（曾為 %s）。\n"
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
msgid "unable to parse format string"
msgstr "不能解析格式化字串"
-#: builtin/branch.c:471
+#: builtin/branch.c:472
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:477
+#: builtin/branch.c:478
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:492
+#: builtin/branch.c:493
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被重定基底到 %s"
-#: builtin/branch.c:496
+#: builtin/branch.c:497
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分搜尋於 %s"
-#: builtin/branch.c:513
+#: builtin/branch.c:514
msgid "cannot copy the current branch while not on any."
msgstr "無法複製目前分支因為不處於任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:516
msgid "cannot rename the current branch while not on any."
msgstr "無法重新命名目前分支因為不處於任何分支上。"
-#: builtin/branch.c:526
+#: builtin/branch.c:527
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "無效的分支名：'%s'"
-#: builtin/branch.c:555
+#: builtin/branch.c:556
msgid "Branch rename failed"
msgstr "分支重新命名失敗"
-#: builtin/branch.c:557
+#: builtin/branch.c:558
msgid "Branch copy failed"
msgstr "分支複製失敗"
-#: builtin/branch.c:561
+#: builtin/branch.c:562
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
-#: builtin/branch.c:564
+#: builtin/branch.c:565
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已將錯誤命名的分支 '%s' 重新命名"
-#: builtin/branch.c:570
+#: builtin/branch.c:571
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
-#: builtin/branch.c:579
+#: builtin/branch.c:580
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重新命名，但更新設定檔案失敗"
-#: builtin/branch.c:581
+#: builtin/branch.c:582
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已複製，但更新設定檔案失敗"
-#: builtin/branch.c:597
+#: builtin/branch.c:598
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11256,209 +11536,209 @@
" %s\n"
"以 '%c' 開頭的行將被過濾。\n"
-#: builtin/branch.c:631
+#: builtin/branch.c:632
msgid "Generic options"
msgstr "通用選項"
-#: builtin/branch.c:633
+#: builtin/branch.c:634
msgid "show hash and subject, give twice for upstream branch"
msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
-#: builtin/branch.c:634
+#: builtin/branch.c:635
msgid "suppress informational messages"
msgstr "不顯示訊息"
-#: builtin/branch.c:635
+#: builtin/branch.c:636
msgid "set up tracking mode (see git-pull(1))"
msgstr "設定追蹤模式（參見 git-pull(1)）"
-#: builtin/branch.c:637
+#: builtin/branch.c:638
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:639
+#: builtin/branch.c:640
msgid "change the upstream info"
msgstr "改變上游訊息"
-#: builtin/branch.c:640
+#: builtin/branch.c:641
msgid "unset the upstream info"
msgstr "取消上游資訊設定"
-#: builtin/branch.c:641
+#: builtin/branch.c:642
msgid "use colored output"
msgstr "使用彩色輸出"
-#: builtin/branch.c:642
+#: builtin/branch.c:643
msgid "act on remote-tracking branches"
msgstr "作用於遠端追蹤分支"
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that contain the commit"
msgstr "只列印包含該提交的分支"
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
msgid "print only branches that don't contain the commit"
msgstr "只列印不包含該提交的分支"
-#: builtin/branch.c:650
+#: builtin/branch.c:651
msgid "Specific git-branch actions:"
msgstr "具體的 git-branch 動作："
-#: builtin/branch.c:651
+#: builtin/branch.c:652
msgid "list both remote-tracking and local branches"
msgstr "列出遠端追蹤及本機分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:654
msgid "delete fully merged branch"
msgstr "刪除完全合併的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:655
msgid "delete branch (even if not merged)"
msgstr "刪除分支（即使沒有合併）"
-#: builtin/branch.c:655
+#: builtin/branch.c:656
msgid "move/rename a branch and its reflog"
msgstr "移動/重新命名一個分支，以及它的引用日誌"
-#: builtin/branch.c:656
+#: builtin/branch.c:657
msgid "move/rename a branch, even if target exists"
msgstr "移動/重新命名一個分支，即使目標已存在"
-#: builtin/branch.c:657
+#: builtin/branch.c:658
msgid "copy a branch and its reflog"
msgstr "複製一個分支和它的引用日誌"
-#: builtin/branch.c:658
+#: builtin/branch.c:659
msgid "copy a branch, even if target exists"
msgstr "複製一個分支，即使目標已存在"
-#: builtin/branch.c:659
+#: builtin/branch.c:660
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:660
+#: builtin/branch.c:661
msgid "show current branch name"
msgstr "顯示目前分支名"
-#: builtin/branch.c:661
+#: builtin/branch.c:662
msgid "create the branch's reflog"
msgstr "建立分支的引用日誌"
-#: builtin/branch.c:663
+#: builtin/branch.c:664
msgid "edit the description for the branch"
msgstr "標記分支的描述"
-#: builtin/branch.c:664
+#: builtin/branch.c:665
msgid "force creation, move/rename, deletion"
msgstr "強制建立、移動/重新命名、刪除"
-#: builtin/branch.c:665
+#: builtin/branch.c:666
msgid "print only branches that are merged"
msgstr "只列印已經合併的分支"
-#: builtin/branch.c:666
+#: builtin/branch.c:667
msgid "print only branches that are not merged"
msgstr "只列印尚未合併的分支"
-#: builtin/branch.c:667
+#: builtin/branch.c:668
msgid "list branches in columns"
msgstr "以列的方式顯示分支"
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
msgid "object"
msgstr "物件"
-#: builtin/branch.c:670
+#: builtin/branch.c:671
msgid "print only branches of the object"
msgstr "只列印指向該物件的分支"
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
msgid "sorting and filtering are case insensitive"
msgstr "排序和過濾屬於大小寫不敏感"
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "輸出格式"
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 沒有位於 /refs/heads 之下！"
-#: builtin/branch.c:719
+#: builtin/branch.c:720
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不相容"
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
msgid "branch name required"
msgstr "必須提供分支名"
-#: builtin/branch.c:766
+#: builtin/branch.c:768
msgid "Cannot give description to detached HEAD"
msgstr "不能向分離開頭指標提供描述"
-#: builtin/branch.c:771
+#: builtin/branch.c:773
msgid "cannot edit description of more than one branch"
msgstr "不能為一個以上的分支編輯描述"
-#: builtin/branch.c:778
+#: builtin/branch.c:780
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚無提交。"
-#: builtin/branch.c:781
+#: builtin/branch.c:783
#, c-format
msgid "No branch named '%s'."
msgstr "沒有分支 '%s'。"
-#: builtin/branch.c:796
+#: builtin/branch.c:798
msgid "too many branches for a copy operation"
msgstr "為複製動作提供了太多的分支名"
-#: builtin/branch.c:805
+#: builtin/branch.c:807
msgid "too many arguments for a rename operation"
msgstr "為重新命名動作提供了太多的參數"
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "too many arguments to set new upstream"
msgstr "為設定新上游提供了太多的參數"
-#: builtin/branch.c:814
+#: builtin/branch.c:816
#, 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:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
#, c-format
msgid "no such branch '%s'"
msgstr "沒有此分支 '%s'"
-#: builtin/branch.c:821
+#: builtin/branch.c:823
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:834
+#: builtin/branch.c:836
msgid "too many arguments to unset upstream"
msgstr "為取消上游設定動作提供了太多的參數"
-#: builtin/branch.c:838
+#: builtin/branch.c:840
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
-#: builtin/branch.c:844
+#: builtin/branch.c:846
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 沒有上游訊息"
-#: builtin/branch.c:854
+#: builtin/branch.c:856
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
@@ -11466,39 +11746,39 @@
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:858
+#: builtin/branch.c:860
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
msgid "git version:\n"
msgstr "git 版本：\n"
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
msgid "compiler info: "
msgstr "編譯器資訊： "
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
msgid "libc info: "
msgstr "libc 資訊： "
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
msgid "not run from a git repository - no hooks to show\n"
msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
@@ -11532,38 +11812,33 @@
"請檢閱臭蟲報告下方的剩餘部分。\n"
"您可刪除任何您不想分享的地方。\n"
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
msgid "specify a destination for the bugreport file"
msgstr "請指定 bugreport 檔案的目的地"
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
msgid "specify a strftime format suffix for the filename"
msgstr "請指定檔案名稱的 strftime 格式後綴"
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "無法建立 '%s' 的前置目錄"
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
msgid "System Info"
msgstr "系統資訊"
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
msgid "Enabled Hooks"
msgstr "啟用的掛鉤"
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "不要在「%s」建立新檔案"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
#, c-format
msgid "unable to write to %s"
msgstr "無法寫入 %s"
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "已在「%s」建立新報告。\n"
@@ -11578,59 +11853,59 @@
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git bundle list-heads <檔案> [<參考名稱>...]"
+msgstr "git bundle list-heads <檔案> [<引用名稱>...]"
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
+msgstr "git bundle unbundle <檔案> [<引用名稱>...]"
-#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
msgid "do not show progress meter"
msgstr "不顯示進度表"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
msgid "show progress meter"
msgstr "顯示進度表"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
msgid "show progress meter during object writing phase"
msgstr "在物件寫入階段顯示進度表"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
msgid "similar to --all-progress when progress meter is shown"
msgstr "當進度表顯示時類似於 --all-progress"
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
msgid "specify bundle format version"
msgstr "指定包格式版本"
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
msgstr "需要一個版本庫來建立包。"
-#: builtin/bundle.c:109
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "不顯示包 (bundle) 詳細資訊"
-#: builtin/bundle.c:128
+#: builtin/bundle.c:126
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:179
+#: builtin/bundle.c:182
msgid "Need a repository to unbundle."
-msgstr "需要一個版本庫來解包。"
+msgstr "需要版本庫才能拆分。"
-#: builtin/bundle.c:191 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "詳細輸出；必須置於子指令之前"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "正在解包物件"
-#: builtin/bundle.c:213 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子指令：%s"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:622
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11638,7 +11913,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
-#: builtin/cat-file.c:597
+#: builtin/cat-file.c:623
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
@@ -11646,71 +11921,71 @@
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:618
+#: builtin/cat-file.c:644
msgid "only one batch option may be specified"
msgstr "只能指定一個批次處理選項"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:662
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<類型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:663
msgid "show object type"
msgstr "顯示物件類型"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:664
msgid "show object size"
msgstr "顯示物件大小"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:666
msgid "exit with zero when there's no error"
msgstr "當沒有錯誤時離開並返回零"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:667
msgid "pretty-print object's content"
msgstr "美觀地列印物件的內容"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:669
msgid "for blob objects, run textconv on object's content"
msgstr "對於資料物件，對其內容做文字轉換"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:671
msgid "for blob objects, run filters on object's content"
msgstr "對於資料物件，對其內容做過濾"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:672
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:673
msgid "use a specific path for --textconv/--filters"
msgstr "對於 --textconv/--filters 使用一個特定的路徑"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:675
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允許 -s 和 -t 對損壞的物件生效"
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:676
msgid "buffer --batch output"
msgstr "緩衝 --batch 的輸出"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:678
msgid "show info and content of objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息和內容"
-#: builtin/cat-file.c:656
+#: builtin/cat-file.c:682
msgid "show info about objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息"
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:686
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:688
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:690
msgid "do not order --batch-all-objects output"
msgstr "不要對 --batch-all-objects 的輸出排序"
@@ -11730,7 +12005,7 @@
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
msgid "read file names from stdin"
msgstr "從標準輸入讀出檔案名"
@@ -11738,8 +12013,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
msgid "suppress progress reporting"
msgstr "不顯示進度報告"
@@ -11797,11 +12072,10 @@
msgstr "git checkout--worker [<選項>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1892
-#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
-#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
-#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
-#: builtin/worktree.c:728
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
+#: builtin/worktree.c:492 builtin/worktree.c:729
msgid "string"
msgstr "字串"
@@ -11949,11 +12223,11 @@
msgid "path '%s' is unmerged"
msgstr "路徑 '%s' 未合併"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:736
msgid "you need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/checkout.c:788
+#: builtin/checkout.c:786
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11962,51 +12236,51 @@
"不能繼續，下列檔案有暫存的修改：\n"
"%s"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:879
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:921
msgid "HEAD is now at"
msgstr "HEAD 目前位於"
-#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:931
+#: builtin/checkout.c:929
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重設分支 '%s'\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:932
#, c-format
msgid "Already on '%s'\n"
msgstr "已經位於 '%s'\n"
-#: builtin/checkout.c:938
+#: builtin/checkout.c:936
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切換並重設分支 '%s'\n"
-#: builtin/checkout.c:940 builtin/checkout.c:1371
+#: builtin/checkout.c:938 builtin/checkout.c:1369
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切換到一個新分支 '%s'\n"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:940
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切換到分支 '%s'\n"
# 譯者：請維持前導空格
-#: builtin/checkout.c:993
+#: builtin/checkout.c:991
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 個。\n"
-#: builtin/checkout.c:999
+#: builtin/checkout.c:997
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12023,7 +12297,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1016
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12044,19 +12318,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1053
+#: builtin/checkout.c:1051
msgid "internal error in revision walk"
msgstr "在版本遍歷時遇到內部錯誤"
-#: builtin/checkout.c:1057
+#: builtin/checkout.c:1055
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1097 builtin/checkout.c:1366
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
msgid "You are on a branch yet to be born"
msgstr "您位於一個尚未初始化的分支"
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1177
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -12065,7 +12339,7 @@
"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
"請使用 --（和可選的 --no-guess）來消除歧義"
-#: builtin/checkout.c:1186
+#: builtin/checkout.c:1184
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12084,51 +12358,51 @@
"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1194
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1260
msgid "only one reference expected"
msgstr "預期只有一個引用"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1277
#, c-format
msgid "only one reference expected, %d given."
msgstr "應只有一個引用，卻提供了 %d 個。"
-#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
#, c-format
msgid "invalid reference: %s"
msgstr "無效引用：%s"
-#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一個樹：%s"
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1383
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一個分支，得到標籤 '%s'"
-#: builtin/checkout.c:1387
+#: builtin/checkout.c:1385
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一個分支，得到遠端分支 '%s'"
-#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一個分支，得到 '%s'"
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1389
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一個分支，得到提交 '%s'"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12136,7 +12410,7 @@
"不能在合併時切換分支\n"
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1409
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12144,7 +12418,7 @@
"不能在 am 工作階段期間切換分支\n"
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1413
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12152,7 +12426,7 @@
"不能在重定基底時切換分支\n"
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1417
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12160,7 +12434,7 @@
"不能在揀選時切換分支\n"
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1421
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12168,208 +12442,208 @@
"不能在還原時切換分支\n"
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1427
+#: builtin/checkout.c:1425
msgid "you are switching branch while bisecting"
msgstr "您在執行二分搜尋時切換分支"
-#: builtin/checkout.c:1434
+#: builtin/checkout.c:1432
msgid "paths cannot be used with switching branches"
msgstr "路徑不能和切換分支同時使用"
-#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切換分支同時使用"
-#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
-#: builtin/checkout.c:1460 builtin/checkout.c:1465
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同時使用"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1460
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不帶 <起始點>"
-#: builtin/checkout.c:1470
+#: builtin/checkout.c:1468
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切換分支到一個非提交 '%s'"
-#: builtin/checkout.c:1477
+#: builtin/checkout.c:1475
msgid "missing branch or commit argument"
msgstr "缺少分支或提交參數"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1518
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支執行三方合併"
-#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style"
msgstr "風格"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1520
msgid "conflict style (merge or diff3)"
msgstr "衝突輸出風格（merge 或 diff3）"
-#: builtin/checkout.c:1534 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
msgid "detach HEAD at named commit"
msgstr "HEAD 從指定的提交分離"
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1533
msgid "set upstream info for new branch"
msgstr "為新的分支設定上游訊息"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "force checkout (throw away local modifications)"
msgstr "強制簽出（捨棄本機修改）"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1537
msgid "new unparented branch"
msgstr "新的沒有父提交的分支"
-#: builtin/checkout.c:1541 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
msgid "update ignored files (default)"
msgstr "更新忽略的檔案（預設）"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1542
msgid "do not check if another worktree is holding the given ref"
msgstr "不檢查指定的引用是否被其他工作區所占用"
-#: builtin/checkout.c:1557
+#: builtin/checkout.c:1555
msgid "checkout our version for unmerged files"
msgstr "對尚未合併的檔案簽出我們的版本"
-#: builtin/checkout.c:1560
+#: builtin/checkout.c:1558
msgid "checkout their version for unmerged files"
msgstr "對尚未合併的檔案簽出他們的版本"
-#: builtin/checkout.c:1564
+#: builtin/checkout.c:1562
msgid "do not limit pathspecs to sparse entries only"
msgstr "對路徑不做稀疏簽出的限制"
-#: builtin/checkout.c:1622
+#: builtin/checkout.c:1620
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1626
+#: builtin/checkout.c:1624
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1663
+#: builtin/checkout.c:1661
msgid "--track needs a branch name"
msgstr "--track 需要一個分支名"
-#: builtin/checkout.c:1668
+#: builtin/checkout.c:1666
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名稱，請嘗試 -%c"
-#: builtin/checkout.c:1700
+#: builtin/checkout.c:1698
#, c-format
msgid "could not resolve %s"
msgstr "無法解析 %s"
-#: builtin/checkout.c:1716
+#: builtin/checkout.c:1714
msgid "invalid path specification"
msgstr "無效的路徑規格"
-#: builtin/checkout.c:1723
+#: builtin/checkout.c:1721
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1725
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1734
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 與 --detach 不相容"
-#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 與 --patch 不相容"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "you must specify path(s) to restore"
msgstr "您必須指定一個要復原的路徑"
-#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
-#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2736
-#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
+#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
+#: builtin/worktree.c:487
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1782
msgid "create and checkout a new branch"
msgstr "建立並簽出一個新的分支"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create/reset and checkout a branch"
msgstr "建立/重設並簽出一個分支"
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1785
msgid "create reflog for new branch"
msgstr "為新的分支建立引用日誌"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜測 'git checkout <無此分支>'（預設）"
-#: builtin/checkout.c:1790
+#: builtin/checkout.c:1788
msgid "use overlay mode (default)"
msgstr "使用疊加模式（預設）"
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1833
msgid "create and switch to a new branch"
msgstr "建立並切換一個新分支"
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
msgid "create/reset and switch to a branch"
msgstr "建立/重設並切換一個分支"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜測 'git switch <無此分支>'"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
msgid "throw away local modifications"
msgstr "捨棄本機修改"
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1873
msgid "which tree-ish to checkout from"
msgstr "要簽出哪一個樹"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "restore the index"
msgstr "復原索引"
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
msgid "restore the working tree (default)"
msgstr "復原工作區（預設）"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
msgid "ignore unmerged entries"
msgstr "忽略未合併條目"
-#: builtin/checkout.c:1882
+#: builtin/checkout.c:1880
msgid "use overlay mode"
msgstr "使用疊加模式"
@@ -12508,8 +12782,8 @@
msgstr "刪除整個目錄"
#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
@@ -12596,19 +12870,20 @@
msgid "directory from which templates will be used"
msgstr "範本目錄將被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
-#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
msgid "reference repository"
-msgstr "參考版本庫"
+msgstr "引用版本庫"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1901
-#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
msgid "use --reference only while cloning"
msgstr "僅在複製時參考 --reference 指向的本機版本庫"
#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
+#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名稱"
@@ -12624,8 +12899,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "遠端 git-upload-pack 路徑"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
@@ -12633,8 +12908,8 @@
msgid "create a shallow clone of that depth"
msgstr "建立一個指定深度的淺複製"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
msgid "time"
msgstr "時間"
@@ -12643,16 +12918,16 @@
msgstr "建立從指定時間到現在的淺複製"
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision"
msgstr "修訂版"
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1911
-#: builtin/submodule--helper.c:2369
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
msgid "clone only one branch, HEAD or --branch"
msgstr "只複製一個分支、HEAD 或 --branch"
@@ -12681,21 +12956,21 @@
msgstr "在新版本庫中設定設定訊息"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 位址"
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 位址"
@@ -12708,50 +12983,42 @@
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案"
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"無法猜到目錄名。\n"
-"請在指令列指定一個目錄"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能為 '%s' 新增一個備用：%s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:304
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
-#: builtin/clone.c:436
+#: builtin/clone.c:322
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "無法在 '%s' 上啟動疊代器"
-#: builtin/clone.c:467
+#: builtin/clone.c:353
#, c-format
msgid "failed to create link '%s'"
msgstr "建立連結 '%s' 失敗"
-#: builtin/clone.c:471
+#: builtin/clone.c:357
#, c-format
msgid "failed to copy file to '%s'"
msgstr "複製檔案至 '%s' 失敗"
-#: builtin/clone.c:476
+#: builtin/clone.c:362
#, c-format
msgid "failed to iterate over '%s'"
msgstr "無法在 '%s' 上疊代"
-#: builtin/clone.c:503
+#: builtin/clone.c:389
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:517
+#: builtin/clone.c:403
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12761,148 +13028,148 @@
"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n"
"'git restore --source=HEAD :/' 重試\n"
-#: builtin/clone.c:594
+#: builtin/clone.c:480
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "找不到要複製的遠端分支 %s。"
-#: builtin/clone.c:713
+#: builtin/clone.c:597
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:761
+#: builtin/clone.c:645
msgid "failed to initialize sparse-checkout"
msgstr "無法初始化稀疏簽出"
-#: builtin/clone.c:784
+#: builtin/clone.c:668
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n"
-#: builtin/clone.c:816
+#: builtin/clone.c:701
msgid "unable to checkout working tree"
msgstr "不能簽出工作區"
-#: builtin/clone.c:894
+#: builtin/clone.c:779
msgid "unable to write parameters to config file"
msgstr "無法將參數寫入設定檔案"
-#: builtin/clone.c:957
+#: builtin/clone.c:842
msgid "cannot repack to clean up"
msgstr "無法執行 repack 來清理"
-#: builtin/clone.c:959
+#: builtin/clone.c:844
msgid "cannot unlink temporary alternates file"
msgstr "無法刪除暫時的 alternates 檔案"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "太多參數。"
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
msgid "You must specify a repository to clone."
msgstr "您必須指定要複製的版本庫。"
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 選項不相容。"
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 選項不相容。"
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本庫 '%s' 不存在"
-#: builtin/clone.c:1039 builtin/fetch.c:2014
+#: builtin/clone.c:924 builtin/fetch.c:2029
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一個正數"
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"
+msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。"
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作區 '%s' 已經存在。"
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能為 '%s' 建立先導目錄"
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能建立工作區目錄 '%s'"
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "複製到純版本庫 '%s'...\n"
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正複製到 '%s'...\n"
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一個有效的遠端名稱"
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。"
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。"
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。"
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --filter。請改用 file:// 協定。"
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
-msgstr "源版本庫是淺複製，忽略 --local"
+msgstr "來源版本庫是淺複製，忽略 --local"
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1324 builtin/clone.c:1383
+#: builtin/clone.c:1216 builtin/clone.c:1276
msgid "remote transport reported error"
msgstr "遠端傳輸回報錯誤"
-#: builtin/clone.c:1336 builtin/clone.c:1344
+#: builtin/clone.c:1228 builtin/clone.c:1239
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "遠端分支 %s 在上游 %s 未發現"
-#: builtin/clone.c:1347
+#: builtin/clone.c:1242
msgid "You appear to have cloned an empty repository."
msgstr "您複製的版本庫似乎是空的。"
@@ -12938,14 +13205,14 @@
msgid "--command must be the first argument"
msgstr "--command 必須是第一個參數"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
"[no-]progress]"
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -12955,93 +13222,91 @@
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "目錄"
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
msgid "the object directory to store the graph"
msgstr "儲存圖形的物件目錄"
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交圖形被分割，只驗證頭一個檔案"
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "無法開啟提交圖形 '%s'"
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "無法識別的 --split 參數，%s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
#, c-format
msgid "unexpected non-hex object ID: %s"
msgstr "非期望的非十六進位物件 ID：%s"
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
#, c-format
msgid "invalid object: %s"
msgstr "物件無效：%s"
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
msgid "start walk at all refs"
msgstr "開始遍歷所有引用"
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
msgid "scan pack-indexes listed by stdin for commits"
msgstr "從標準輸入中的包索引檔案列表中掃描提交"
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
msgid "start walk at commits listed by stdin"
msgstr "從標準輸入中的提交開始掃描"
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 檔案中已有所有提交"
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
msgid "enable computation for changed paths"
msgstr "啟用已變更路徑的計算"
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
msgid "allow writing an incremental commit-graph file"
msgstr "允許寫一個增量提交圖形檔案"
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本分割提交圖形中的最大提交數"
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一個分割提交圖形的兩個級別之間的最大比率"
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
msgid "only expire files older than a given date-time"
msgstr "只將舊於指定日期與時間的檔案設為過期"
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
msgid "maximum number of changed-path Bloom filters to compute"
msgstr "變更路徑的布隆過濾器要計算的最大量"
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
msgid "Collecting commits from input"
msgstr "正在從輸入收集提交"
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未識別的子指令：%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13055,70 +13320,65 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重複的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
#, c-format
msgid "not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：無法開啟 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree：無法讀取 '%s'"
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree：無法關閉 '%s'"
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
msgid "parent"
msgstr "父提交"
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
msgid "id of a parent commit object"
msgstr "父提交物件 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
-#: builtin/tag.c:456
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/tag.c:454
msgid "message"
msgstr "訊息"
-#: builtin/commit-tree.c:115 builtin/commit.c:1624
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "提交說明"
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
msgid "read commit log message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交簽名"
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
msgid "must give exactly one tree"
msgstr "必須精確地提供一個樹"
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
msgid "git commit-tree: failed to read"
msgstr "git commit-tree：讀取失敗"
-#: builtin/commit.c:41
+#: builtin/commit.c:42
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:46
+#: builtin/commit.c:47
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:51
+#: builtin/commit.c:52
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"
@@ -13127,7 +13387,7 @@
"您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n"
"--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n"
-#: builtin/commit.c:56
+#: builtin/commit.c:57
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -13141,15 +13401,15 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:64
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "否則，請使用 'git rebase --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:67
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否則，請使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid ""
"and then use:\n"
"\n"
@@ -13170,115 +13430,115 @@
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:324
+#: builtin/commit.c:325
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 樹狀物件失敗"
-#: builtin/commit.c:360
+#: builtin/commit.c:361
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
-#: builtin/commit.c:374
+#: builtin/commit.c:375
msgid "No paths with --include/--only does not make sense."
msgstr "參數 --include/--only 不跟路徑沒有意義。"
-#: builtin/commit.c:386
+#: builtin/commit.c:387
msgid "unable to create temporary index"
msgstr "不能建立暫時索引"
-#: builtin/commit.c:395
+#: builtin/commit.c:396
msgid "interactive add failed"
msgstr "互動式新增失敗"
-#: builtin/commit.c:410
+#: builtin/commit.c:411
msgid "unable to update temporary index"
msgstr "無法更新暫時索引"
-#: builtin/commit.c:412
+#: builtin/commit.c:413
msgid "Failed to update main cache tree"
msgstr "不能更新樹的主快取"
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
msgid "unable to write new_index file"
msgstr "無法寫 new_index 檔案"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "cannot do a partial commit during a merge."
msgstr "在合併過程中不能做部分提交。"
-#: builtin/commit.c:491
+#: builtin/commit.c:492
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在揀選過程中不能做部分提交。"
-#: builtin/commit.c:493
+#: builtin/commit.c:494
msgid "cannot do a partial commit during a rebase."
msgstr "在重定基底過程中不能做部分提交。"
-#: builtin/commit.c:501
+#: builtin/commit.c:502
msgid "cannot read the index"
msgstr "無法讀取索引"
-#: builtin/commit.c:520
+#: builtin/commit.c:521
msgid "unable to write temporary index file"
msgstr "無法寫暫時索引檔案"
-#: builtin/commit.c:618
+#: builtin/commit.c:619
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者訊息"
-#: builtin/commit.c:620
+#: builtin/commit.c:621
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式錯誤的作者訊息"
-#: builtin/commit.c:639
+#: builtin/commit.c:640
msgid "malformed --author parameter"
msgstr "格式錯誤的 --author 參數"
-#: builtin/commit.c:692
+#: builtin/commit.c:693
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查詢提交 %s"
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正從標準輸入中讀取日誌訊息）\n"
-#: builtin/commit.c:760
+#: builtin/commit.c:761
msgid "could not read log from standard input"
msgstr "不能從標準輸入中讀取日誌訊息"
-#: builtin/commit.c:764
+#: builtin/commit.c:765
#, c-format
msgid "could not read log file '%s'"
msgstr "不能讀取日誌檔案 '%s'"
-#: builtin/commit.c:801
+#: builtin/commit.c:802
#, c-format
msgid "cannot combine -m with --fixup:%s"
msgstr "-m 和 --fixup:%s 不可結合使用"
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
msgid "could not read SQUASH_MSG"
msgstr "不能讀取 SQUASH_MSG"
-#: builtin/commit.c:820
+#: builtin/commit.c:821
msgid "could not read MERGE_MSG"
msgstr "不能讀取 MERGE_MSG"
-#: builtin/commit.c:880
+#: builtin/commit.c:881
msgid "could not write commit template"
msgstr "不能寫提交範本"
-#: builtin/commit.c:893
+#: builtin/commit.c:894
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13287,7 +13547,7 @@
"請輸入描述您變更的提交訊息。\n"
"開頭是「%c」的行皆會忽略。\n"
-#: builtin/commit.c:895
+#: builtin/commit.c:896
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13296,7 +13556,7 @@
"請輸入描述您變更的提交訊息。開頭是「%c」\n"
"的行皆會忽略。提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:899
+#: builtin/commit.c:900
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13305,7 +13565,7 @@
"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n"
"的行，但也可以自己移除掉這些行。\n"
-#: builtin/commit.c:903
+#: builtin/commit.c:904
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13316,7 +13576,7 @@
"「%c」的行，但也可以自己移除掉這些行。\n"
"提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:915
+#: builtin/commit.c:916
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
@@ -13330,7 +13590,7 @@
"\tgit update-ref -d MERGE_HEAD\n"
"後重試。\n"
-#: builtin/commit.c:920
+#: builtin/commit.c:921
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
@@ -13345,173 +13605,173 @@
"後重試。\n"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:947
+#: builtin/commit.c:948
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:955
+#: builtin/commit.c:956
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:962
+#: builtin/commit.c:963
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:980
+#: builtin/commit.c:981
msgid "Cannot read index"
msgstr "無法讀取索引"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1026
msgid "unable to pass trailers to --trailers"
msgstr "無法將尾部署名傳遞至 --trailers"
-#: builtin/commit.c:1065
+#: builtin/commit.c:1066
msgid "Error building trees"
msgstr "無法建立樹狀物件"
-#: builtin/commit.c:1079 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
-#: builtin/commit.c:1123
+#: builtin/commit.c:1124
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1138
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "無效的忽略模式 '%s'"
-#: builtin/commit.c:1155 builtin/commit.c:1448
+#: builtin/commit.c:1156 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "無效的未追蹤檔案參數 '%s'"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1196
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 選項不相容"
-#: builtin/commit.c:1226
+#: builtin/commit.c:1227
msgid "You are in the middle of a merge -- cannot reword."
msgstr "正在合併中——不能重新輸入。"
-#: builtin/commit.c:1228
+#: builtin/commit.c:1229
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "正在揀選中——不能重新輸入。"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1232
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合"
-#: builtin/commit.c:1233
+#: builtin/commit.c:1234
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
msgstr ""
"--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥"
-#: builtin/commit.c:1252
+#: builtin/commit.c:1253
msgid "Using both --reset-author and --author does not make sense"
msgstr "同時使用 --reset-author 和 --author 沒有意義"
-#: builtin/commit.c:1261
+#: builtin/commit.c:1260
msgid "You have nothing to amend."
msgstr "您沒有可修補的提交。"
-#: builtin/commit.c:1264
+#: builtin/commit.c:1263
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正處於一個合併過程中 -- 無法修補提交。"
-#: builtin/commit.c:1266
+#: builtin/commit.c:1265
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
-#: builtin/commit.c:1268
+#: builtin/commit.c:1267
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正處於重定基底的過程中 -- 無法修訂。"
-#: builtin/commit.c:1271
+#: builtin/commit.c:1270
msgid "Options --squash and --fixup cannot be used together"
msgstr "選項 --squash 和 --fixup 不能同時使用"
-#: builtin/commit.c:1281
+#: builtin/commit.c:1280
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-#: builtin/commit.c:1283
+#: builtin/commit.c:1282
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-#: builtin/commit.c:1292
+#: builtin/commit.c:1291
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。"
-#: builtin/commit.c:1310
+#: builtin/commit.c:1309
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知選項：--fixup=%s:%s"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
-#: builtin/commit.c:1483 builtin/commit.c:1652
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "以簡潔的格式顯示狀態"
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "顯示分支訊息"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "顯示儲藏區訊息"
-#: builtin/commit.c:1489 builtin/commit.c:1656
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "計算完整的領先/落後值"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1493
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
msgid "machine-readable output"
msgstr "機器可讀的輸出"
-#: builtin/commit.c:1494 builtin/commit.c:1660
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "以長格式顯示狀態（預設）"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "條目以 NUL 字元結尾"
-#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13519,201 +13779,201 @@
"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值："
"traditional）"
-#: builtin/commit.c:1506 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
msgid "when"
msgstr "何時"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "以列的方式顯示未追蹤的檔案"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "不檢測重新命名"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "檢測重新命名，可以設定索引相似度"
-#: builtin/commit.c:1535
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支援已忽略和未追蹤檔案參數的組合"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "提交成功後不顯示概述訊息"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "在提交說明範本裡顯示差異"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "提交說明選項"
-#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
msgid "read message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "提交時覆蓋作者"
-#: builtin/commit.c:1623 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "重用並編輯指定提交的提交說明"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交說明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1631
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交"
-#: builtin/commit.c:1632
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"
-#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "加入自訂尾部署名"
-#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "在結尾加入 Signed-off-by"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "使用指定的範本檔案"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "強制編輯提交"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "在提交說明範本裡包含狀態訊息"
-#: builtin/commit.c:1644
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "提交內容選項"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "提交所有改動的檔案"
-#: builtin/commit.c:1646
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "新增指定的檔案到索引區等待提交"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "互動式新增檔案"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "互動式新增變更"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "只提交指定的檔案"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "顯示將要提交的內容"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "繞過 post-rewrite 掛鉤"
-#: builtin/commit.c:1672
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "允許一個空提交"
-#: builtin/commit.c:1674
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "允許空的提交說明"
-#: builtin/commit.c:1750
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "損壞的 MERGE_HEAD 檔案（%s）"
-#: builtin/commit.c:1757
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "不能讀取 MERGE_MODE"
-#: builtin/commit.c:1778
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "不能讀取提交說明：%s"
-#: builtin/commit.c:1785
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "終止提交因為提交說明為空。\n"
-#: builtin/commit.c:1790
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "終止提交；您未更改來自範本的提交說明。\n"
-#: builtin/commit.c:1801
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "提交說明內文空白，中止提交作業。\n"
-#: builtin/commit.c:1837
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -13781,7 +14041,7 @@
#: builtin/config.c:140
msgid "get values for regexp: name-regex [value-pattern]"
-msgstr "根據正規表示式取得值：name-regex [value-pattern]"
+msgstr "根據常規表示式取得值：name-regex [value-pattern]"
#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
@@ -13979,7 +14239,7 @@
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n"
+"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n"
"詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"
#: builtin/config.c:743
@@ -14037,7 +14297,7 @@
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"無法用一個值覆蓋多個值\n"
-" 使用一個正規表示式、--add 或 --replace-all 來修改 %s。"
+" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"
#: builtin/config.c:943 builtin/config.c:954
#, c-format
@@ -14073,7 +14333,7 @@
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援"
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
msgid "credential-cache unavailable; no unix socket support"
msgstr "credential-cache 無法使用；缺少 unix socket 支援"
@@ -14273,7 +14533,7 @@
msgid "Not a git repository"
msgstr "不是一個 git 版本庫"
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了無效物件 '%s'。"
@@ -14297,111 +14557,111 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失敗：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
#, c-format
msgid "could not read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink file %s"
msgstr "無法讀取符號連結檔案 %s"
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
msgstr ""
-"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--"
-"cc'）。"
+"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n"
+"採用組合差異格式（'-c' 和 '--cc'）。"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "工作區檔案被留了下來。"
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "暫存檔存在於 '%s'。"
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者復原它們。"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "失敗：%d"
+
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "執行一個全目錄差異比較"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "啟動差異比較工具之前不提示"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符號連結"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:706
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差異比較工具"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "顯示可以用在 `--tool` 參數後的差異工具列表"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
"code"
msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開"
-#: builtin/difftool.c:718
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一個用於檢視差異的自訂指令"
-#: builtin/difftool.c:719
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "傳遞給 `diff`"
-#: builtin/difftool.c:734
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作區或者 --no-index"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不相容"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:752
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr "沒有為 --tool=<工具> 參數提供 <工具>"
-#: builtin/difftool.c:759
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
@@ -14409,7 +14669,7 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
msgid "type"
msgstr "類型"
@@ -14437,95 +14697,95 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
msgid "--anonymize-map token cannot be empty"
msgstr "--anonymize-map 的鍵不能空白"
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "在 <n> 個物件之後顯示進度"
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "選擇如何處理簽名標籤"
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "選擇使用備用編碼處理提交說明"
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
msgid "dump marks to this file"
msgstr "把標記傾印到這個檔案"
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
msgid "import marks from this file"
msgstr "從這個檔案匯入標記"
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
msgid "import marks from this file if it exists"
msgstr "如果這個檔案存在，則從檔案匯入標記"
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
msgid "fake a tagger when tags lack one"
msgstr "當標籤缺少標記者欄位時假裝有一個"
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
msgid "output full tree for each commit"
msgstr "每次提交都輸出整棵樹"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能終止串流"
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
msgid "skip output of blob data"
msgstr "略過資料物件資料的輸出"
-#: builtin/fast-export.c:1222 builtin/log.c:1826
+#: builtin/fast-export.c:1223 builtin/log.c:1826
msgid "refspec"
-msgstr "參照規格"
+msgstr "引用規格"
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
msgid "apply refspec to exported refs"
msgstr "對匯出的引用套用引用規格"
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "匿名輸出"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
msgid "from:to"
msgstr "from:to"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
msgid "convert <from> to <to> in anonymized output"
msgstr "在匿名輸出中將 <from> 轉換為 <to>"
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
msgid "reference parents which are not in fast-export stream by object id"
-msgstr "依物件 ID 參考不在 fast-export 串流中的引用父物件"
+msgstr "依物件 ID 引用不在 fast-export 串流中的父物件"
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
msgid "show original object ids of blobs/commits"
msgstr "顯示資料物件及提交的原始物件 ID"
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
msgid "label tags with mark ids"
msgstr "為包含標記 ID 的標籤打上標記"
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
@@ -14583,23 +14843,23 @@
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "從所有的遠端抓取"
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "為 git pull/fetch 設定上游"
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
#: builtin/fetch.c:151
msgid "use atomic transaction to update references"
-msgstr "使用原子事務更新參考"
+msgstr "使用 atomic 事務更新引用"
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上傳包到遠端的路徑"
@@ -14611,7 +14871,7 @@
msgid "fetch from multiple remotes"
msgstr "從多個遠端抓取"
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的標籤和關聯物件"
@@ -14625,9 +14885,9 @@
#: builtin/fetch.c:164
msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr "修改參考規格 (refspec) 以便將所有參考 (refs) 放置在 refs/prefetch/ 中"
+msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除遠端已經不存在的分支的追蹤分支"
@@ -14636,7 +14896,7 @@
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
# 譯者：可選值，不能翻譯
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
@@ -14646,9 +14906,9 @@
#: builtin/fetch.c:175
msgid "write fetched references to the FETCH_HEAD file"
-msgstr "將取得的參考寫入 FETCH_HEAD 檔案"
+msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下載包"
@@ -14656,16 +14916,16 @@
msgid "allow updating of HEAD ref"
msgstr "允許更新 HEAD 引用"
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "取得淺複製的更多過去歷史記錄"
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基於時間來深化淺複製的歷史"
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "轉換為一個完整的版本庫"
@@ -14679,19 +14939,19 @@
"files)"
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定取得動作的引用映射"
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "報告我們只擁有從該物件開始可以取得的物件"
@@ -14703,7 +14963,7 @@
msgid "run 'maintenance --auto' after fetching"
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上檢查強制更新"
@@ -14713,68 +14973,68 @@
#: builtin/fetch.c:221
msgid "accept refspecs from stdin"
-msgstr "從標準輸入中接受引用表達式"
+msgstr "從標準輸入中接受引用規格"
#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
msgstr "無法發現遠端 HEAD 引用"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "設定變數 fetch.output 包含無效值 %s"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
#, c-format
msgid "object %s not found"
msgstr "物件 %s 未發現"
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
msgid "[rejected]"
msgstr "[已拒絕]"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
msgid "can't fetch in current branch"
msgstr "目前分支下不能執行取得動作"
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
msgid "[tag update]"
msgstr "[標籤更新]"
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
msgid "unable to update local ref"
msgstr "不能更新本機引用"
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
msgid "would clobber existing tag"
msgstr "會破壞現有的標籤"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
msgid "[new tag]"
msgstr "[新標籤]"
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
msgid "forced update"
msgstr "強制更新"
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
msgid "non-fast-forward"
msgstr "非快轉"
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14784,7 +15044,7 @@
"要重新啟用，請使用 '--show-forced-updates' 選項或執行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14795,22 +15055,22 @@
"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n"
"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n"
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未傳送所有必需的物件\n"
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "已拒絕 %s，不允許更新淺複製"
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
#, c-format
msgid "From %.*s\n"
msgstr "來自 %.*s\n"
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14820,145 +15080,150 @@
" 'git remote prune %s' 來刪除舊的、有衝突的分支"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 將成為懸空狀態）"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成為懸空狀態）"
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
msgid "[deleted]"
msgstr "[已刪除]"
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
msgid "(none)"
msgstr "（無）"
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒絕取得到非純版本庫的目前分支 %s"
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的"
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "選項 \"%s\" 為 %s 所忽略\n"
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "%s 物件不存在"
+
+#: builtin/fetch.c:1633
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支，和 --set-upstream 不相容"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "沒有為一個遠端追蹤分支設定上游"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
msgid "not setting upstream for a remote tag"
msgstr "沒有為一個遠端標籤設定上游"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
msgid "unknown branch type"
msgstr "未知的分支類型"
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
-"未發現源分支。\n"
+"找不到來源分支。\n"
"您需要使用 --set-upstream 選項指定一個分支。"
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
#, c-format
msgid "Fetching %s\n"
msgstr "正在取得 %s\n"
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "無法取得 '%s'（離開碼：%d）\n"
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
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:1930
+#: builtin/fetch.c:1945
msgid "You need to specify a tag name."
msgstr "您需要指定一個標籤名稱。"
-#: builtin/fetch.c:1994
+#: builtin/fetch.c:2009
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*"
-#: builtin/fetch.c:1998
+#: builtin/fetch.c:2013
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支援負數深度"
-#: builtin/fetch.c:2000
+#: builtin/fetch.c:2015
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2020
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同時使用"
-#: builtin/fetch.c:2007
+#: builtin/fetch.c:2022
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
-#: builtin/fetch.c:2024
+#: builtin/fetch.c:2039
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
-#: builtin/fetch.c:2026
+#: builtin/fetch.c:2041
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 帶引用規格沒有任何意義"
-#: builtin/fetch.c:2035
+#: builtin/fetch.c:2050
#, c-format
msgid "No such remote or remote group: %s"
msgstr "沒有這樣的遠端或遠端組：%s"
-#: builtin/fetch.c:2042
+#: builtin/fetch.c:2057
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "取得組並指定引用規格沒有意義"
-#: builtin/fetch.c:2058
+#: builtin/fetch.c:2073
msgid "must supply remote when using --negotiate-only"
msgstr "使用 --negotiate-only 時必須提供遠端"
-#: builtin/fetch.c:2063
+#: builtin/fetch.c:2078
msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "協定不支援 --negotiate-only，結束。"
+msgstr "通訊協定不支援 --negotiate-only，結束。"
-#: builtin/fetch.c:2082
+#: builtin/fetch.c:2097
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫"
-#: builtin/fetch.c:2086
+#: builtin/fetch.c:2101
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用"
-#: builtin/fetch.c:2090
+#: builtin/fetch.c:2105
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 只能在取得一個遠端時使用"
@@ -15023,7 +15288,7 @@
msgid "show only <n> matched refs"
msgstr "只顯示 <n> 個符合的引用"
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
@@ -15179,129 +15444,139 @@
msgid "notice: No default references"
msgstr "注意：無預設引用"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：雜湊路徑 (hash-path) 不符，找到的位置：%s"
+
+#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：物件損壞或遺失：%s"
-#: builtin/fsck.c:619
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s：物件屬於「%s」未知類型：%s"
+
+#: builtin/fsck.c:644
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析物件：%s"
-#: builtin/fsck.c:639
+#: builtin/fsck.c:664
#, c-format
msgid "bad sha1 file: %s"
msgstr "壞的 sha1 檔案：%s"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:685
msgid "Checking object directory"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:688
msgid "Checking object directories"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:704
#, c-format
msgid "Checking %s link"
msgstr "正在檢查 %s 連結"
-#: builtin/fsck.c:677 builtin/index-pack.c:864
+#: builtin/fsck.c:709 builtin/index-pack.c:859
#, c-format
msgid "invalid %s"
msgstr "無效的 %s"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:716
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的東西（%s）"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:722
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分離開頭指標的指向不存在"
-#: builtin/fsck.c:694
+#: builtin/fsck.c:726
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:738
msgid "Checking cache tree"
msgstr "正在檢查快取樹"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:743
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中無效的 sha1 指標"
-#: builtin/fsck.c:720
+#: builtin/fsck.c:752
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非樹狀物件"
-#: builtin/fsck.c:751
+#: builtin/fsck.c:783
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<選項>] [<物件>...]"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:789
msgid "show unreachable objects"
msgstr "顯示無法取得的物件"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:790
msgid "show dangling objects"
msgstr "顯示懸空的物件"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:791
msgid "report tags"
msgstr "報告標籤"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:792
msgid "report root nodes"
msgstr "報告根節點"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:793
msgid "make index objects head nodes"
msgstr "將索引亦作為檢查的頭節點"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:794
msgid "make reflogs head nodes (default)"
msgstr "將引用日誌作為檢查的頭節點（預設）"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:795
msgid "also consider packs and alternate objects"
msgstr "也考慮包和備用物件"
-#: builtin/fsck.c:764
+#: builtin/fsck.c:796
msgid "check only connectivity"
msgstr "僅檢查連通性"
-#: builtin/fsck.c:765 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
msgid "enable more strict checking"
msgstr "啟用更嚴格的檢查"
-#: builtin/fsck.c:767
+#: builtin/fsck.c:799
msgid "write dangling objects in .git/lost-found"
msgstr "將懸空物件寫入 .git/lost-found 中"
-#: builtin/fsck.c:768 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
msgid "show progress"
msgstr "顯示進度"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:801
msgid "show verbose names for reachable objects"
msgstr "顯示可以取得物件的詳細名稱"
-#: builtin/fsck.c:828 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在檢查物件"
-#: builtin/fsck.c:856
+#: builtin/fsck.c:889
#, c-format
msgid "%s: object missing"
msgstr "%s：物件缺少"
-#: builtin/fsck.c:867
+#: builtin/fsck.c:900
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "無效的參數：期望 sha1，得到 '%s'"
@@ -15325,7 +15600,7 @@
msgid "cannot stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
#, c-format
msgid "cannot read '%s'"
msgstr "不能讀取 '%s'"
@@ -15334,13 +15609,13 @@
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
-"最後一次 gc 動作報告如下訊息。請檢查原因並刪除 %s。\n"
-"在該檔案被刪除之前，自動清理將不會執行。\n"
+"最後一次 gc 動作回報如下資訊。請檢查原因並刪除 %s\n"
+"等到這個檔案刪除後，自動清理才會繼續執行。\n"
"\n"
"%s"
@@ -15415,147 +15690,187 @@
msgid "unrecognized --schedule argument '%s'"
msgstr "無法識別的 --schedule 引數 '%s'"
-#: builtin/gc.c:869
+#: builtin/gc.c:868
msgid "failed to write commit-graph"
msgstr "無法寫入提交圖形"
-#: builtin/gc.c:905
+#: builtin/gc.c:904
msgid "failed to prefetch remotes"
msgstr "無法預先取得遠端"
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
msgid "failed to start 'git pack-objects' process"
msgstr "無法啟動 ‘git pack-objects’ 處理程序"
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
msgid "failed to finish 'git pack-objects' process"
msgstr "無法完成 ‘git pack-objects’ 處理程序"
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
msgid "failed to write multi-pack-index"
msgstr "無法寫入多包索引"
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
msgid "'git multi-pack-index expire' failed"
msgstr "'git multi-pack-index expire' 失敗"
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
msgid "'git multi-pack-index repack' failed"
msgstr "'git multi-pack-index repack' 失敗"
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用"
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr "已存在 '%s' 鎖定檔案，略過維護"
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
#, c-format
msgid "task '%s' failed"
msgstr "作業 '%s' 失敗"
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
#, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' 非有效作業"
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
#, c-format
msgid "task '%s' cannot be selected multiple times"
msgstr "不能多次選取 '%s' 作業"
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
msgid "run tasks based on the state of the repository"
msgstr "基於版本庫狀態執行作業"
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
msgid "frequency"
msgstr "frequency"
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
msgid "run tasks based on frequency"
msgstr "依據頻率執行工作"
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
msgid "do not report progress or other information over stderr"
msgstr "不要在 stderr 輸出進度或其他資訊"
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
msgid "task"
msgstr "作業"
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
msgid "run a specific task"
msgstr "執行指定作業"
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr "--auto 和 --schedule=<頻率> 請任選一"
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
msgid "failed to run 'git config'"
msgstr "無法執行 ‘git config’"
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
#, c-format
msgid "failed to expand path '%s'"
msgstr "無法展開「%s」路徑"
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
msgid "failed to start launchctl"
msgstr "無法啟動 launchctl"
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
#, c-format
msgid "failed to create directories for '%s'"
msgstr "無法建立「%s」的目錄"
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
#, c-format
msgid "failed to bootstrap service %s"
msgstr "無法啟動載入 %s 服務"
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
msgid "failed to create temp xml file"
msgstr "無法建立暫存 XML 檔案"
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
msgid "failed to start schtasks"
msgstr "無法啟動 schtasks"
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
msgid "failed to open stdin of 'crontab'"
msgstr "無法開啟 ‘crontab’ 的標準輸入"
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
msgid "'crontab' died"
msgstr "“crontab” 結束運作"
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "無法啟動 systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "無法執行 systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "無法識別的 --scheduler 引數 '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "不支援 systemd 計時器或 crontab"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "無法使用 %s 排程器"
+
+#: builtin/gc.c:2432
msgid "another process is scheduling background maintenance"
msgstr "其他處理程序正在排定背景維護工作"
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "scheduler"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "要觸發 git maintenance run 的排程器"
+
+#: builtin/gc.c:2478
msgid "failed to add repo to global config"
msgstr "無法將版本庫加至全域設定"
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
msgid "git maintenance <subcommand> [<options>]"
msgstr "git maintenance <子命令> [<選項>]"
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
#, c-format
msgid "invalid subcommand: %s"
msgstr "無效子命令：%s"
@@ -15564,12 +15879,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]"
-#: builtin/grep.c:223
+#: builtin/grep.c:239
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：無法建立執行緒：%s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
@@ -15578,263 +15893,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
-#: builtin/pack-objects.c:3129
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
#, c-format
msgid "no threads support, ignoring %s"
msgstr "沒有執行緒支援，忽略 %s"
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
#, c-format
msgid "unable to read tree (%s)"
msgstr "無法讀取樹（%s）"
-#: builtin/grep.c:658
+#: builtin/grep.c:672
#, c-format
msgid "unable to grep from object of type %s"
msgstr "無法抓取來自於 %s 類型的物件"
-#: builtin/grep.c:738
+#: builtin/grep.c:752
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "開關 `%c' 期望一個數字值"
-#: builtin/grep.c:837
+#: builtin/grep.c:851
msgid "search in index instead of in the work tree"
msgstr "在索引區搜尋而不是在工作區"
-#: builtin/grep.c:839
+#: builtin/grep.c:853
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的內容中尋找"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/grep.c:841
+#: builtin/grep.c:855
msgid "search in both tracked and untracked files"
msgstr "在追蹤和未追蹤的檔案中搜尋"
-#: builtin/grep.c:843
+#: builtin/grep.c:857
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的檔案"
-#: builtin/grep.c:845
+#: builtin/grep.c:859
msgid "recursively search in each submodule"
msgstr "在每一個子模組中遞迴搜尋"
-#: builtin/grep.c:848
+#: builtin/grep.c:862
msgid "show non-matching lines"
msgstr "顯示未符合的行"
-#: builtin/grep.c:850
+#: builtin/grep.c:864
msgid "case insensitive matching"
msgstr "不區分大小寫符合"
-#: builtin/grep.c:852
+#: builtin/grep.c:866
msgid "match patterns only at word boundaries"
msgstr "只在單詞邊界符合模式"
-#: builtin/grep.c:854
+#: builtin/grep.c:868
msgid "process binary files as text"
msgstr "把二進位檔案當做文字處理"
-#: builtin/grep.c:856
+#: builtin/grep.c:870
msgid "don't match patterns in binary files"
msgstr "不在二進位檔案中符合模式"
-#: builtin/grep.c:859
+#: builtin/grep.c:873
msgid "process binary files with textconv filters"
msgstr "用 textconv 過濾器處理二進位檔案"
-#: builtin/grep.c:861
+#: builtin/grep.c:875
msgid "search in subdirectories (default)"
msgstr "在子目錄中尋找（預設）"
-#: builtin/grep.c:863
+#: builtin/grep.c:877
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下尋找"
-#: builtin/grep.c:867
+#: builtin/grep.c:881
msgid "use extended POSIX regular expressions"
-msgstr "使用擴展的 POSIX 正規表示式"
+msgstr "使用延伸的 POSIX 常規表示式"
-#: builtin/grep.c:870
+#: builtin/grep.c:884
msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 正規表示式（預設）"
+msgstr "使用基本的 POSIX 常規表示式（預設）"
-#: builtin/grep.c:873
+#: builtin/grep.c:887
msgid "interpret patterns as fixed strings"
msgstr "把模式解析為固定的字串"
-#: builtin/grep.c:876
+#: builtin/grep.c:890
msgid "use Perl-compatible regular expressions"
-msgstr "使用 Perl 相容的正規表示式"
+msgstr "使用 Perl 相容的常規表示式"
-#: builtin/grep.c:879
+#: builtin/grep.c:893
msgid "show line numbers"
msgstr "顯示行號"
-#: builtin/grep.c:880
+#: builtin/grep.c:894
msgid "show column number of first match"
msgstr "顯示第一個符合的列號"
-#: builtin/grep.c:881
+#: builtin/grep.c:895
msgid "don't show filenames"
msgstr "不顯示檔案名"
-#: builtin/grep.c:882
+#: builtin/grep.c:896
msgid "show filenames"
msgstr "顯示檔案名"
-#: builtin/grep.c:884
+#: builtin/grep.c:898
msgid "show filenames relative to top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/grep.c:886
+#: builtin/grep.c:900
msgid "show only filenames instead of matching lines"
msgstr "只顯示檔案名而不顯示符合的行"
-#: builtin/grep.c:888
+#: builtin/grep.c:902
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同義"
-#: builtin/grep.c:891
+#: builtin/grep.c:905
msgid "show only the names of files without match"
msgstr "只顯示未符合的檔案名"
-#: builtin/grep.c:893
+#: builtin/grep.c:907
msgid "print NUL after filenames"
msgstr "在檔案名後輸出 NUL 字元"
-#: builtin/grep.c:896
+#: builtin/grep.c:910
msgid "show only matching parts of a line"
msgstr "只顯示行中的符合的部分"
-#: builtin/grep.c:898
+#: builtin/grep.c:912
msgid "show the number of matches instead of matching lines"
msgstr "顯示總符合行數，而不顯示符合的行"
-#: builtin/grep.c:899
+#: builtin/grep.c:913
msgid "highlight matches"
msgstr "高亮顯示符合項"
-#: builtin/grep.c:901
+#: builtin/grep.c:915
msgid "print empty line between matches from different files"
msgstr "在不同檔案的符合項之間列印空行"
-#: builtin/grep.c:903
+#: builtin/grep.c:917
msgid "show filename only once above matches from same file"
msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
-#: builtin/grep.c:906
+#: builtin/grep.c:920
msgid "show <n> context lines before and after matches"
msgstr "顯示符合項前後的 <n> 行上下文"
-#: builtin/grep.c:909
+#: builtin/grep.c:923
msgid "show <n> context lines before matches"
msgstr "顯示符合項前 <n> 行上下文"
-#: builtin/grep.c:911
+#: builtin/grep.c:925
msgid "show <n> context lines after matches"
msgstr "顯示符合項後 <n> 行上下文"
-#: builtin/grep.c:913
+#: builtin/grep.c:927
msgid "use <n> worker threads"
msgstr "使用 <n> 個工作執行緒"
-#: builtin/grep.c:914
+#: builtin/grep.c:928
msgid "shortcut for -C NUM"
msgstr "快捷鍵 -C 數字"
-#: builtin/grep.c:917
+#: builtin/grep.c:931
msgid "show a line with the function name before matches"
msgstr "在符合的前面顯示一行函數名"
-#: builtin/grep.c:919
+#: builtin/grep.c:933
msgid "show the surrounding function"
msgstr "顯示所在函數的前後內容"
-#: builtin/grep.c:922
+#: builtin/grep.c:936
msgid "read patterns from file"
msgstr "從檔案讀取模式"
-#: builtin/grep.c:924
+#: builtin/grep.c:938
msgid "match <pattern>"
msgstr "符合 <模式>"
-#: builtin/grep.c:926
+#: builtin/grep.c:940
msgid "combine patterns specified with -e"
msgstr "組合用 -e 參數設定的模式"
-#: builtin/grep.c:938
+#: builtin/grep.c:952
msgid "indicate hit with exit status without output"
msgstr "不輸出，而用離開碼標記命中狀態"
-#: builtin/grep.c:940
+#: builtin/grep.c:954
msgid "show only matches from files that match all patterns"
msgstr "只顯示符合所有模式的檔案中的符合"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "pager"
msgstr "分頁"
-#: builtin/grep.c:943
+#: builtin/grep.c:957
msgid "show matching files in the pager"
msgstr "分頁顯示符合的檔案"
-#: builtin/grep.c:947
+#: builtin/grep.c:961
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允許呼叫 grep(1)（本次組建忽略）"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1027
msgid "no pattern given"
msgstr "未提供符合模式"
-#: builtin/grep.c:1049
+#: builtin/grep.c:1063
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同時使用"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1071
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1087
+#: builtin/grep.c:1101
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
-#: builtin/grep.c:1091
+#: builtin/grep.c:1105
msgid "invalid option combination, ignoring --threads"
msgstr "無效的選項組合，忽略 --threads"
-#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
msgid "no threads support, ignoring --threads"
msgstr "沒有執行緒支援，忽略 --threads"
-#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的執行緒數無效（%d）"
-#: builtin/grep.c:1131
+#: builtin/grep.c:1145
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 僅用於工作區"
-#: builtin/grep.c:1157
+#: builtin/grep.c:1171
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-#: builtin/grep.c:1160
+#: builtin/grep.c:1174
msgid "--untracked cannot be used with --cached"
msgstr "--untracked 不能與 --cached 一起使用"
-#: builtin/grep.c:1166
+#: builtin/grep.c:1180
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
-#: builtin/grep.c:1174
+#: builtin/grep.c:1188
msgid "both --cached and trees are given"
msgstr "同時給出了 --cached 和樹狀物件"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -15842,95 +16157,107 @@
"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
"[--] <檔案>..."
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
msgid "object type"
msgstr "物件類型"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "write the object into the object database"
msgstr "將物件寫入物件資料庫"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
msgid "read the object from stdin"
msgstr "從標準輸入讀取物件"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
msgid "store file as is without filters"
msgstr "原樣儲存檔案不使用過濾器"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git"
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
msgid "process file as it were from this path"
msgstr "處理檔案並假設其來自於此路徑"
-#: builtin/help.c:47
+#: builtin/help.c:55
msgid "print all available commands"
msgstr "列印所有可用的指令"
-#: builtin/help.c:48
+#: builtin/help.c:57
msgid "exclude guides"
msgstr "排除嚮導"
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "顯示有用的指南列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "列印所有設定變數名稱"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
msgid "show man page"
msgstr "顯示 man 手冊"
-#: builtin/help.c:53
+#: builtin/help.c:59
msgid "show manual in web browser"
msgstr "在 web 瀏覽器中顯示手冊"
-#: builtin/help.c:55
+#: builtin/help.c:61
msgid "show info page"
msgstr "顯示 info 手冊"
-#: builtin/help.c:57
+#: builtin/help.c:63
msgid "print command description"
msgstr "列印指令描述"
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "顯示有用的指南列表"
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "列印所有設定變數名稱"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+" [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
#, c-format
msgid "unrecognized help format '%s'"
msgstr "無法識別的協助格式 '%s'"
-#: builtin/help.c:190
+#: builtin/help.c:223
msgid "Failed to start emacsclient."
msgstr "無法啟動 emacsclient。"
-#: builtin/help.c:203
+#: builtin/help.c:236
msgid "Failed to parse emacsclient version."
msgstr "無法解析 emacsclient 版本。"
-#: builtin/help.c:211
+#: builtin/help.c:244
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
#, c-format
msgid "failed to exec '%s'"
msgstr "執行 '%s' 失敗"
-#: builtin/help.c:307
+#: builtin/help.c:340
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -15939,7 +16266,7 @@
"'%s'：不支援的 man 手冊檢視器的路徑。\n"
"請使用 'man.<工具>.cmd'。"
-#: builtin/help.c:319
+#: builtin/help.c:352
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -15948,325 +16275,316 @@
"'%s': 支援的 man 手冊檢視器指令。\n"
"請使用 'man.<工具>.path'。"
-#: builtin/help.c:436
+#: builtin/help.c:467
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 檢視器。"
-#: builtin/help.c:452
+#: builtin/help.c:483
msgid "no man viewer handled the request"
msgstr "沒有 man 檢視器處理此請求"
-#: builtin/help.c:459
+#: builtin/help.c:490
msgid "no info viewer handled the request"
msgstr "沒有 info 檢視器處理此請求"
-#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的別名"
-#: builtin/help.c:531 git.c:380
+#: builtin/help.c:565 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "壞的 alias.%s 字串：%s"
-#: builtin/help.c:561 builtin/help.c:591
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "本選項不取其他引數"
+
+#: builtin/help.c:602 builtin/help.c:629
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:575
+#: builtin/help.c:624
msgid "'git help config' for more information"
msgstr "'git help config' 取得更多訊息"
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的物件類型不符合"
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "未能取得預期的物件 %s"
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "物件 %s：應為類型 %s，卻是 %s"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "無法填充 %d 位元組"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "過早的檔案結束符（EOF）"
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "輸入上的讀錯誤"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "用掉了超過可用的位元組"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "包太大超過了目前 off_t 的定義"
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "包超過了最大允許值"
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能建立 '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "無法開啟 packfile '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
msgid "pack signature mismatch"
msgstr "包簽名不符合"
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支援包版本 %<PRIu32>"
-#: builtin/index-pack.c:381
+#: builtin/index-pack.c:376
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:487
+#: builtin/index-pack.c:482
#, c-format
msgid "inflate returned %d"
msgstr "解壓縮返回 %d"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:531
msgid "offset value overflow for delta base object"
msgstr "位移值覆蓋了 delta 基準物件"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:539
msgid "delta base offset is out of bound"
msgstr "delta 基準位移越界"
-#: builtin/index-pack.c:552
+#: builtin/index-pack.c:547
#, c-format
msgid "unknown object type %d"
msgstr "未知物件類型 %d"
-#: builtin/index-pack.c:583
+#: builtin/index-pack.c:578
msgid "cannot pread pack file"
msgstr "無法讀取包檔案"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:580
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組"
-#: builtin/index-pack.c:611
+#: builtin/index-pack.c:606
msgid "serious inflate inconsistency"
msgstr "解壓縮嚴重的不一致"
-#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
-#: builtin/index-pack.c:825 builtin/index-pack.c:834
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "發現 %s 出現 SHA1 衝突！"
-#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "不能讀 %s"
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:818
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能讀取現存物件訊息 %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:826
#, c-format
msgid "cannot read existing object %s"
msgstr "不能讀取現存物件 %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid blob object %s"
msgstr "無效的資料物件 %s"
-#: builtin/index-pack.c:848 builtin/index-pack.c:867
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
msgid "fsck error in packed object"
msgstr "對打包物件 fsck 檢查發生錯誤"
-#: builtin/index-pack.c:869
+#: builtin/index-pack.c:864
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子物件並非都可以取得"
-#: builtin/index-pack.c:930 builtin/index-pack.c:977
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
msgid "failed to apply delta"
msgstr "套用 delta 失敗"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Receiving objects"
msgstr "接收物件中"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1156
msgid "Indexing objects"
msgstr "索引物件中"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1190
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包衝突（SHA1 不符合）"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1195
msgid "cannot fstat packfile"
msgstr "不能對 packfile 呼叫 fstat"
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1198
msgid "pack has junk at the end"
msgstr "包的結尾有垃圾資料"
-#: builtin/index-pack.c:1214
+#: builtin/index-pack.c:1210
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的問題"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1233
msgid "Resolving deltas"
msgstr "處理 delta 中"
-#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
#, c-format
msgid "unable to create thread: %s"
msgstr "不能建立執行緒：%s"
-#: builtin/index-pack.c:1281
+#: builtin/index-pack.c:1277
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1283
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 個本機物件"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1295
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1299
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 個未解決的 delta"
-#: builtin/index-pack.c:1327
+#: builtin/index-pack.c:1323
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能壓縮附加物件（%d）"
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1419
#, c-format
msgid "local object %s is corrupt"
msgstr "本機物件 %s 已損壞"
-#: builtin/index-pack.c:1444
+#: builtin/index-pack.c:1440
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "packfile 名稱「%s」的結尾不是「.%s」"
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1464
#, c-format
msgid "cannot write %s file '%s'"
msgstr "無法寫入 %s 檔案 '%s'"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1472
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "無法關閉已寫入的 %s 檔案 '%s'"
-#: builtin/index-pack.c:1502
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」"
+
+#: builtin/index-pack.c:1514
msgid "error while closing pack file"
msgstr "關閉包檔案時發生錯誤"
-#: builtin/index-pack.c:1516
-msgid "cannot store pack file"
-msgstr "無法儲存包檔案"
-
-#: builtin/index-pack.c:1524
-msgid "cannot store index file"
-msgstr "無法儲存索引檔案"
-
-#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "壞的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1649
+#: builtin/index-pack.c:1643
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "無法開啟現存包檔案 '%s'"
+msgstr "無法開啟現有包檔案 '%s'"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1645
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "無法為 %s 開啟包索引檔案"
-#: builtin/index-pack.c:1699
+#: builtin/index-pack.c:1693
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 個物件"
-#: builtin/index-pack.c:1706
+#: builtin/index-pack.c:1700
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "鏈長 = %d: %lu 物件"
-#: builtin/index-pack.c:1748
+#: builtin/index-pack.c:1742
msgid "Cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
-#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
#, c-format
msgid "bad %s"
msgstr "錯誤選項 %s"
-#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的「%s」雜湊算法"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1848
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同時使用"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format 不能和 --stdin 同時使用"
-#: builtin/index-pack.c:1869
+#: builtin/index-pack.c:1867
msgid "--verify with no packfile name given"
msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "在打包物件中 fsck 檢查發生錯誤"
@@ -16492,7 +16810,7 @@
#: builtin/log.c:180
msgid "show source"
-msgstr "顯示源"
+msgstr "顯示來源"
#: builtin/log.c:181
msgid "use mail map file"
@@ -16895,129 +17213,133 @@
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<選項>] [<檔案>...]"
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字元分隔路徑"
+
+#: builtin/ls-files.c:617
msgid "identify the file status with tags"
msgstr "用標籤標記檔案的狀態"
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小寫字母表示 '假設未改變的' 檔案"
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
msgid "show cached files in the output (default)"
msgstr "顯示快取的檔案（預設）"
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
msgid "show deleted files in the output"
msgstr "顯示已刪除的檔案"
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
msgid "show modified files in the output"
msgstr "顯示已修改的檔案"
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
msgid "show other files in the output"
msgstr "顯示其它檔案"
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
msgid "show ignored files in the output"
msgstr "顯示忽略的檔案"
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
msgid "show staged contents' object name in the output"
msgstr "顯示暫存區內容的物件名稱"
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
msgid "show files on the filesystem that need to be removed"
msgstr "顯示檔案系統需要刪除的檔案"
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
msgid "show 'other' directories' names only"
msgstr "只顯示「其他」目錄的名稱"
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
msgid "show line endings of files"
msgstr "顯示檔案換行符號格式"
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
msgid "don't show empty directories"
msgstr "不顯示空目錄"
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
msgid "show unmerged files in the output"
msgstr "顯示未合併的檔案"
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
msgid "show resolve-undo information"
msgstr "顯示 resolve-undo 訊息"
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
msgid "skip files matching pattern"
msgstr "符合排除檔案的模式"
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "從 <檔案> 中讀取排除模式"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "從 <檔案> 讀取排除模式 (pattern)"
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
msgid "read additional per-directory exclude patterns in <file>"
msgstr "從 <檔案> 讀取額外的每個目錄的排除模式"
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
msgid "add the standard git exclusions"
msgstr "新增標準的 git 排除"
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
msgid "make the output relative to the project top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
msgid "recurse through submodules"
msgstr "在子模組中遞迴"
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <檔案> 都不在索引區，視為錯誤"
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
msgid "tree-ish"
msgstr "樹或提交"
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在"
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
msgid "show debugging data"
msgstr "顯示除錯資料"
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
msgid "suppress duplicate entries"
msgstr "不顯示重複項目"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<版本庫> [<引用>...]]"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<版本庫> [<引用>...]]"
#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不列印遠端 URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
msgid "exec"
msgstr "exec"
@@ -17134,7 +17456,7 @@
msgid "use headers in message's body"
msgstr "在訊息內文中使用標頭"
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
@@ -17249,144 +17571,144 @@
msgid "Merging %s with %s\n"
msgstr "合併 %s 和 %s\n"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<選項>] [<提交>...]"
-#: builtin/merge.c:123
+#: builtin/merge.c:124
msgid "switch `m' requires a value"
msgstr "開關 `m' 需要一個值"
-#: builtin/merge.c:146
+#: builtin/merge.c:147
#, c-format
msgid "option `%s' requires a value"
msgstr "選項 `%s' 需要一個值"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合併策略 '%s'。\n"
-#: builtin/merge.c:200
+#: builtin/merge.c:201
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:205
+#: builtin/merge.c:206
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自訂策略有："
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "在合併的最後不顯示差異統計"
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "在合併的最後顯示差異統計"
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "（和 --stat 同義）"
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge"
msgstr "建立一個單獨的提交而不是做一次合併"
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合併成功，執行一次提交（預設）"
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing"
msgstr "在提交前編輯提交說明"
-#: builtin/merge.c:271
+#: builtin/merge.c:272
msgid "allow fast-forward (default)"
msgstr "允許快轉（預設）"
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible"
msgstr "如果不能快轉就放棄合併"
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature"
msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use"
msgstr "要使用的合併策略"
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy"
msgstr "所選的合併策略的選項"
-#: builtin/merge.c:283
+#: builtin/merge.c:284
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合併的提交說明（針對非快轉式合併）"
-#: builtin/merge.c:290
+#: builtin/merge.c:291
msgid "abort the current in-progress merge"
msgstr "放棄目前正在進行的合併"
#
-#: builtin/merge.c:292
+#: builtin/merge.c:293
msgid "--abort but leave index and working tree alone"
msgstr "--abort，但是保留索引和工作區"
-#: builtin/merge.c:294
+#: builtin/merge.c:295
msgid "continue the current in-progress merge"
msgstr "繼續目前正在進行的合併"
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories"
msgstr "允許合並不相關的歷史"
-#: builtin/merge.c:303
+#: builtin/merge.c:304
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
-#: builtin/merge.c:320
+#: builtin/merge.c:321
msgid "could not run stash."
msgstr "不能執行儲藏。"
-#: builtin/merge.c:325
+#: builtin/merge.c:326
msgid "stash failed"
msgstr "儲藏失敗"
-#: builtin/merge.c:330
+#: builtin/merge.c:331
#, c-format
msgid "not a valid object: %s"
msgstr "不是一個有效物件：%s"
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
msgid "read-tree failed"
msgstr "讀取樹失敗"
# 譯者：請維持前導空格
-#: builtin/merge.c:400
+#: builtin/merge.c:401
msgid "Already up to date. (nothing to squash)"
msgstr "已經是最新的。（無需壓縮 (squash)）"
-#: builtin/merge.c:414
+#: builtin/merge.c:415
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "壓縮提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:464
+#: builtin/merge.c:465
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "無合併訊息 -- 未更新 HEAD\n"
@@ -17401,31 +17723,31 @@
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "壞的 branch.%s.mergeoptions 字串：%s"
-#: builtin/merge.c:729
+#: builtin/merge.c:730
msgid "Not handling anything other than two heads merge."
msgstr "未處理兩個頭合併之外的任何動作。"
-#: builtin/merge.c:742
+#: builtin/merge.c:743
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知選項：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略選項：-X%s"
-#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "不能寫 %s"
-#: builtin/merge.c:813
+#: builtin/merge.c:814
#, c-format
msgid "Could not read from '%s'"
msgstr "不能從 '%s' 讀取"
-#: builtin/merge.c:822
+#: builtin/merge.c:823
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合並，使用 'git commit' 完成此次合併。\n"
-#: builtin/merge.c:828
+#: builtin/merge.c:829
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"
@@ -17435,83 +17757,83 @@
"合併到主題分支。\n"
"\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:834
msgid "An empty message aborts the commit.\n"
msgstr "空的提交說明會終止提交。\n"
-#: builtin/merge.c:836
+#: builtin/merge.c:837
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:892
msgid "Empty commit message."
msgstr "空提交說明。"
-#: builtin/merge.c:904
+#: builtin/merge.c:907
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:965
+#: builtin/merge.c:968
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n"
-#: builtin/merge.c:1004
+#: builtin/merge.c:1007
msgid "No current branch."
msgstr "沒有目前分支。"
-#: builtin/merge.c:1006
+#: builtin/merge.c:1009
msgid "No remote for the current branch."
msgstr "目前分支沒有對應的遠端版本庫。"
-#: builtin/merge.c:1008
+#: builtin/merge.c:1011
msgid "No default upstream defined for the current branch."
msgstr "目前分支沒有定義預設的上游分支。"
-#: builtin/merge.c:1013
+#: builtin/merge.c:1016
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
-#: builtin/merge.c:1070
+#: builtin/merge.c:1073
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-#: builtin/merge.c:1173
+#: builtin/merge.c:1174
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合併：%s"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1208
msgid "not something we can merge"
msgstr "不能合併"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1321
msgid "--abort expects no arguments"
msgstr "--abort 不帶參數"
-#: builtin/merge.c:1321
+#: builtin/merge.c:1325
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1343
msgid "--quit expects no arguments"
msgstr "--quit 不帶參數"
-#: builtin/merge.c:1352
+#: builtin/merge.c:1356
msgid "--continue expects no arguments"
msgstr "--continue 不帶參數"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1360
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。"
-#: builtin/merge.c:1372
+#: builtin/merge.c:1376
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17519,7 +17841,7 @@
"您尚未結束您的合併（存在 MERGE_HEAD）。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1379
+#: builtin/merge.c:1383
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17527,88 +17849,84 @@
"您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1382
+#: builtin/merge.c:1386
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1396
+#: builtin/merge.c:1400
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能將 --squash 和 --no-ff 組合使用。"
-#: builtin/merge.c:1398
+#: builtin/merge.c:1402
msgid "You cannot combine --squash with --commit."
msgstr "您不能將 --squash 和 --commit 組合使用。"
-#: builtin/merge.c:1414
+#: builtin/merge.c:1418
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
-#: builtin/merge.c:1431
+#: builtin/merge.c:1435
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支援到空分支的壓縮提交"
-#: builtin/merge.c:1433
+#: builtin/merge.c:1437
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快轉式提交沒有意義"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1442
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合併"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1444
msgid "Can merge only exactly one commit into empty head"
msgstr "只能將一個提交合並到空分支上"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1531
msgid "refusing to merge unrelated histories"
msgstr "拒絕合併無關的歷史"
-#: builtin/merge.c:1540
+#: builtin/merge.c:1550
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1598
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "嘗試非常小的索引內合併...\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1605
#, c-format
msgid "Nope.\n"
msgstr "無。\n"
-#: builtin/merge.c:1625
-msgid "Not possible to fast-forward, aborting."
-msgstr "無法快轉，終止。"
-
-#: builtin/merge.c:1653 builtin/merge.c:1719
+#: builtin/merge.c:1664 builtin/merge.c:1730
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "將樹回滾至原始狀態...\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1668
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "嘗試合併策略 %s...\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1720
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "沒有合併策略處理此合併。\n"
-#: builtin/merge.c:1711
+#: builtin/merge.c:1722
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合併失敗。\n"
-#: builtin/merge.c:1721
+#: builtin/merge.c:1732
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略，準備自行解決。\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1746
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自動合併進展順利，按要求在提交前停止\n"
@@ -17642,15 +17960,15 @@
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "「%s」已標為「%s」，但卻是「%s」類型"
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
msgid "tag on stdin did not pass our strict fsck check"
msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查"
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
msgid "tag on stdin did not refer to a valid object"
-msgstr "標準輸入上的標籤參考的不是有效物件"
+msgstr "標準輸入上的標籤指向的不是有效物件"
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "無法寫標籤檔案"
@@ -17671,47 +17989,58 @@
msgstr "允許建立一個以上的樹"
#: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<選項>] write [--preferred-pack=<包>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-"
+"snapshot=<路徑>]"
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
msgid "git multi-pack-index [<options>] verify"
msgstr "git multi-pack-index [<選項>] verify"
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
msgid "git multi-pack-index [<options>] expire"
msgstr "git multi-pack-index [<選項>] expire"
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]"
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成對 packfile 和包索引的物件目錄"
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
msgid "preferred-pack"
msgstr "偏好包"
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
msgid "pack for reuse when computing a multi-pack bitmap"
msgstr "計算多包位圖時要重複使用的包"
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "寫入多包位圖"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "寫入只包含指定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用來選取位圖提交的引用快照"
+
+#: builtin/multi-pack-index.c:202
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
-#: builtin/multi-pack-index.c:179
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未識別的子指令：%s"
-
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<選項>] <源>... <目標>"
+msgstr "git mv [<選項>] <來源>... <目的地>"
#: builtin/mv.c:83
#, c-format
@@ -17735,72 +18064,72 @@
msgid "skip move/rename errors"
msgstr "略過移動/重新命名錯誤"
-#: builtin/mv.c:170
+#: builtin/mv.c:172
#, c-format
msgid "destination '%s' is not a directory"
-msgstr "目標 '%s' 不是一個目錄"
+msgstr "目的地「%s」不是目錄"
-#: builtin/mv.c:181
+#: builtin/mv.c:184
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "檢查 '%s' 到 '%s' 的重新命名\n"
-#: builtin/mv.c:185
+#: builtin/mv.c:190
msgid "bad source"
-msgstr "壞的源"
+msgstr "來源損壞"
-#: builtin/mv.c:188
+#: builtin/mv.c:193
msgid "can not move directory into itself"
msgstr "不能將目錄移動到自身"
-#: builtin/mv.c:191
+#: builtin/mv.c:196
msgid "cannot move directory over file"
msgstr "不能將目錄移動到檔案"
-#: builtin/mv.c:200
+#: builtin/mv.c:205
msgid "source directory is empty"
-msgstr "源目錄為空"
+msgstr "來源目錄空白"
-#: builtin/mv.c:225
+#: builtin/mv.c:231
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:227
+#: builtin/mv.c:233
msgid "conflicted"
msgstr "衝突"
-#: builtin/mv.c:230
+#: builtin/mv.c:236
msgid "destination exists"
-msgstr "目標已存在"
+msgstr "目的地已存在"
-#: builtin/mv.c:238
+#: builtin/mv.c:244
#, c-format
msgid "overwriting '%s'"
msgstr "覆蓋 '%s'"
-#: builtin/mv.c:241
+#: builtin/mv.c:247
msgid "Cannot overwrite"
msgstr "不能覆蓋"
-#: builtin/mv.c:244
+#: builtin/mv.c:250
msgid "multiple sources for the same target"
-msgstr "同一目標具有多個源"
+msgstr "同一目標具有多個來源"
-#: builtin/mv.c:246
+#: builtin/mv.c:252
msgid "destination directory does not exist"
-msgstr "目標目錄不存在"
+msgstr "找不到目的地目錄"
-#: builtin/mv.c:253
+#: builtin/mv.c:280
#, c-format
msgid "%s, source=%s, destination=%s"
-msgstr "%s，源=%s，目標=%s"
+msgstr "%s，來源=%s，目的地=%s"
-#: builtin/mv.c:274
+#: builtin/mv.c:308
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重新命名 %s 至 %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
#, c-format
msgid "renaming '%s' failed"
msgstr "重新命名 '%s' 失敗"
@@ -17819,7 +18148,7 @@
#: builtin/name-rev.c:524
msgid "print only ref-based names (no object names)"
-msgstr "只輸出基於參考的名稱 (沒有物件名稱)"
+msgstr "只輸出基於引用的名稱 (沒有物件名稱)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -17863,7 +18192,7 @@
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <註解引用>] copy [-f] <源物件> <目標物件>"
+msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>"
#: builtin/notes.c:31
msgid ""
@@ -17916,11 +18245,11 @@
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<選項>] <源物件> <目標物件>"
+msgstr "git notes copy [<選項>] <來源物件> <目標物件>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<源物件> <目標物件>]..."
+msgstr "git notes copy --stdin [<來源物件> <目標物件>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
@@ -17976,47 +18305,47 @@
msgid "failed to finish 'show' for object '%s'"
msgstr "無法為物件 '%s' 完成 'show'"
-#: builtin/notes.c:197
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "請透過 -m 或 -F 選項為註解提供內容"
-#: builtin/notes.c:206
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "不能寫註解物件"
-#: builtin/notes.c:208
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "註解內容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
#, c-format
msgid "could not open or read '%s'"
msgstr "不能開啟或讀取 '%s'"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
-#: builtin/notes.c:265
+#: builtin/notes.c:263
#, c-format
msgid "failed to read object '%s'."
msgstr "讀取物件 '%s' 失敗。"
-#: builtin/notes.c:268
+#: builtin/notes.c:266
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "不能從非資料物件 '%s' 中讀取註解資料。"
-#: builtin/notes.c:309
+#: builtin/notes.c:307
#, c-format
msgid "malformed input line: '%s'."
msgstr "格式錯誤的輸入行：'%s'。"
-#: builtin/notes.c:324
+#: builtin/notes.c:322
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "從 '%s' 複製註解到 '%s' 時失敗"
@@ -18024,89 +18353,89 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
+#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
+#: builtin/prune-packed.c:25 builtin/tag.c:587
msgid "too many arguments"
msgstr "太多參數"
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
msgstr "未發現物件 %s 的註解。"
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
msgid "note contents as a string"
msgstr "註解內容作為一個字串"
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
msgid "note contents in a file"
msgstr "註解內容到一個檔案中"
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
msgid "reuse and edit specified note object"
msgstr "重用和編輯指定的註解物件"
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
msgid "reuse specified note object"
msgstr "重用指定的註解物件"
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
msgid "allow storing empty note"
msgstr "允許儲存空白備註"
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
msgid "replace existing notes"
msgstr "取代已存在的註解"
-#: builtin/notes.c:448
+#: builtin/notes.c:446
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆蓋物件 %s 現存註解\n"
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
#, c-format
msgid "Removing note for object %s\n"
msgstr "刪除物件 %s 的註解\n"
-#: builtin/notes.c:497
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr "從標準輸入讀取物件"
-#: builtin/notes.c:499
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新載入 <命令> 的設定（隱含 --stdin）"
-#: builtin/notes.c:517
+#: builtin/notes.c:515
msgid "too few arguments"
msgstr "太少參數"
-#: builtin/notes.c:538
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
-#: builtin/notes.c:550
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
-msgstr "源物件 %s 缺少註解。不能複製。"
+msgstr "來源物件 %s 缺少註解。不能複製。"
-#: builtin/notes.c:603
+#: builtin/notes.c:601
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18115,97 +18444,97 @@
"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n"
"請換用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:698
+#: builtin/notes.c:696
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗"
-#: builtin/notes.c:700
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "刪除引用 NOTES_MERGE_REF 失敗"
-#: builtin/notes.c:702
+#: builtin/notes.c:700
msgid "failed to remove 'git notes merge' worktree"
msgstr "刪除 'git notes merge' 工作區失敗"
-#: builtin/notes.c:722
+#: builtin/notes.c:720
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗"
-#: builtin/notes.c:724
+#: builtin/notes.c:722
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:726
+#: builtin/notes.c:724
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:739
+#: builtin/notes.c:737
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "解析 NOTES_MERGE_REF 失敗"
-#: builtin/notes.c:742
+#: builtin/notes.c:740
msgid "failed to finalize notes merge"
msgstr "無法完成註解合併"
-#: builtin/notes.c:768
+#: builtin/notes.c:766
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的註解合併策略 %s"
-#: builtin/notes.c:784
+#: builtin/notes.c:782
msgid "General options"
msgstr "通用選項"
-#: builtin/notes.c:786
+#: builtin/notes.c:784
msgid "Merge options"
msgstr "合併選項"
-#: builtin/notes.c:788
+#: builtin/notes.c:786
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:790
+#: builtin/notes.c:788
msgid "Committing unmerged notes"
msgstr "提交未合併的註解"
-#: builtin/notes.c:792
+#: builtin/notes.c:790
msgid "finalize notes merge by committing unmerged notes"
msgstr "透過提交未合併的註解來完成註解合併"
-#: builtin/notes.c:794
+#: builtin/notes.c:792
msgid "Aborting notes merge resolution"
msgstr "中止註解合併的方案"
-#: builtin/notes.c:796
+#: builtin/notes.c:794
msgid "abort notes merge"
msgstr "中止註解合併"
-#: builtin/notes.c:807
+#: builtin/notes.c:805
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:812
+#: builtin/notes.c:810
msgid "must specify a notes ref to merge"
msgstr "必須指定一個註解引用來合併"
-#: builtin/notes.c:836
+#: builtin/notes.c:834
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:873
+#: builtin/notes.c:871
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中"
-#: builtin/notes.c:876
+#: builtin/notes.c:874
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "無法儲存連結到目前的註解引用（%s）"
-#: builtin/notes.c:878
+#: builtin/notes.c:876
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18215,41 +18544,41 @@
"自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提"
"交結果，或者使用指令 'git notes merge --abort' 終止合併。\n"
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
-#: builtin/notes.c:900
+#: builtin/notes.c:898
#, c-format
msgid "Object %s has no note\n"
msgstr "物件 %s 沒有註解\n"
-#: builtin/notes.c:912
+#: builtin/notes.c:910
msgid "attempt to remove non-existent note is not an error"
msgstr "嘗試刪除不存在的註解不是一個錯誤"
-#: builtin/notes.c:915
+#: builtin/notes.c:913
msgid "read object names from the standard input"
msgstr "從標準輸入讀取物件名稱"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
msgid "do not remove, show only"
msgstr "不刪除，只顯示"
-#: builtin/notes.c:955
+#: builtin/notes.c:953
msgid "report pruned notes"
msgstr "報告清除的註解"
-#: builtin/notes.c:998
+#: builtin/notes.c:996
msgid "notes-ref"
msgstr "註解引用"
-#: builtin/notes.c:999
+#: builtin/notes.c:997
msgid "use notes from <notes-ref>"
msgstr "從 <註解引用> 使用註解"
-#: builtin/notes.c:1034 builtin/stash.c:1735
+#: builtin/notes.c:1032 builtin/stash.c:1752
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子指令：%s"
@@ -18297,81 +18626,85 @@
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件"
-#: builtin/pack-objects.c:1155
+#: builtin/pack-objects.c:1160
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
-#: builtin/pack-objects.c:1168
+#: builtin/pack-objects.c:1173
msgid "Writing objects"
msgstr "寫入物件中"
-#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "對 %s 呼叫 stat 失敗"
-#: builtin/pack-objects.c:1281
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "無法寫入位圖索引"
+
+#: builtin/pack-objects.c:1294
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1523
+#: builtin/pack-objects.c:1536
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
-#: builtin/pack-objects.c:1971
+#: builtin/pack-objects.c:1984
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 壓縮中 delta 基準位移越界"
-#: builtin/pack-objects.c:1980
+#: builtin/pack-objects.c:1993
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基準位移越界"
-#: builtin/pack-objects.c:2261
+#: builtin/pack-objects.c:2274
msgid "Counting objects"
msgstr "物件計數中"
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2439
#, c-format
msgid "unable to parse object header of %s"
msgstr "無法解析物件 %s 標頭訊息"
-#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
-#: builtin/pack-objects.c:2522
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
#, c-format
msgid "object %s cannot be read"
msgstr "物件 %s 無法讀取"
-#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2536
+#: builtin/pack-objects.c:2549
msgid "suboptimal pack - out of memory"
msgstr "次優（suboptimal）打包 - 記憶體不足"
-#: builtin/pack-objects.c:2851
+#: builtin/pack-objects.c:2864
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 個執行緒進行壓縮"
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3003
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "無法為標籤 %s 壓縮物件"
-#: builtin/pack-objects.c:3076
+#: builtin/pack-objects.c:3089
msgid "Compressing objects"
msgstr "壓縮物件中"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3095
msgid "inconsistency with delta count"
msgstr "不一致的差異計數"
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3174
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18380,23 +18713,24 @@
"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "
"<uri>' (收到 '%s')"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3177
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3212
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "無法取得 %2$s 包中 %1$s 物件的類型"
-#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
#, c-format
msgid "could not find pack '%s'"
msgstr "找不到「%s」包"
-#: builtin/pack-objects.c:3378
+#: builtin/pack-objects.c:3408
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -18405,7 +18739,7 @@
"預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3414
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -18414,246 +18748,246 @@
"預期物件 ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:3482
+#: builtin/pack-objects.c:3507
msgid "invalid value for --missing"
msgstr "選項 --missing 的值無效"
-#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
msgid "cannot open pack index"
msgstr "無法開啟包檔案索引"
-#: builtin/pack-objects.c:3572
+#: builtin/pack-objects.c:3541
#, c-format
msgid "loose object at %s could not be examined"
msgstr "無法檢查 %s 處的鬆散物件"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3627
msgid "unable to force loose object"
msgstr "無法強制鬆散物件"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3757
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
-#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "壞的版本 '%s'"
-#: builtin/pack-objects.c:3819
+#: builtin/pack-objects.c:3788
msgid "unable to add recent objects"
msgstr "無法新增最近的物件"
-#: builtin/pack-objects.c:3872
+#: builtin/pack-objects.c:3841
#, c-format
msgid "unsupported index version %s"
msgstr "不支援的索引版本 %s"
-#: builtin/pack-objects.c:3876
+#: builtin/pack-objects.c:3845
#, c-format
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3884
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
-#: builtin/pack-objects.c:3916
+#: builtin/pack-objects.c:3885
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本來寫包索引檔案"
-#: builtin/pack-objects.c:3919
+#: builtin/pack-objects.c:3888
msgid "maximum size of each output pack file"
msgstr "每個輸出包的最大尺寸"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3890
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略從備用物件儲存裡借用物件"
-#: builtin/pack-objects.c:3923
+#: builtin/pack-objects.c:3892
msgid "ignore packed objects"
msgstr "忽略包物件"
-#: builtin/pack-objects.c:3925
+#: builtin/pack-objects.c:3894
msgid "limit pack window by objects"
msgstr "限制打包視窗的物件數"
-#: builtin/pack-objects.c:3927
+#: builtin/pack-objects.c:3896
msgid "limit pack window by memory in addition to object limit"
msgstr "除物件數量限制外設定打包視窗的記憶體限制"
-#: builtin/pack-objects.c:3929
+#: builtin/pack-objects.c:3898
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允許的 delta 鏈的最大長度"
-#: builtin/pack-objects.c:3931
+#: builtin/pack-objects.c:3900
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3933
+#: builtin/pack-objects.c:3902
msgid "reuse existing objects"
msgstr "重用已存在的物件"
-#: builtin/pack-objects.c:3935
+#: builtin/pack-objects.c:3904
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 物件"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3906
msgid "use threads when searching for best delta matches"
msgstr "使用執行緒查詢最佳 delta 符合"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3908
msgid "do not create an empty pack output"
msgstr "不建立空的包輸出"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3910
msgid "read revision arguments from standard input"
msgstr "從標準輸入讀取版本號參數"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3912
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的物件"
-#: builtin/pack-objects.c:3946
+#: builtin/pack-objects.c:3915
msgid "include objects reachable from any reference"
msgstr "包括可以從任何引用存取到的物件"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3918
msgid "include objects referred by reflog entries"
msgstr "包括被引用日誌引用到的物件"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:3921
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的物件"
-#: builtin/pack-objects.c:3955
+#: builtin/pack-objects.c:3924
msgid "read packs from stdin"
msgstr "從標準輸入中讀取包"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3926
msgid "output pack to stdout"
msgstr "輸出包到標準輸出"
-#: builtin/pack-objects.c:3959
+#: builtin/pack-objects.c:3928
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包物件的標籤物件"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3930
msgid "keep unreachable objects"
msgstr "維持無法取得的物件"
-#: builtin/pack-objects.c:3963
+#: builtin/pack-objects.c:3932
msgid "pack loose unreachable objects"
msgstr "打包鬆散的無法取得物件"
-#: builtin/pack-objects.c:3965
+#: builtin/pack-objects.c:3934
msgid "unpack unreachable objects newer than <time>"
msgstr "將比提供 <時間> 新的無法存取的物件解包"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3937
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可以取得性演算法"
-#: builtin/pack-objects.c:3970
+#: builtin/pack-objects.c:3939
msgid "create thin packs"
msgstr "建立精簡包"
-#: builtin/pack-objects.c:3972
+#: builtin/pack-objects.c:3941
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
-#: builtin/pack-objects.c:3974
+#: builtin/pack-objects.c:3943
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 檔案的包"
-#: builtin/pack-objects.c:3976
+#: builtin/pack-objects.c:3945
msgid "ignore this pack"
msgstr "忽略該 pack"
-#: builtin/pack-objects.c:3978
+#: builtin/pack-objects.c:3947
msgid "pack compression level"
msgstr "打包壓縮級別"
-#: builtin/pack-objects.c:3980
+#: builtin/pack-objects.c:3949
msgid "do not hide commits by grafts"
msgstr "顯示被移植隱藏的提交"
-#: builtin/pack-objects.c:3982
+#: builtin/pack-objects.c:3951
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
-#: builtin/pack-objects.c:3984
+#: builtin/pack-objects.c:3953
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同時建立 bitmap 索引"
-#: builtin/pack-objects.c:3988
+#: builtin/pack-objects.c:3957
msgid "write a bitmap index if possible"
msgstr "如果可能，寫 bitmap 索引"
-#: builtin/pack-objects.c:3992
+#: builtin/pack-objects.c:3961
msgid "handling for missing objects"
msgstr "處理遺失的物件"
-#: builtin/pack-objects.c:3995
+#: builtin/pack-objects.c:3964
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor packfile 中的物件"
-#: builtin/pack-objects.c:3997
+#: builtin/pack-objects.c:3966
msgid "respect islands during delta compression"
-msgstr "在增量壓縮時參考資料島"
+msgstr "在差異壓縮時尊重資料島"
-#: builtin/pack-objects.c:3999
+#: builtin/pack-objects.c:3968
msgid "protocol"
msgstr "通訊協定"
-#: builtin/pack-objects.c:4000
+#: builtin/pack-objects.c:3969
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:4033
+#: builtin/pack-objects.c:4002
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量鏈深度 %d 太深了，強制為 %d"
-#: builtin/pack-objects.c:4038
+#: builtin/pack-objects.c:4007
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
-#: builtin/pack-objects.c:4094
+#: builtin/pack-objects.c:4063
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
-#: builtin/pack-objects.c:4096
+#: builtin/pack-objects.c:4065
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包檔案大小是 1 MiB"
-#: builtin/pack-objects.c:4101
+#: builtin/pack-objects.c:4070
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用於建立一個可索引包"
-#: builtin/pack-objects.c:4104
+#: builtin/pack-objects.c:4073
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
-#: builtin/pack-objects.c:4110
+#: builtin/pack-objects.c:4079
msgid "cannot use --filter without --stdout"
msgstr "不能在沒有 --stdout 的情況下使用 --filter"
-#: builtin/pack-objects.c:4112
+#: builtin/pack-objects.c:4081
msgid "cannot use --filter with --stdin-packs"
msgstr "無法將 --filter 及 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4116
+#: builtin/pack-objects.c:4085
msgid "cannot use internal rev list with --stdin-packs"
msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4175
+#: builtin/pack-objects.c:4144
msgid "Enumerating objects"
msgstr "枚舉物件"
-#: builtin/pack-objects.c:4212
+#: builtin/pack-objects.c:4181
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18708,7 +19042,7 @@
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍歷 promisor packfile 以外的物件"
-#: builtin/prune.c:152
+#: builtin/prune.c:151
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品版本庫中執行清理動作"
@@ -18721,61 +19055,65 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/pull.c:123
+#: builtin/pull.c:124
msgid "control for recursive fetching of submodules"
msgstr "控制子模組的遞迴取得"
-#: builtin/pull.c:127
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "和合併相關的選項"
-#: builtin/pull.c:130
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用重定基底動作取代合併動作以套用修改"
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允許快轉式"
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
+
+#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after"
msgstr "在動作前後執行自動儲藏和彈出儲藏"
-#: builtin/pull.c:183
+#: builtin/pull.c:187
msgid "Options related to fetching"
msgstr "和取得相關的參數"
-#: builtin/pull.c:193
+#: builtin/pull.c:197
msgid "force overwrite of local branch"
msgstr "強制覆蓋本機分支"
-#: builtin/pull.c:201
+#: builtin/pull.c:205
msgid "number of submodules pulled in parallel"
msgstr "並行拉取的子模組數量"
-#: builtin/pull.c:317
+#: builtin/pull.c:321
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值無效：%s"
-#: builtin/pull.c:445
+#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
-#: builtin/pull.c:447
+#: builtin/pull.c:451
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
-#: builtin/pull.c:448
+#: builtin/pull.c:452
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
-msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。"
+msgstr "這通常表示您有提供萬用字元引用規格，但遠端沒有符合項目。"
-#: builtin/pull.c:451
+#: builtin/pull.c:455
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18785,41 +19123,41 @@
"您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"
"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch."
msgstr "您目前不在一個分支上。"
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against."
msgstr "請指定您要重定基底到哪一個分支。"
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with."
msgstr "請指定您要合併哪一個分支。"
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details."
msgstr "詳見 git-pull(1)。"
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
msgid "<remote>"
msgstr "<遠端>"
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch."
msgstr "目前分支沒有追蹤訊息。"
-#: builtin/pull.c:480
+#: builtin/pull.c:484
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要為此分支建立追蹤訊息，您可以執行："
-#: builtin/pull.c:485
+#: builtin/pull.c:489
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18828,20 +19166,20 @@
"您的設定中指定要合併遠端的引用 '%s'，\n"
"但是沒有取得到這個引用。"
-#: builtin/pull.c:596
+#: builtin/pull.c:600
#, c-format
msgid "unable to access commit %s"
msgstr "無法存取提交 %s"
-#: builtin/pull.c:902
+#: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase"
msgstr "為重定基底動作忽略 --verify-signatures"
-#: builtin/pull.c:930
+#: builtin/pull.c:942
msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"You have divergent branches and need to specify how to reconcile them.\n"
+"You can do so by running one of the following commands sometime before\n"
+"your next pull:\n"
"\n"
" git config pull.rebase false # merge (the default strategy)\n"
" git config pull.rebase true # rebase\n"
@@ -18853,32 +19191,32 @@
"or --ff-only on the command line to override the configured default per\n"
"invocation.\n"
msgstr ""
-"不建議在尚未指定偏離分支的合併策略的情況下拉取。\n"
-"您可以在下一次呼叫 pull 命令前執行下述命令\n"
-"以隱藏此訊息：\n"
+"您有偏離的分支，需要指定調和分支的方式。\n"
+"您可以在下次拉取前執行以下任一命令\n"
+"指定調和方式：\n"
"\n"
" git config pull.rebase false # 合併（預設策略）\n"
" git config pull.rebase true # 重定基底\n"
-" git config pull.ff only # 只快進\n"
+" git config pull.ff only # 只進行快轉\n"
"\n"
"您可以將「git config」改成「git config --global」以設定\n"
"所有版本庫的預設偏好設定。也可以每次在命令列呼叫\n"
"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
"設定的預設值。\n"
-#: builtin/pull.c:990
+#: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未誕生的分支，變更新增至索引。"
-#: builtin/pull.c:994
+#: builtin/pull.c:1020
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c:995
+#: builtin/pull.c:1021
msgid "please commit or stash them."
msgstr "請提交或儲藏它們。"
-#: builtin/pull.c:1020
+#: builtin/pull.c:1046
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18888,7 +19226,7 @@
"fetch 更新了目前的分支。快轉您的工作區\n"
"至提交 %s。"
-#: builtin/pull.c:1026
+#: builtin/pull.c:1052
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18905,15 +19243,23 @@
"$ git reset --hard\n"
"復原之前的狀態。"
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head."
msgstr "無法將多個分支合併到空分支。"
-#: builtin/pull.c:1045
+#: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches."
msgstr "無法重定基底到多個分支。"
-#: builtin/pull.c:1065
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "無法快轉至多個分支。"
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需要指定如何調和偏離的分支。"
+
+#: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本機子模組中有修改，無法重定基底"
@@ -19077,15 +19423,15 @@
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失敗"
-#: builtin/push.c:544
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
msgid "repository"
msgstr "版本庫"
-#: builtin/push.c:545 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:546 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
msgid "mirror all refs"
msgstr "鏡像所有引用"
@@ -19097,19 +19443,19 @@
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送標籤（不能使用 --all or --mirror）"
-#: builtin/push.c:552 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
msgid "force updates"
msgstr "強制更新"
-#: builtin/push.c:553 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:554 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
msgid "require old value of ref to be at this value"
msgstr "要求引用舊的取值為設定值"
-#: builtin/push.c:557 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
msgid "require remote updates to be integrated locally"
msgstr "需要將遠端更新整合進本地"
@@ -19117,12 +19463,12 @@
msgid "control recursive pushing of submodules"
msgstr "控制子模組的遞迴推送"
-#: builtin/push.c:561 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
msgid "use thin pack"
msgstr "使用精簡打包"
-#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
msgid "receive pack program"
msgstr "接收包程式"
@@ -19142,13 +19488,13 @@
msgid "push missing but relevant tags"
msgstr "推送缺少但有關的標籤"
-#: builtin/push.c:572 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
msgid "GPG sign the push"
msgstr "用 GPG 為推送簽名"
-#: builtin/push.c:574 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
msgid "request atomic transaction on remote side"
-msgstr "需要遠端支援原子事務"
+msgstr "需要遠端支援 atomic 事務"
#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
@@ -19175,8 +19521,8 @@
"\n"
" git push <name>\n"
msgstr ""
-"沒有設定推送目標。\n"
-"或透過指令列指定 URL，或用下面指令設定一個遠端版本庫\n"
+"沒有設定推送目的地。\n"
+"請透過命令列指定 URL，或者用下面指令設定遠端版本庫\n"
"\n"
" git remote add <名稱> <位址>\n"
"\n"
@@ -19256,82 +19602,82 @@
#: builtin/read-tree.c:41
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>]])"
+"[-u | -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 | <樹狀物件1> [<樹狀物件2> [<樹狀物件3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件"
+"1> [<樹狀物件2> [<樹狀物件3>]])"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
msgid "write resulting index to <file>"
msgstr "將索引結果寫入 <檔案>"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
msgid "Merging"
msgstr "合併"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
msgid "perform a merge in addition to a read"
msgstr "讀取之餘再執行一個合併"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
msgid "3-way merge if no file level merging required"
msgstr "如果沒有檔案級合併需要，執行三方合併"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
msgid "3-way merge in presence of adds and removes"
msgstr "存在新增和刪除時，也執行三方合併"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
msgid "same as -m, but discard unmerged entries"
msgstr "類似於 -m，但捨棄未合併的條目"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
msgid "<subdirectory>/"
msgstr "<子目錄>/"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
msgid "read the tree into the index under <subdirectory>/"
msgstr "讀取樹狀物件到索引的 <子目錄>/ 下"
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
msgid "update working tree with merge result"
msgstr "用合併的結果更新工作區"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
msgid "allow explicitly ignored files to be overwritten"
msgstr "允許忽略檔案中設定的檔案可以被覆蓋"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
msgid "don't check the working tree after merging"
msgstr "合併後不檢查工作區"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
msgid "don't update the index or the work tree"
msgstr "不更新索引區和工作區"
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
msgid "skip applying sparse checkout filter"
msgstr "略過套用稀疏簽出過濾器"
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
msgid "debug unpack-trees"
msgstr "除錯 unpack-trees"
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
msgid "suppress feedback messages"
msgstr "抑制回饋訊息"
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
msgid "You need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
@@ -19353,193 +19699,44 @@
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待辦列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
#, c-format
msgid "could not create temporary %s"
msgstr "無法建立暫時的 %s"
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
msgid "could not mark as interactive"
msgstr "無法標記為互動式"
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
msgid "could not generate todo list"
msgstr "無法生成待辦列表"
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<選項>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "保留開頭是空白的提交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "允許提交說明為空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "對合併提交重定基底"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "保持兄弟提交的原始分支點"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移動以 squash!/fixup! 開頭的提交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "簽名提交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "顯示上游變化的差異統計"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "繼續重定基底"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "略過提交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "重定基底待辦列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "顯示目前修補檔"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "縮短待辦列表中的提交號"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "擴展待辦列表中的提交號"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "檢查待辦列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待辦列表中插入 exec 執行指令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "限制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游提交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head 名稱"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "重定基底策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略選項"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切換到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "要簽出的分支或提交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "要執行的指令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自動重新安排任何失敗的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合併後端"
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "無法取得 'onto'：'%s'"
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "無效的原始 head：'%s'"
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19552,7 +19749,7 @@
"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
#, c-format
msgid ""
"\n"
@@ -19570,14 +19767,14 @@
"\n"
"因此 git 無法對其重定基底。"
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
#, c-format
msgid ""
"%s\n"
@@ -19594,7 +19791,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19607,181 +19804,192 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
msgid "exec commands cannot contain newlines"
msgstr "exec 指令不能包含換行符號"
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
msgid "empty exec command"
msgstr "空的 exec 指令"
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
msgid "rebase onto given branch instead of upstream"
msgstr "重定基底到提供的分支而非上游"
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合併基礎做為目前基礎"
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
msgid "allow pre-rebase hook to run"
msgstr "允許執行 pre-rebase 掛鉤"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
msgid "be quiet. implies --no-stat"
msgstr "安靜。暗示 --no-stat"
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "顯示上游變化的差異統計"
+
+#: builtin/rebase.c:1035
msgid "do not show diffstat of what changed upstream"
msgstr "不顯示上游變化的差異統計"
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
msgid "add a Signed-off-by trailer to each commit"
msgstr "在每個提交結尾加入 Signed-off-by"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
msgid "make committer date match author date"
msgstr "使提交日期與製作日期相符合"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
msgid "ignore author date and use current date"
msgstr "忽略製作日期而使用日前日期"
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
msgid "synonym of --reset-author-date"
msgstr "和 --reset-author-date 同義"
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
msgid "passed to 'git apply'"
msgstr "傳遞給 'git apply'"
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
msgid "ignore changes in whitespace"
msgstr "忽略空白字元中的變更"
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
msgid "cherry-pick all commits, even if unchanged"
msgstr "揀選所有提交，即使未修改"
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
msgid "continue"
msgstr "繼續"
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
msgid "skip current patch and continue"
msgstr "略過目前修補檔並繼續"
# 譯者：請維持前導空格
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
msgid "abort and check out the original branch"
msgstr "終止並簽出原有分支"
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
msgid "abort but keep HEAD where it is"
msgstr "終止但保持 HEAD 不變"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
msgid "edit the todo list during an interactive rebase"
msgstr "在互動式重定基底中編輯待辦列表"
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
msgid "show the patch file being applied or merged"
msgstr "顯示正在套用或合併的修補檔案"
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
msgid "use apply strategies to rebase"
msgstr "使用套用策略進行重定基底"
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
msgid "use merging strategies to rebase"
msgstr "使用合併策略進行重定基底"
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
msgid "let the user edit the list of commits to rebase"
msgstr "讓使用者編輯要重定基底的提交列表"
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已棄用）嘗試重建合併提交而非忽略它們"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
msgid "how to handle commits that become empty"
msgstr "處理空白提交的方式"
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "保留開頭是空白的提交"
+
+#: builtin/rebase.c:1097
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
msgid "add exec lines after each commit of the editable list"
msgstr "可編輯列表的每一個提交下面增加一行 exec"
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
msgid "allow rebasing commits with empty messages"
msgstr "允許針對空提交說明的提交重定基底"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
msgid "try to rebase merges instead of skipping them"
msgstr "嘗試對合併提交重定基底而不是忽略它們"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 來最佳化上游"
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
msgid "use the given merge strategy"
msgstr "使用提供的合併策略"
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
msgid "option"
msgstr "選項"
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
msgid "pass the argument through to the merge strategy"
msgstr "將參數傳遞給合併策略"
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
msgid "rebase all reachable commits up to the root(s)"
msgstr "將所有可以取得的提交重定基底到根提交"
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自動重新安排任何失敗的 `exec`"
+
+#: builtin/rebase.c:1128
msgid "apply all changes, even those already present upstream"
msgstr "即使已提供上游，仍套用所有變更"
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起來 'git am' 正在執行中。無法重定基底。"
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 已經被 --rebase-merges 取代"
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
msgid "cannot combine '--root' with '--fork-point'"
msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
msgid "No rebase in progress?"
msgstr "沒有正在進行的重定基底？"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19789,16 +19997,16 @@
"您必須編輯所有的合併衝突，然後透過 git add\n"
"指令將它們標記為已解決"
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
msgid "could not discard worktree changes"
msgstr "無法捨棄工作區變更"
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
#, c-format
msgid "could not move back to %s"
msgstr "無法移回 %s"
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19817,141 +20025,131 @@
"\t%s\n"
"然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n"
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
msgid "cannot combine apply options with merge options"
msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知 rebase 後端：%s"
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
#, c-format
msgid "invalid upstream '%s'"
msgstr "無效的上游 '%s'"
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
msgid "Could not create new root commit"
msgstr "不能建立新的根提交"
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要與分支的一個合併基礎"
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一個合併基礎"
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
#, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命錯誤：無此分支/提交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "沒有此分支/提交 '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2431
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
#, c-format
msgid "No such ref: %s"
msgstr "沒有這樣的引用：%s"
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
msgid "Could not resolve HEAD to a revision"
msgstr "無法將 HEAD 解析為一個版本"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
msgid "Please commit or stash them."
msgstr "請提交或儲藏修改。"
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
#, c-format
msgid "could not switch to %s"
msgstr "無法切換到 %s"
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "目前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，強制重定基底。"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "目前分支 %s 是最新的，強制重定基底。\n"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的變更：\n"
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "從 %s 到 %s 的變更：\n"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，還原開頭指標以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
msgid "Could not detach HEAD"
msgstr "無法分離開頭指標"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快轉 %s 到 %s。\n"
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <版本庫目錄>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1280
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19977,7 +20175,7 @@
"若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
"設定變數為 'refuse'。"
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1300
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -19996,11 +20194,11 @@
"\n"
"若要封鎖此訊息，您可以設定它為 'refuse'。"
-#: builtin/receive-pack.c:2478
+#: builtin/receive-pack.c:2480
msgid "quiet"
msgstr "靜默模式"
-#: builtin/receive-pack.c:2492
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "您必須指定一個目錄。"
@@ -20041,7 +20239,7 @@
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
msgid "no reflog specified to delete"
msgstr "未指定要刪除的引用日誌"
@@ -20195,7 +20393,7 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
#, c-format
msgid "remote %s already exists."
msgstr "遠端 %s 已經存在。"
@@ -20205,25 +20403,30 @@
msgid "Could not setup master '%s'"
msgstr "無法設定 master '%s'"
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"
+
+#: builtin/remote.c:366
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "無法得到引用規格 %s 的取得列表"
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
msgid "(matching)"
msgstr "（符合）"
-#: builtin/remote.c:466
+#: builtin/remote.c:472
msgid "(delete)"
msgstr "（刪除）"
-#: builtin/remote.c:655
+#: builtin/remote.c:660
#, c-format
msgid "could not set '%s'"
msgstr "無法設定 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:665
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -20234,17 +20437,17 @@
"\t%s:%d\n"
"現命名成不存在的遠端分支 '%s'"
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
#, c-format
msgid "No such remote: '%s'"
msgstr "沒有此遠端版本庫：'%s'"
-#: builtin/remote.c:710
+#: builtin/remote.c:715
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重新命名設定小節 '%s' 到 '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:735
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -20255,17 +20458,17 @@
"\t%s\n"
"\t如果必要請手動更新設定。"
-#: builtin/remote.c:770
+#: builtin/remote.c:775
#, c-format
msgid "deleting '%s' failed"
msgstr "刪除 '%s' 失敗"
-#: builtin/remote.c:804
+#: builtin/remote.c:809
#, c-format
msgid "creating '%s' failed"
msgstr "建立 '%s' 失敗"
-#: builtin/remote.c:882
+#: builtin/remote.c:887
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -20274,118 +20477,118 @@
"to delete them, use:"
msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用："
-#: builtin/remote.c:896
+#: builtin/remote.c:901
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除設定小節 '%s'"
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次取得將儲存於 remotes/%s）"
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
msgid " tracked"
msgstr " 已追蹤"
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
msgid " stale (use 'git remote prune' to remove)"
msgstr " 過時（使用 'git remote prune' 來移除）"
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "互動式重定基底到遠端 %s"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "互動式重定基底（含合併提交）到遠端 %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
#, c-format
msgid "rebases onto remote %s"
msgstr "重定基底到遠端 %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
#, c-format
msgid " merges with remote %s"
msgstr " 與遠端 %s 合併"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
#, c-format
msgid "merges with remote %s"
msgstr "與遠端 %s 合併"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和遠端 %s\n"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
msgid "create"
msgstr "建立"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
msgid "delete"
msgstr "刪除"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
msgid "fast-forwardable"
msgstr "可快轉"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
msgid "local out of date"
msgstr "本機已過時"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 強制推送至 %-*s (%s)"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 強制推送至 %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
msgid "do not query remotes"
msgstr "不查詢遠端"
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
#, c-format
msgid "* remote %s"
msgstr "* 遠端 %s"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
#, c-format
msgid " Fetch URL: %s"
msgstr " 取得位址：%s"
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
msgid "(no URL)"
msgstr "(無 URL)"
@@ -20393,185 +20596,189 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
#, c-format
msgid " Push URL: %s"
msgstr " 推送位址：%s"
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
msgid "(not queried)"
msgstr "（未查詢）"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n"
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 遠端分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
msgid " (status not queried)"
-msgstr "（狀態未查詢）"
+msgstr " （狀態未查詢）"
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 為 'git pull' 設定的本機分支："
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本機引用將在 'git push' 時被鏡像"
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
#, 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:1324
+#: builtin/remote.c:1328
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
msgid "delete refs/remotes/<name>/HEAD"
msgstr "刪除 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
msgid "Cannot determine remote HEAD"
msgstr "無法確定遠端 HEAD"
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令："
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
#, c-format
msgid "Could not delete %s"
msgstr "無法刪除 %s"
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一個有效引用：%s"
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
#, c-format
msgid "Could not setup %s"
msgstr "不能設定 %s"
# 譯者：請維持前導空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
#, c-format
msgid " %s will become dangling!"
msgstr " %s 將成為懸空狀態！"
# 譯者：請維持前導空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成為懸空狀態！"
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
#, c-format
msgid " * [would prune] %s"
msgstr " * [將刪除] %s"
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
#, c-format
msgid " * [pruned] %s"
msgstr " * [已刪除] %s"
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
msgid "prune remotes after fetching"
msgstr "抓取後清除遠端"
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
#, c-format
msgid "No such remote '%s'"
msgstr "沒有此遠端 '%s'"
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
msgid "add branch"
msgstr "新增分支"
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
msgid "no remote specified"
msgstr "未指定遠端"
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
msgid "query push URLs rather than fetch URLs"
msgstr "查詢推送 URL 位址，而非取得 URL 位址"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
msgid "return all URLs"
msgstr "返回所有 URL 位址"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "沒有給遠端版本庫 '%s' 設定 URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
msgid "manipulate push URLs"
msgstr "動作推送 URLS"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
msgid "add URL"
msgstr "新增 URL"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
msgid "delete URLs"
msgstr "刪除 URL"
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 無意義"
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "無效的舊 URL 符合範本：%s"
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
msgid "Will not delete all non-push URLs"
msgstr "將不會刪除所有非推送 URL 位址"
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "詳細輸出；必須置於子指令之前"
+
+#: builtin/repack.c:28
msgid "git repack [<options>]"
msgstr "git repack [<選項>]"
-#: builtin/repack.c:31
+#: builtin/repack.c:33
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20579,139 +20786,152 @@
"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n"
"或停用 pack.writebitmaps 設定。"
-#: builtin/repack.c:198
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
-#: builtin/repack.c:294
+#: builtin/repack.c:297
msgid "could not finish pack-objects to repack promisor objects"
msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:309
+#: builtin/repack.c:312
#, c-format
msgid "cannot open index for %s"
msgstr "無法開啟 %s 的索引"
-#: builtin/repack.c:368
+#: builtin/repack.c:371
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s 包太大，以致不能在等比數列中考慮"
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s 包太大，以致不能縮合"
-#: builtin/repack.c:460
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "無法開啟 '%s' 暫存檔進行寫入"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "無法關閉 refs 的快照暫存檔"
+
+#: builtin/repack.c:628
msgid "pack everything in a single pack"
msgstr "所有內容打包到一個包檔案中"
-#: builtin/repack.c:462
+#: builtin/repack.c:630
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"
-#: builtin/repack.c:465
+#: builtin/repack.c:633
msgid "remove redundant packs, and run git-prune-packed"
msgstr "刪除多餘的包，執行 git-prune-packed"
-#: builtin/repack.c:467
+#: builtin/repack.c:635
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
-#: builtin/repack.c:469
+#: builtin/repack.c:637
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
-#: builtin/repack.c:471
+#: builtin/repack.c:639
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
-#: builtin/repack.c:474
+#: builtin/repack.c:642
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --local"
-#: builtin/repack.c:476
+#: builtin/repack.c:644
msgid "write bitmap index"
msgstr "寫 bitmap 索引"
-#: builtin/repack.c:478
+#: builtin/repack.c:646
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
-#: builtin/repack.c:479
+#: builtin/repack.c:647
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:480
+#: builtin/repack.c:648
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要將早於提供時間的物件過期"
-#: builtin/repack.c:482
+#: builtin/repack.c:650
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新對無法取得物件打包"
-#: builtin/repack.c:484
+#: builtin/repack.c:652
msgid "size of the window used for delta compression"
msgstr "用於增量壓縮的視窗值"
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
msgid "bytes"
msgstr "位元組"
-#: builtin/repack.c:486
+#: builtin/repack.c:654
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制記憶體大小而非條目數"
-#: builtin/repack.c:488
+#: builtin/repack.c:656
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:490
+#: builtin/repack.c:658
msgid "limits the maximum number of threads"
msgstr "限制最大執行緒數"
-#: builtin/repack.c:492
+#: builtin/repack.c:660
msgid "maximum size of each packfile"
msgstr "每個 packfile 的最大尺寸"
-#: builtin/repack.c:494
+#: builtin/repack.c:662
msgid "repack objects in packs marked with .keep"
msgstr "對標記為 .keep 的包中的物件重新打包"
-#: builtin/repack.c:496
+#: builtin/repack.c:664
msgid "do not repack this pack"
msgstr "不要對該包檔案重新打包"
-#: builtin/repack.c:498
+#: builtin/repack.c:666
msgid "find a geometric progression with factor <N>"
msgstr "尋找因數是 <N> 的等比數列"
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "寫入結果包的多包索引"
+
+#: builtin/repack.c:678
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能刪除珍品版本庫中的打包檔案"
-#: builtin/repack.c:512
+#: builtin/repack.c:682
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不相容"
-#: builtin/repack.c:527
+#: builtin/repack.c:713
msgid "--geometric is incompatible with -A, -a"
msgstr "--geometric 與 -A, -a 不相容"
-#: builtin/repack.c:639
+#: builtin/repack.c:825
msgid "Nothing new to pack."
msgstr "沒有新的要打包。"
-#: builtin/repack.c:669
+#: builtin/repack.c:855
#, c-format
msgid "missing required file: %s"
msgstr "缺少必要檔案：%s"
-#: builtin/repack.c:671
+#: builtin/repack.c:857
#, c-format
msgid "could not unlink: %s"
msgstr "無法取消連結：%s"
@@ -21018,94 +21238,94 @@
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:83
+#: builtin/reset.c:89
msgid "You do not have a valid HEAD."
msgstr "您沒有一個有效的 HEAD。"
-#: builtin/reset.c:85
+#: builtin/reset.c:91
msgid "Failed to find tree of HEAD."
msgstr "無法找到 HEAD 指向的樹。"
-#: builtin/reset.c:91
+#: builtin/reset.c:97
#, c-format
msgid "Failed to find tree of %s."
msgstr "無法找到 %s 指向的樹。"
-#: builtin/reset.c:116
+#: builtin/reset.c:122
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 現在位於 %s"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:195
+#: builtin/reset.c:201
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合併過程中不能做%s重設動作。"
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
msgid "be quiet, only report errors"
msgstr "安靜模式，只報告錯誤"
-#: builtin/reset.c:297
+#: builtin/reset.c:303
msgid "reset HEAD and index"
msgstr "重設 HEAD 和索引"
-#: builtin/reset.c:298
+#: builtin/reset.c:304
msgid "reset only HEAD"
msgstr "只重設 HEAD"
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
msgid "reset HEAD, index and working tree"
msgstr "重設 HEAD、索引和工作區"
-#: builtin/reset.c:304
+#: builtin/reset.c:310
msgid "reset HEAD but keep local changes"
msgstr "重設 HEAD 但儲存本機變更"
-#: builtin/reset.c:310
+#: builtin/reset.c:316
msgid "record only the fact that removed paths will be added later"
msgstr "將刪除的路徑標記為稍後新增"
-#: builtin/reset.c:344
+#: builtin/reset.c:350
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "無法將 '%s' 解析為一個有效的版本。"
-#: builtin/reset.c:352
+#: builtin/reset.c:358
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
-#: builtin/reset.c:361
+#: builtin/reset.c:367
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
-#: builtin/reset.c:371
+#: builtin/reset.c:377
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:373
+#: builtin/reset.c:379
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能帶路徑進行%s重設。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:388
+#: builtin/reset.c:394
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能對純版本庫進行%s重設"
-#: builtin/reset.c:392
+#: builtin/reset.c:398
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同時使用"
-#: builtin/reset.c:413
+#: builtin/reset.c:419
msgid "Unstaged changes after reset:"
msgstr "重設後取消暫存的變更："
-#: builtin/reset.c:416
+#: builtin/reset.c:422
#, c-format
msgid ""
"\n"
@@ -21117,12 +21337,12 @@
"重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
-#: builtin/reset.c:434
+#: builtin/reset.c:440
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重設索引檔案至版本 '%s'。"
-#: builtin/reset.c:439
+#: builtin/reset.c:445
msgid "Could not write new index file."
msgstr "不能寫入新的索引檔案。"
@@ -21302,15 +21522,19 @@
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "允許提交說明為空"
+
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多餘的、空的提交"
-#: builtin/revert.c:237
+#: builtin/revert.c:241
msgid "revert failed"
msgstr "還原失敗"
-#: builtin/revert.c:250
+#: builtin/revert.c:254
msgid "cherry-pick failed"
msgstr "揀選失敗"
@@ -21353,68 +21577,69 @@
msgid_plural "the following files have local modifications:"
msgstr[0] "如下檔案有本機修改："
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "do not list removed files"
msgstr "不列出刪除的檔案"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "only remove from the index"
msgstr "只從索引區刪除"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "override the up-to-date check"
msgstr "忽略檔案更新狀態檢查"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "allow recursive removal"
msgstr "允許遞迴刪除"
-#: builtin/rm.c:249
+#: builtin/rm.c:250
msgid "exit with a zero status even if nothing matched"
msgstr "即使沒有符合，也以零狀態離開"
-#: builtin/rm.c:283
+#: builtin/rm.c:285
msgid "No pathspec was given. Which files should I remove?"
msgstr "沒有提供路徑規格。我該移除哪個檔案？"
-#: builtin/rm.c:310
+#: builtin/rm.c:315
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"
-#: builtin/rm.c:331
+#: builtin/rm.c:337
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 選項不會遞迴刪除 '%s'"
-#: builtin/rm.c:379
+#: builtin/rm.c:385
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能刪除 %s"
#: builtin/send-pack.c:20
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."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<host>:]<directory> (--all | <ref>...)"
msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n"
-" --all 和明確的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+" [--receive-pack=<git-receive-pack>]\n"
+" [--verbose] [--thin] [--atomic]\n"
+" [<主機>:]<目錄> (--all | <引用>...)"
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
msgid "remote name"
msgstr "遠端名稱"
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
msgid "use stateless RPC protocol"
msgstr "使用無狀態的 RPC 協定"
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
msgid "read refs from stdin"
msgstr "從標準輸入讀取引用"
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
msgid "print status from remote helper"
msgstr "列印來自遠端 helper 的狀態"
@@ -21471,21 +21696,22 @@
msgid "group by field"
msgstr "依欄位分組"
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
msgid "too many arguments given outside repository"
msgstr "版本庫外執行提供了太多的參數"
#: builtin/show-branch.c:13
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>)...]"
+" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--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] [(<版本> | <萬用字元>)...]"
+" [--current] [--color[=<何時>] | --no-color] [--sparse]\n"
+" [--more=<n> | --list | --independent | --merge-base]\n"
+" [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元"
+">)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21497,111 +21723,111 @@
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "忽略 %s，無法處理 %d 個以上的引用"
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
#, c-format
msgid "no matching refs with %s"
msgstr "沒有和 %s 符合的引用"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
msgid "show remote-tracking and local branches"
msgstr "顯示遠端追蹤的和本機的分支"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
msgid "show remote-tracking branches"
msgstr "顯示遠端追蹤的分支"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
msgid "color '*!+-' corresponding to the branch"
msgstr "著色 '*!+-' 到相應的分支"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
msgid "show <n> more commits after the common ancestor"
msgstr "顯示共同祖先後的 <n> 個提交"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
msgid "synonym to more=-1"
msgstr "和 more=-1 同義"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "suppress naming strings"
msgstr "不顯示字串命名"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
msgid "include the current branch"
msgstr "包括目前分支"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
msgid "name commits with their object names"
msgstr "以物件名字命名提交"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
msgid "show possible merge bases"
msgstr "顯示可能合併的基礎"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
msgid "show refs unreachable from any other ref"
msgstr "顯示沒有任何引用的的引用"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
msgid "show commits in topological order"
msgstr "以拓撲順序顯示提交"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
msgid "show only commits not on the first branch"
msgstr "只顯示不在第一個分支上的提交"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
msgid "show merges reachable from only one tip"
msgstr "顯示僅一個分支可存取的合併提交"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
msgid "topologically sort, maintaining date order where possible"
msgstr "拓撲方式排序，並儘可能地保持日期順序"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "show <n> most recent ref-log entries starting at base"
msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 無效"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
msgid "--reflog option needs one branch name"
msgstr "選項 --reflog 需要一個分支名"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能顯示 %d 個條目。"
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
#, c-format
msgid "no such ref %s"
msgstr "無此引用 %s"
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能處理 %d 個以上的版本。"
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一個有效的引用。"
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
@@ -21670,70 +21896,82 @@
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr "「%s」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "無法移除 '%s' 目錄"
+
+#: builtin/sparse-checkout.c:321
msgid "failed to create directory for sparse-checkout file"
msgstr "無法建立稀疏簽出檔案的目錄"
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
msgid "failed to set extensions.worktreeConfig setting"
msgstr "無法設定 extensions.worktreeConfig 設定"
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
msgid "initialize the sparse-checkout in cone mode"
msgstr "以 cone 模式初始化稀疏簽出"
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
msgid "toggle the use of a sparse index"
msgstr "切換是否使用稀疏索引"
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
msgid "failed to modify sparse-index config"
msgstr "無法修改稀疏索引設定"
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
#, c-format
msgid "failed to open '%s'"
msgstr "無法開啟「%s」"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:507
#, c-format
msgid "could not normalize path %s"
msgstr "無法標準化路徑 %s"
-#: builtin/sparse-checkout.c:425
+#: builtin/sparse-checkout.c:519
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
-#: builtin/sparse-checkout.c:450
+#: builtin/sparse-checkout.c:544
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "無法去掉 '%s' C 樣式字串的引號"
-#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
msgid "unable to load existing sparse-checkout patterns"
msgstr "無法載入現存的稀疏簽出樣式"
-#: builtin/sparse-checkout.c:573
+#: builtin/sparse-checkout.c:667
msgid "read patterns from standard in"
msgstr "從標準輸入讀取樣式"
-#: builtin/sparse-checkout.c:588
+#: builtin/sparse-checkout.c:682
msgid "git sparse-checkout reapply"
msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:607
+#: builtin/sparse-checkout.c:701
msgid "git sparse-checkout disable"
msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:638
+#: builtin/sparse-checkout.c:732
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
@@ -21769,7 +22007,7 @@
" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
" [--] [<路徑規格>...]]"
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21799,6 +22037,14 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
" [--] [<路徑規格>...]]"
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
#: builtin/stash.c:130
#, c-format
msgid "'%s' is not a stash-like commit"
@@ -21822,7 +22068,7 @@
msgid "git stash clear with arguments is unimplemented"
msgstr "尚未實作傳入參數的 git stash clear"
-#: builtin/stash.c:431
+#: builtin/stash.c:447
#, c-format
msgid ""
"WARNING: Untracked file in way of tracked file! Renaming\n"
@@ -21833,166 +22079,166 @@
" %s -> %s\n"
" 以騰出空間留給追蹤檔案。\n"
-#: builtin/stash.c:492
+#: builtin/stash.c:508
msgid "cannot apply a stash in the middle of a merge"
msgstr "無法在合併過程套用儲藏"
-#: builtin/stash.c:503
+#: builtin/stash.c:519
#, c-format
msgid "could not generate diff %s^!."
msgstr "無法生成差異 %s^!."
-#: builtin/stash.c:510
+#: builtin/stash.c:526
msgid "conflicts in index. Try without --index."
msgstr "索引中有衝突。請試試看不用 --index。"
-#: builtin/stash.c:516
+#: builtin/stash.c:532
msgid "could not save index tree"
msgstr "不能儲存索引樹"
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "無法從儲藏條目中復原未追蹤檔案"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
#, c-format
msgid "Merging %s with %s"
msgstr "正在合併 %s 和 %s"
-#: builtin/stash.c:549
+#: builtin/stash.c:562
msgid "Index was not unstashed."
msgstr "索引未從儲藏中復原。"
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "無法從儲藏條目中復原未追蹤檔案"
+
+#: builtin/stash.c:607 builtin/stash.c:705
msgid "attempt to recreate the index"
msgstr "嘗試重建索引"
-#: builtin/stash.c:635
+#: builtin/stash.c:651
#, c-format
msgid "Dropped %s (%s)"
msgstr "捨棄了 %s（%s）"
-#: builtin/stash.c:638
+#: builtin/stash.c:654
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：無法捨棄儲藏條目"
-#: builtin/stash.c:651
+#: builtin/stash.c:667
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一個儲藏引用"
-#: builtin/stash.c:701
+#: builtin/stash.c:717
msgid "The stash entry is kept in case you need it again."
msgstr "儲藏條目被保留以備您再次需要。"
-#: builtin/stash.c:724
+#: builtin/stash.c:740
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:808
+#: builtin/stash.c:824
msgid "failed to parse tree"
msgstr "無法解析樹"
-#: builtin/stash.c:819
+#: builtin/stash.c:835
msgid "failed to unpack trees"
msgstr "無法解包樹"
-#: builtin/stash.c:839
+#: builtin/stash.c:855
msgid "include untracked files in the stash"
msgstr "在儲藏區包含未追蹤檔案"
-#: builtin/stash.c:842
+#: builtin/stash.c:858
msgid "only show untracked files in the stash"
msgstr "只在儲藏區顯示未追蹤檔案"
-#: builtin/stash.c:929 builtin/stash.c:966
+#: builtin/stash.c:945 builtin/stash.c:982
#, c-format
msgid "Cannot update %s with %s"
msgstr "無法用 %2$s 更新 %1$s"
-#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
msgid "stash message"
msgstr "儲藏說明"
-#: builtin/stash.c:957
+#: builtin/stash.c:973
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一個 <提交> 參數"
-#: builtin/stash.c:1171
+#: builtin/stash.c:1187
msgid "No changes selected"
msgstr "沒有選擇變更"
-#: builtin/stash.c:1271
+#: builtin/stash.c:1287
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1314
msgid "Cannot save the current index state"
msgstr "無法儲存目前索引狀態"
-#: builtin/stash.c:1307
+#: builtin/stash.c:1323
msgid "Cannot save the untracked files"
msgstr "無法儲存未追蹤檔案"
-#: builtin/stash.c:1318 builtin/stash.c:1327
+#: builtin/stash.c:1334 builtin/stash.c:1343
msgid "Cannot save the current worktree state"
msgstr "無法儲存目前工作區狀態"
-#: builtin/stash.c:1355
+#: builtin/stash.c:1371
msgid "Cannot record working tree state"
msgstr "不能記錄工作區狀態"
-#: builtin/stash.c:1404
+#: builtin/stash.c:1420
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1422
+#: builtin/stash.c:1438
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了執行 'git add'？"
-#: builtin/stash.c:1437
+#: builtin/stash.c:1453
msgid "No local changes to save"
msgstr "沒有要儲存的本機修改"
-#: builtin/stash.c:1444
+#: builtin/stash.c:1460
msgid "Cannot initialize stash"
msgstr "無法初始化儲藏"
-#: builtin/stash.c:1459
+#: builtin/stash.c:1475
msgid "Cannot save the current status"
msgstr "無法儲存目前狀態"
-#: builtin/stash.c:1464
+#: builtin/stash.c:1480
#, c-format
msgid "Saved working directory and index state %s"
msgstr "儲存工作目錄和索引狀態 %s"
-#: builtin/stash.c:1554
+#: builtin/stash.c:1571
msgid "Cannot remove worktree changes"
msgstr "無法刪除工作區變更"
-#: builtin/stash.c:1593 builtin/stash.c:1658
+#: builtin/stash.c:1610 builtin/stash.c:1675
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1595 builtin/stash.c:1660
+#: builtin/stash.c:1612 builtin/stash.c:1677
msgid "stash in patch mode"
msgstr "以修補檔模式儲藏"
-#: builtin/stash.c:1596 builtin/stash.c:1661
+#: builtin/stash.c:1613 builtin/stash.c:1678
msgid "quiet mode"
msgstr "靜默模式"
-#: builtin/stash.c:1598 builtin/stash.c:1663
+#: builtin/stash.c:1615 builtin/stash.c:1680
msgid "include untracked files in stash"
msgstr "儲藏中包含未追蹤檔案"
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1617 builtin/stash.c:1682
msgid "include ignore files"
msgstr "包含忽略的檔案"
-#: builtin/stash.c:1700
+#: builtin/stash.c:1717
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22016,7 +22262,7 @@
msgid "prepend comment character and space to each line"
msgstr "為每一行的行首新增備註符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一個完整的引用名稱，卻得到 %s"
@@ -22030,27 +22276,33 @@
msgid "cannot strip one component off url '%s'"
msgstr "無法從 url '%s' 剝離一個元件"
-#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
-#: builtin/submodule--helper.c:2891
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
msgid "alternative anchor for relative paths"
msgstr "相對路徑的替代錨記（anchor）"
-#: builtin/submodule--helper.c:416
+#: builtin/submodule--helper.c:410
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
-#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
-#: builtin/submodule--helper.c:654
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url"
-#: builtin/submodule--helper.c:526
+#: builtin/submodule--helper.c:520
#, c-format
msgid "Entering '%s'\n"
msgstr "進入 '%s'\n"
-#: builtin/submodule--helper.c:529
+#: builtin/submodule--helper.c:523
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -22059,7 +22311,7 @@
"對 %s 執行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:551
+#: builtin/submodule--helper.c:545
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22069,169 +22321,162 @@
"在遞迴 %s 的子模組執行 run_command 時返回非零值。\n"
"."
-#: builtin/submodule--helper.c:567
+#: builtin/submodule--helper.c:561
msgid "suppress output of entering each submodule command"
msgstr "隱藏每個子模組進入命令的輸出"
-#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
-#: builtin/submodule--helper.c:1489
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
msgid "recurse into nested submodules"
msgstr "遞迴進入嵌套子模組中"
-#: builtin/submodule--helper.c:574
+#: builtin/submodule--helper.c:568
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:601
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:642
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊 url"
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:646
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:682
+#: builtin/submodule--helper.c:656
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建議子模組 '%s' 使用指令更新模式\n"
-#: builtin/submodule--helper.c:689
+#: builtin/submodule--helper.c:663
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊更新模式"
-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:685
msgid "suppress output for initializing a submodule"
msgstr "隱藏初始化子模組的輸出"
-#: builtin/submodule--helper.c:716
+#: builtin/submodule--helper.c:690
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<選項>] [<路徑>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:811
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "無法解析子模組 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "遞迴子模組 '%s' 失敗"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
msgid "suppress submodule status output"
msgstr "隱藏子模組的狀態輸出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:863
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交"
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:869
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:893
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路徑>"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:965
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:994
+#: builtin/submodule--helper.c:968
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:1007
+#: builtin/submodule--helper.c:981
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1057
+#: builtin/submodule--helper.c:1031
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "無法雜湊來自 '%s' 的物件"
-#: builtin/submodule--helper.c:1061
+#: builtin/submodule--helper.c:1035
#, c-format
msgid "unexpected mode %o\n"
msgstr "非預期的模式 %o\n"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1276
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "使用儲存在索引中的提交而非子模組 HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1278
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "比較索引中提交與子模組 HEAD 提交的差異"
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1280
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "'ignore_config' 值設為 'all' 時略過子模組"
-#: builtin/submodule--helper.c:1308
+#: builtin/submodule--helper.c:1282
msgid "limit the summary size"
msgstr "限制摘要大小"
-#: builtin/submodule--helper.c:1313
+#: builtin/submodule--helper.c:1287
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]"
-#: builtin/submodule--helper.c:1337
+#: builtin/submodule--helper.c:1311
msgid "could not fetch a revision for HEAD"
msgstr "無法取得 HEAD 的版本"
-#: builtin/submodule--helper.c:1342
+#: builtin/submodule--helper.c:1316
msgid "--cached and --files are mutually exclusive"
msgstr "--cached 和 --files 互斥"
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1373
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "為 '%s' 同步子模組 url\n"
-#: builtin/submodule--helper.c:1415
+#: builtin/submodule--helper.c:1379
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "無法為子模組路徑 '%s' 註冊 url"
-#: builtin/submodule--helper.c:1429
+#: builtin/submodule--helper.c:1393
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "無法得到子模組 '%s' 的預設遠端關聯"
-#: builtin/submodule--helper.c:1440
+#: builtin/submodule--helper.c:1404
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "無法為子模組 '%s' 更新遠端關聯"
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:1451
msgid "suppress output of synchronizing submodule url"
msgstr "隱藏子模組 URL 同步的輸出"
-#: builtin/submodule--helper.c:1494
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
-#: builtin/submodule--helper.c:1548
+#: builtin/submodule--helper.c:1512
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22240,52 +22485,52 @@
"子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm "
"-rf' 指令）"
-#: builtin/submodule--helper.c:1560
+#: builtin/submodule--helper.c:1524
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1532
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目錄 '%s'\n"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1534
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "無法移除子模組工作區 '%s'\n"
-#: builtin/submodule--helper.c:1581
+#: builtin/submodule--helper.c:1545
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能建立空的子模組目錄 %s"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1561
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1590
msgid "remove submodule working trees even if they contain local changes"
msgstr "即使有本機變更仍移除子模組的工作區"
-#: builtin/submodule--helper.c:1627
+#: builtin/submodule--helper.c:1591
msgid "unregister all submodules"
msgstr "取消註冊所有子模組"
-#: builtin/submodule--helper.c:1632
+#: builtin/submodule--helper.c:1596
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
-#: builtin/submodule--helper.c:1646
+#: builtin/submodule--helper.c:1610
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'"
-#: builtin/submodule--helper.c:1690
+#: builtin/submodule--helper.c:1655
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22297,67 +22542,67 @@
"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
"而非 '--reference' 複製。"
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模組 '%s' 不能新增版本庫備選：%s"
-#: builtin/submodule--helper.c:1768
+#: builtin/submodule--helper.c:1739
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1775
+#: builtin/submodule--helper.c:1746
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1800
+#: builtin/submodule--helper.c:1771
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:1812
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "無法複製 '%s' 到子模組路徑 '%s'"
-#: builtin/submodule--helper.c:1846
+#: builtin/submodule--helper.c:1817
#, c-format
msgid "directory not empty: '%s'"
msgstr "目錄不是空的：「%s」"
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1829
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "無法得到 '%s' 的子模組目錄"
-#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+#: builtin/submodule--helper.c:1861
msgid "where the new submodule will be cloned to"
msgstr "新的子模組將要複製的路徑"
-#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+#: builtin/submodule--helper.c:1864
msgid "name of the new submodule"
msgstr "新子模組的名稱"
-#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+#: builtin/submodule--helper.c:1867
msgid "url where to clone the submodule from"
msgstr "複製子模組的 url 位址"
-#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
msgid "depth for shallow clones"
msgstr "淺複製的深度"
-#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
-#: builtin/submodule--helper.c:2909
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
msgid "force cloning progress"
msgstr "強制顯示複製進度"
-#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
msgid "disallow cloning into non-empty directory"
msgstr "不允許複製至非空白目錄"
-#: builtin/submodule--helper.c:1916
+#: builtin/submodule--helper.c:1887
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22367,223 +22612,360 @@
">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
"徑>"
-#: builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1924
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:1957
+#: builtin/submodule--helper.c:1928
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:2058
+#: builtin/submodule--helper.c:2043
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模組 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2062
+#: builtin/submodule--helper.c:2047
msgid "Maybe you want to use 'update --init'?"
msgstr "也許您想要執行 'update --init'？"
-#: builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略過未合併的子模組 %s"
-#: builtin/submodule--helper.c:2121
+#: builtin/submodule--helper.c:2106
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略過子模組 '%s'"
-#: builtin/submodule--helper.c:2271
+#: builtin/submodule--helper.c:2256
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "複製 '%s' 失敗。已排程重試作業"
-#: builtin/submodule--helper.c:2282
+#: builtin/submodule--helper.c:2267
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
-#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑簽出「%1$s」"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "無法在「%2$s」子模組路徑合併「%1$s」"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "「%s %s」在「%s」子模組路徑執行失敗"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "子模組路徑「%s」：已簽出「%s」\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "子模組路徑「%s」：已重定基底至「%s」\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "子模組路徑「%s」：已在「%s」合併\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "子模組路徑「%s」：「%s %s」\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s："
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」。直接取得該提交失敗。"
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
msgid "path into the working tree"
msgstr "到工作區的路徑"
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作區中的路徑，遞迴嵌套子模組"
-#: builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2517
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "建立一個縮減至指定版本數的淺複製"
-#: builtin/submodule--helper.c:2360
+#: builtin/submodule--helper.c:2520
msgid "parallel jobs"
msgstr "並行任務"
-#: builtin/submodule--helper.c:2362
+#: builtin/submodule--helper.c:2522
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始複製是否應該遵循建議的淺複製選項"
-#: builtin/submodule--helper.c:2363
+#: builtin/submodule--helper.c:2523
msgid "don't print cloning progress"
msgstr "不要輸出複製進度"
-#: builtin/submodule--helper.c:2374
+#: builtin/submodule--helper.c:2534
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
-#: builtin/submodule--helper.c:2387
+#: builtin/submodule--helper.c:2547
msgid "bad value for update parameter"
msgstr "update 參數取值錯誤"
-#: builtin/submodule--helper.c:2435
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "隱藏 rebase 或 merge 觸發之更新的輸出"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "強制簽出更新"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "不從遠端站台取得新物件"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "如果版本庫是剛複製的，就覆蓋更新模式"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "淺 fetch 的深度"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "上層專案預期應是 SHA1"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "子模組 HEAD 的 SHA1"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]"
+
+#: builtin/submodule--helper.c:2662
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上"
-#: builtin/submodule--helper.c:2558
+#: builtin/submodule--helper.c:2780
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "無法獲得子模組 '%s' 的版本庫句柄"
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2813
msgid "recurse into submodules"
msgstr "在子模組中遞迴"
-#: builtin/submodule--helper.c:2597
+#: builtin/submodule--helper.c:2819
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]"
-#: builtin/submodule--helper.c:2653
+#: builtin/submodule--helper.c:2875
msgid "check if it is safe to write to the .gitmodules file"
msgstr "檢查寫入 .gitmodules 檔案是否安全"
-#: builtin/submodule--helper.c:2656
+#: builtin/submodule--helper.c:2878
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 檔案中的設定"
-#: builtin/submodule--helper.c:2661
+#: builtin/submodule--helper.c:2883
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名稱> [<值>]"
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2884
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名稱>"
-#: builtin/submodule--helper.c:2663
+#: builtin/submodule--helper.c:2885
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2682 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "請確認 .gitmodules 檔案在工作區裡"
-#: builtin/submodule--helper.c:2698
+#: builtin/submodule--helper.c:2920
msgid "suppress output for setting url of a submodule"
msgstr "隱藏子模組設定 URL 的輸出"
-#: builtin/submodule--helper.c:2702
+#: builtin/submodule--helper.c:2924
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2957
msgid "set the default tracking branch to master"
msgstr "將預設的追蹤分支設為 master"
-#: builtin/submodule--helper.c:2737
+#: builtin/submodule--helper.c:2959
msgid "set the default tracking branch"
msgstr "設定預設追蹤分支"
-#: builtin/submodule--helper.c:2741
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-#: builtin/submodule--helper.c:2742
+#: builtin/submodule--helper.c:2964
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-#: builtin/submodule--helper.c:2749
+#: builtin/submodule--helper.c:2971
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:2752
+#: builtin/submodule--helper.c:2974
msgid "--branch and --default are mutually exclusive"
msgstr "--branch 與 --default 互斥"
-#: builtin/submodule--helper.c:2815
+#: builtin/submodule--helper.c:3037
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n"
-#: builtin/submodule--helper.c:2818
+#: builtin/submodule--helper.c:3040
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "「%s」已存在，且不是有效的 git 版本庫"
-#: builtin/submodule--helper.c:2828
-#, fuzzy, c-format
-#| msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgid "A git directory for '%s' is found locally with remote(s):"
-msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫："
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\n"
-#: builtin/submodule--helper.c:2833
+#: builtin/submodule--helper.c:3060
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" %s\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
-"or if you are unsure what this means, choose another name with the '--name' "
-"option.\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
"如果您想要直接使用這個本機 git 目錄，而非重新複製自\n"
" %s\n"
"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
-"或者說您不確定，請使用 '--name' 選項輸入其他名稱。\n"
+"假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。"
-#: builtin/submodule--helper.c:2842
+#: builtin/submodule--helper.c:3072
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:3109
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "無法簽出「%s」子模組"
-#: builtin/submodule--helper.c:2888
-msgid "branch of repository to checkout on cloning"
-msgstr "複製時要簽出的版本庫分支"
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "無法加入子模組「%s」"
-#: builtin/submodule--helper.c:2910
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "無法註冊子模組「%s」"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "「%s」已在索引中"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "「%s」已在索引中，且不是子模組"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "要加入為子模組的版本庫分支"
+
+#: builtin/submodule--helper.c:3254
msgid "allow adding an otherwise ignored submodule path"
msgstr "允許加入忽略的子模組路徑"
-#: builtin/submodule--helper.c:2917
-msgid ""
-"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
-"name <name>"
-msgstr ""
-"git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --name "
-"<名稱>"
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "只輸出錯誤訊息"
-#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "從引用的版本庫借用物件"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr "將子模組名稱設定為指定字串，而非預設的路徑名稱"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作區的頂級目錄中使用相對路徑"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "「%s」不是有效的子模組名稱"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支援 --super-prefix"
-#: builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3410
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
@@ -22608,21 +22990,21 @@
msgid "shorten ref output"
msgstr "縮短引用輸出"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
msgid "reason of the update"
msgstr "更新的原因"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" <tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n"
-"\t\t<標籤名> [<頭>]"
+" <標籤名> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
@@ -22632,12 +23014,12 @@
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
"at <物件>]\n"
-"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
+" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22701,130 +23083,130 @@
msgid "bad object type."
msgstr "壞的物件類型。"
-#: builtin/tag.c:328
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "無標籤說明？"
-#: builtin/tag.c:335
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "標籤說明被保留在 %s\n"
-#: builtin/tag.c:446
+#: builtin/tag.c:444
msgid "list tag names"
msgstr "列出標籤名稱"
-#: builtin/tag.c:448
+#: builtin/tag.c:446
msgid "print <n> lines of each tag message"
msgstr "每個標籤訊息列印 <n> 行"
-#: builtin/tag.c:450
+#: builtin/tag.c:448
msgid "delete tags"
msgstr "刪除標籤"
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "verify tags"
msgstr "驗證標籤"
-#: builtin/tag.c:453
+#: builtin/tag.c:451
msgid "Tag creation options"
msgstr "標籤建立選項"
-#: builtin/tag.c:455
+#: builtin/tag.c:453
msgid "annotated tag, needs a message"
msgstr "附註標籤，需要一個說明"
-#: builtin/tag.c:457
+#: builtin/tag.c:455
msgid "tag message"
msgstr "標籤說明"
-#: builtin/tag.c:459
+#: builtin/tag.c:457
msgid "force edit of tag message"
msgstr "強制編輯標籤說明"
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr "附註並附加 GPG 簽名的標籤"
-#: builtin/tag.c:463
+#: builtin/tag.c:461
msgid "use another key to sign the tag"
msgstr "使用另外的私鑰簽名該標籤"
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "replace the tag if exists"
msgstr "如果存在，取代現有的標籤"
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "建立引用日誌"
-#: builtin/tag.c:467
+#: builtin/tag.c:465
msgid "Tag listing options"
msgstr "標籤列表選項"
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "show tag list in columns"
msgstr "以列的方式顯示標籤列表"
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr "只列印包含該提交的標籤"
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that don't contain the commit"
msgstr "只列印不包含該提交的標籤"
-#: builtin/tag.c:473
+#: builtin/tag.c:471
msgid "print only tags that are merged"
msgstr "只列印已經合併的標籤"
-#: builtin/tag.c:474
+#: builtin/tag.c:472
msgid "print only tags that are not merged"
msgstr "只列印尚未合併的標籤"
-#: builtin/tag.c:478
+#: builtin/tag.c:476
msgid "print only tags of the object"
msgstr "只列印指向該物件的標籤"
-#: builtin/tag.c:526
+#: builtin/tag.c:525
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不相容"
-#: builtin/tag.c:548
+#: builtin/tag.c:546
msgid "-n option is only allowed in list mode"
msgstr "-n 選項只允許用在列表顯示模式"
-#: builtin/tag.c:550
+#: builtin/tag.c:548
msgid "--contains option is only allowed in list mode"
msgstr "--contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:552
+#: builtin/tag.c:550
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:554
+#: builtin/tag.c:552
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 選項只允許用在列表顯示模式"
-#: builtin/tag.c:556
+#: builtin/tag.c:554
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
-#: builtin/tag.c:567
+#: builtin/tag.c:568
msgid "only one -F or -m option is allowed."
msgstr "只允許一個 -F 或 -m 選項。"
-#: builtin/tag.c:592
+#: builtin/tag.c:593
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一個有效的標籤名稱。"
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "tag '%s' already exists"
msgstr "標籤 '%s' 已存在"
-#: builtin/tag.c:628
+#: builtin/tag.c:629
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新標籤 '%s'（曾為 %s）\n"
@@ -22838,207 +23220,202 @@
msgid "failed to create directory %s"
msgstr "建立目錄 %s 失敗"
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "建立檔案 %s 失敗"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "刪除檔案 %s 失敗"
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "刪除目錄 %s 失敗"
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中測試 mtime "
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "新增一個新檔案後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "新增一個新目錄後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "更新一個檔案後，目錄的狀態訊息被修改"
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改"
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "刪除一個檔案後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "刪除一個目錄後，目錄的狀態訊息未改變"
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<選項>] [--] [<檔案>...]"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr "當索引需要更新時繼續重新整理"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr "重新整理：忽略子模組"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr "不忽略新的檔案"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr "讓檔案取代目錄（反之亦然）"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr "通知檔案從工作區遺失"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引區包含未合併的條目也執行重新整理"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr "重新整理統計訊息"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<物件>,<路徑>"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr "新增指定的條目到索引區"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr "把檔案標記為 \"沒有變更\""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr "把檔案標記為 \"僅索引\""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr "不要建立只有索引的項目"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr "只新增到索引區；不新增物件到物件庫"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作區裡，也刪除路徑"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "攜帶 --stdin：輸入的行以 null 字元終止"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr "從標準輸入中讀取需要更新的路徑列表"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr "從標準輸入新增條目到索引區"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "為指定檔案重新生成第2和第3暫存區"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr "只更新與 HEAD 不同的條目"
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr "忽略工作區遺失的檔案"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr "在標準輸出顯示動作"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘記儲存的未解決的衝突"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr "以這種格式寫入索引區"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr "啟用或停用索引分割"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr "啟用/停用對未追蹤檔案的快取"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr "測試檔案系統是否支援未追蹤檔案快取"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr "即使沒有被標記為已更改，也要寫出索引"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr "啟用或停用檔案系統監控"
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr "標記檔案為 fsmonitor 有效"
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割，請移除或修改"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割，請移除或修改"
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -23046,11 +23423,11 @@
"core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或"
"修改"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr "快取未追蹤檔案被停用"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -23058,25 +23435,25 @@
"core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或"
"修改"
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "快取未追蹤檔案在 '%s' 啟用"
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項"
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr "fsmonitor 被啟用"
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項"
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr "fsmonitor 被停用"
@@ -23092,19 +23469,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<選項>] --stdin [-z]"
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
msgid "delete the reference"
msgstr "刪除引用"
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
msgid "stdin has NUL-terminated arguments"
msgstr "標準輸入有以 NUL 字元終止的參數"
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
msgid "read updates from stdin"
msgstr "從標準輸入讀取更新"
@@ -23120,19 +23497,19 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<選項>] <目錄>"
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "在一次單獨的請求/回應之後離開"
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在初始的引用廣告後立即離開"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "為 git-http-backend 提供 info/refs"
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/"
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活動 <n> 秒鐘後終止傳輸"
@@ -23168,63 +23545,58 @@
msgid "print tag contents"
msgstr "列印標籤內容"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<選項>] <路徑> [<提交>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree list [<options>]"
msgstr "git worktree list [<選項>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<選項>] <路徑>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作區> <新路徑>"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<選項>]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<選項>] <工作區>"
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路徑>"
-#: builtin/worktree.c:61 builtin/worktree.c:944
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "刪除 '%s' 失敗"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
#, c-format
msgid "Removing %s/%s: %s"
msgstr "移除 %s/%s: %s"
-#: builtin/worktree.c:147
+#: builtin/worktree.c:148
msgid "report pruned working trees"
msgstr "報告清除的工作區"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:150
msgid "expire working trees older than <time>"
msgstr "將早於 <時間> 的工作區過期"
-#: builtin/worktree.c:219
+#: builtin/worktree.c:220
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已經存在"
-#: builtin/worktree.c:228
+#: builtin/worktree.c:229
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "無法使用的工作目錄目的地「%s」"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -23233,7 +23605,7 @@
"'%s' 是個遺失但被鎖定的工作區；\n"
"使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -23242,139 +23614,139 @@
"'%s' 是個遺失但已註冊的工作區；\n"
"使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:286
+#: builtin/worktree.c:287
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能建立目錄 '%s'"
-#: builtin/worktree.c:308
+#: builtin/worktree.c:309
msgid "initializing"
msgstr "正在初始化"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:421 builtin/worktree.c:427
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "準備工作區（新分支 '%s'）"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:423
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:432
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "準備工作區（簽出 '%s'）"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區（分離開頭指標 %s）"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
msgid "create a new branch"
msgstr "建立一個新分支"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
msgid "populate the new working tree"
msgstr "生成新的工作區"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
msgid "keep the new working tree locked"
msgstr "鎖定新工作區"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:493 builtin/worktree.c:730
msgid "reason for locking"
msgstr "鎖定原因"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:496
msgid "set up tracking mode (see git-branch(1))"
msgstr "設定追蹤模式（參見 git-branch(1)）"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:499
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "嘗試為新分支名符合一個遠端追蹤分支"
-#: builtin/worktree.c:506
+#: builtin/worktree.c:507
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:509
msgid "--reason requires --lock"
msgstr "--reason 需要 --lock"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:513
msgid "added with --lock"
msgstr "已使用 --lock 加入"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:575
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在建立新分支時使用 --[no-]track 選項"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:692
msgid "show extended annotations and reasons, if available"
msgstr "如果有則顯示延伸的註釋和原因"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:694
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"
-#: builtin/worktree.c:702
+#: builtin/worktree.c:703
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "--verbose 和 --porcelain 互斥"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一個工作區"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:744 builtin/worktree.c:777
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作區無法被加鎖或解鎖"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:749
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被鎖定，原因：%s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:751
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被鎖定"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:820
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移動或刪除包含子模組的工作區"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:828
msgid "force move even if worktree is dirty or locked"
msgstr "強制移動，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:851 builtin/worktree.c:975
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一個主工作區"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:856
#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr "無法從 '%s' 算出目標名稱"
+msgstr "無法從 '%s' 算出目的地名稱"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:869
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -23383,7 +23755,7 @@
"無法移動一個鎖定的工作區，鎖定原因：%s\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:871
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -23391,36 +23763,36 @@
"無法移動一個鎖定的工作區，\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:874
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "驗證失敗，無法移動工作區：%s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:879
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移動 '%s' 到 '%s' 失敗"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:925
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中執行 'git status' 失敗"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:929
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:934
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:957
msgid "force removal even if worktree is dirty or locked"
msgstr "強制刪除，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:980
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -23429,7 +23801,7 @@
"無法刪除一個鎖定的工作區，鎖定原因：%s\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:982
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -23437,17 +23809,17 @@
"無法刪除一個鎖定的工作區，\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:985
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "驗證失敗，無法刪除工作區：%s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1009
#, c-format
msgid "repair: %s: %s"
msgstr "修復：%s：%s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1012
#, c-format
msgid "error: %s: %s"
msgstr "錯誤：%s：%s"
@@ -23541,7 +23913,7 @@
#: git.c:375
#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr "在擴展別名 '%s' 時：'%s'"
+msgstr "在展開別名 '%s' 時：'%s'"
#: git.c:384
#, c-format
@@ -23574,17 +23946,17 @@
msgid "close failed on standard output"
msgstr "標準輸出關閉失敗"
-#: git.c:833
+#: git.c:832
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "檢測到別名循環：'%s'的擴展未終止：%s"
+msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
-#: git.c:883
+#: git.c:882
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作為內建指令處理 %s"
-#: git.c:896
+#: git.c:895
#, c-format
msgid ""
"usage: %s\n"
@@ -23593,12 +23965,12 @@
"用法：%s\n"
"\n"
-#: git.c:916
+#: git.c:915
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n"
-#: git.c:928
+#: git.c:927
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "執行指令 '%s' 失敗：%s\n"
@@ -23645,65 +24017,31 @@
msgid "exit immediately after advertising capabilities"
msgstr "對能力廣告之後立即離開"
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "無法在下述位置啟動伺服器：「%s」"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "無法在背景啟動 (spawn) 守護程式"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid 失敗"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守護程式尚未上線"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "無法啟動守護程式"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid 被混淆"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守護程式尚未關閉"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
msgid "test-helper simple-ipc is-active [<name>] [<options>]"
msgstr "test-helper simple-ipc is-active [<name>] [<options>]"
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]"
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
msgid "test-helper simple-ipc send [<name>] [<token>]"
msgstr "test-helper simple-ipc send [<name>] [<token>]"
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
msgstr "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
msgid ""
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
@@ -23711,83 +24049,79 @@
"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
"[<batchsize>]"
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
msgid "name or pathname of unix domain socket"
msgstr "Unix 網域通訊端的名稱或路徑名稱"
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
msgid "named-pipe name"
msgstr "有命名管道的名稱"
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
msgid "number of threads in server thread pool"
msgstr "伺服器執行緒集區的執行緒數量"
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
msgid "seconds to wait for daemon to start or stop"
msgstr "要等待守護程式啟動或停止多久（秒）"
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
msgid "number of bytes"
msgstr "位元組數"
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
msgid "number of requests per thread"
msgstr "每個執行緒的請求數"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "byte"
msgstr "位元組"
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
msgid "ballast character"
msgstr "穩定 (ballast) 字元"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "token"
msgstr "代符"
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
msgid "command token to send to the server"
msgstr "要傳送至伺服器的命令代符"
-#: http.c:399
+#: http.c:350
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 為負值，預設為 %d"
-#: http.c:420
+#: http.c:371
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支援委託控制，因為 cURL < 7.22.0"
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"
-#: http.c:910
+#: http.c:812
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "不支援協定限制，因為 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
-#: http.c:1139
+#: http.c:1023
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端"
-#: http.c:1143
+#: http.c:1027
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
-#: http.c:2034
+#: http.c:1876
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -23803,45 +24137,50 @@
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中無效的引號：'%s'"
-#: remote-curl.c:307
+#: remote-curl.c:304
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
-#: remote-curl.c:408
+#: remote-curl.c:405
msgid "invalid server response; expected service, got flush packet"
msgstr "無效的服務端回應。預期服務，得到 flush 包"
-#: remote-curl.c:439
+#: remote-curl.c:436
#, c-format
msgid "invalid server response; got '%s'"
msgstr "無效的服務端回應，得到 '%s'"
-#: remote-curl.c:499
+#: remote-curl.c:496
#, c-format
msgid "repository '%s' not found"
msgstr "版本庫 '%s' 未找到"
-#: remote-curl.c:503
+#: remote-curl.c:500
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 身份驗證失敗"
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s"
+
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s': %s"
msgstr "無法存取 '%s'：%s"
-#: remote-curl.c:513
+#: remote-curl.c:514
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:644
+#: remote-curl.c:645
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
-#: remote-curl.c:656
+#: remote-curl.c:657
msgid "remote server sent unexpected response end packet"
msgstr "遠端伺服器傳送了非預期的回應結束封包"
@@ -23849,83 +24188,83 @@
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
-#: remote-curl.c:756
+#: remote-curl.c:755
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: 錯誤的行長度字串：%.4s"
-#: remote-curl.c:758
+#: remote-curl.c:757
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: 非預期的回應結束封包"
-#: remote-curl.c:834
+#: remote-curl.c:833
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失敗。%s"
-#: remote-curl.c:874
+#: remote-curl.c:873
msgid "cannot handle pushes this big"
msgstr "不能處理這麼大的推送"
-#: remote-curl.c:989
+#: remote-curl.c:986
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
-#: remote-curl.c:993
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能壓縮請求，zlib 結束錯誤 %d"
-#: remote-curl.c:1043
+#: remote-curl.c:1040
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 位元組長度的標頭"
-#: remote-curl.c:1045
+#: remote-curl.c:1042
#, c-format
msgid "%d bytes of body are still expected"
msgstr "預期仍要有 %d 位元組的本文 (body)"
-#: remote-curl.c:1134
+#: remote-curl.c:1131
msgid "dumb http transport does not support shallow capabilities"
msgstr "啞 http 傳輸不支援 shallow 能力"
-#: remote-curl.c:1149
+#: remote-curl.c:1146
msgid "fetch failed."
msgstr "取得失敗。"
-#: remote-curl.c:1195
+#: remote-curl.c:1192
msgid "cannot fetch by sha1 over smart http"
msgstr "無法透過智慧 HTTP 取得 sha1"
-#: remote-curl.c:1239 remote-curl.c:1245
+#: remote-curl.c:1236 remote-curl.c:1242
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
-#: remote-curl.c:1257 remote-curl.c:1375
+#: remote-curl.c:1254 remote-curl.c:1372
#, c-format
msgid "http transport does not support %s"
msgstr "http 傳輸協定不支援 %s"
-#: remote-curl.c:1293
+#: remote-curl.c:1290
msgid "git-http-push failed"
msgstr "git-http-push 失敗"
-#: remote-curl.c:1481
+#: remote-curl.c:1478
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
-#: remote-curl.c:1513
+#: remote-curl.c:1510
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：錯誤讀取來自 git 的指令流"
-#: remote-curl.c:1520
+#: remote-curl.c:1517
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：嘗試沒有本機版本庫下取得"
-#: remote-curl.c:1561
+#: remote-curl.c:1558
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的來自 git 的指令 '%s'"
@@ -23946,44 +24285,44 @@
msgid "object filtering"
msgstr "物件過濾"
-#: parse-options.h:184
+#: parse-options.h:183
msgid "expiry-date"
msgstr "到期時間"
-#: parse-options.h:198
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "空動作（向後相容）"
-#: parse-options.h:310
+#: parse-options.h:308
msgid "be more verbose"
msgstr "更加詳細"
-#: parse-options.h:312
+#: parse-options.h:310
msgid "be more quiet"
msgstr "更加安靜"
-#: parse-options.h:318
+#: parse-options.h:316
msgid "use <n> digits to display object names"
msgstr "用 <n> 位數字顯示物件名稱"
-#: parse-options.h:337
+#: parse-options.h:335
msgid "how to strip spaces and #comments from message"
msgstr "設定如何刪除提交說明裡的空格和 #備註"
-#: parse-options.h:338
+#: parse-options.h:336
msgid "read pathspec from file"
msgstr "從檔案讀取 <路徑規格>"
-#: parse-options.h:339
+#: parse-options.h:337
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "key"
msgstr "key"
-#: ref-filter.h:99
+#: ref-filter.h:101
msgid "field name to sort on"
msgstr "排序的欄位名"
@@ -24668,41 +25007,6 @@
msgid "An overview of recommended workflows with Git"
msgstr "Git 推薦的工作流概覽"
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分搜尋執行失敗：沒有提供指令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "執行 $command"
-
-#: git-bisect.sh:80
-#, 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:105
-msgid "bisect run cannot continue any more"
-msgstr "二分搜尋不能繼續執行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分搜尋執行失敗：\n"
-"‘bisect-state $state’ 結束，錯誤碼 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分搜尋執行成功"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -24741,434 +25045,28 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "簡單合併未生效，嘗試自動合併。"
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "只能在工作區的頂級目錄中使用相對路徑"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已經存在於索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已經存在於索引中且不是一個子模組"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 沒有簽出的提交"
-
-#: git-submodule.sh:248
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "無法新增子模組 '$sm_path'"
-
-#: git-submodule.sh:257
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "無法註冊子模組 '$sm_path'"
-
-#: git-submodule.sh:532
+#: git-submodule.sh:401
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本"
-#: git-submodule.sh:542
+#: git-submodule.sh:411
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中取得"
-#: git-submodule.sh:547
+#: git-submodule.sh:416
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:565
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1："
-
-#: git-submodule.sh:571
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。"
-
-#: git-submodule.sh:578
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'"
-
-#: git-submodule.sh:579
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'"
-
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'"
-
-#: git-submodule.sh:584
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'"
-
-#: git-submodule.sh:589
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中"
-
-#: git-submodule.sh:590
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'"
-
-#: git-submodule.sh:595
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗"
-
-#: git-submodule.sh:596
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "子模組 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:627
+#: git-submodule.sh:464
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "無法遞迴進子模組路徑 '$displaypath'"
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已套用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "不能儲存 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"套用 autostash 導致衝突。\n"
-"您的修改安全地儲存在儲藏區中。\n"
-"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "重定基底中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <commit> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-"\n"
-"指令:\n"
-"p, pick <提交> = 使用提交\n"
-"r, reword <提交> = 使用提交，但修改提交說明\n"
-"e, edit <提交> = 使用提交，但停下來修補\n"
-"s, squash <提交> = 使用提交，但融合到前一個提交\n"
-"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
-"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
-"d, drop <提交> = 刪除提交\n"
-"l, label <標籤> = 為目前 HEAD 打上標籤\n"
-"t, reset <標籤> = 重設 HEAD 到該標籤\n"
-"m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n"
-". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
-". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
-". -c <提交> 可以編輯提交說明。\n"
-"\n"
-"可以對這些行重新排序，將從上至下執行。\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, sh-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您現在可以修補這個提交，使用\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"當您對變更感到滿意，執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：不是一個可以被揀選的提交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "無效的提交名：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "不能寫入目前提交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "不能快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "不能移動 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒絕壓縮一個合併：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "無法重做合併 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "不能揀選 $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "這是提交說明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "提交說明 #${n} 將被略過："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "這是一個 $count 個提交的組合。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "不能寫入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "這是一個 2 個提交的組合。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "不能套用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"不能在成功揀選 $sha1... $rest 之後修補提交\n"
-"這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-commit\n"
-"掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "停止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "沒有父提交的情況下不能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "執行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "執行失敗：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "並且修改索引和/或工作區"
-
-# 譯者：請維持前導空格
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您可以解決這個問題，然後執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"執行成功：$rest\n"
-"但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知指令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "要修改請使用指令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "成功重定基底並更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "不能刪除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, sh-format
-msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-"您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"如果這些變更要形成一個新提交，執行：\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
-"\n"
-"無論哪種情況，當您完成提交，繼續執行：\n"
-"\n"
-" git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修補提交中尋找作者訊息時遇到錯誤"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "不能提交暫存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "無法執行編輯器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "不能簽出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "沒有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "不能建立暫時 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "不能標記為互動式"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注意空提交已被備註掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "不能對重寫提交進行初始化"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
@@ -25185,44 +25083,28 @@
msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。"
#: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "不能重定基底：您有未暫存的變更。"
-
-#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重寫分支：您有未暫存的變更。"
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "無法透過重定基底方式拉取：您有未暫存的變更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暫存的變更。"
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "不能重定基底：您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作區的頂級目錄中執行這個指令。"
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
msgid "Unable to determine absolute path of git directory"
msgstr "不能確定 git 目錄的絕對路徑"
@@ -25418,7 +25300,7 @@
"? - print help\n"
msgstr ""
"g - 選擇跳轉到一個區塊\n"
-"/ - 尋找和提供正規表示式符合的區塊\n"
+"/ - 尋找和提供常規表示式符合的區塊\n"
"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"
"J - 維持此區塊未決狀態，檢視下一個區塊\n"
"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
@@ -25478,7 +25360,7 @@
#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
-msgstr "錯誤的正規表示式 %s：%s\n"
+msgstr "錯誤的常規表示式 %s：%s\n"
#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
@@ -25726,7 +25608,7 @@
#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "致命錯誤：別名 '%s' 擴展為它自己\n"
+msgstr "致命錯誤：別名 '%s' 展開後還是自己\n"
#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
@@ -25742,7 +25624,7 @@
#. at this point.
#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)："
+msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)： "
#: git-send-email.perl:1446
#, perl-format
@@ -25762,12 +25644,12 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
-" 以上的抄送列表（Cc）已經用修補檔提交說明中發現的位址進行\n"
-" 了擴展。預設 send-email 會給出提示。這個行為可以透過\n"
+" 以上的 CC 清單已經用修補檔提交說明中發現的位址進行展開。\n"
+" 預設 send-email 會給出提示。這個行為可以透過\n"
" sendemail.confirm 設定設定。\n"
"\n"
-" 更多訊息，執行 'git send-email --help'。\n"
-" 要保持目前行為，但不顯示此訊息，執行 'git config --global\n"
+" 更多資訊，請執行 'git send-email --help'。\n"
+" 要保持目前行為，但不顯示此訊息，請執行 'git config --global\n"
" sendemail.confirm auto'。\n"
"\n"
@@ -25825,13 +25707,13 @@
#: git-send-email.perl:1688
msgid "Result: "
-msgstr "結果："
+msgstr "結果： "
#: git-send-email.perl:1691
msgid "Result: OK\n"
msgstr "結果：OK\n"
-#: git-send-email.perl:1709
+#: git-send-email.perl:1708
#, perl-format
msgid "can't open file %s"
msgstr "無法開啟檔案 %s"
@@ -25856,30 +25738,30 @@
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 新增 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1965
+#: git-send-email.perl:1973
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能執行 '%s'"
-#: git-send-email.perl:1972
+#: git-send-email.perl:1980
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 新增 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1976
+#: git-send-email.perl:1984
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 無法關閉管道至 '%s'"
-#: git-send-email.perl:2006
+#: git-send-email.perl:2014
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式傳送訊息"
-#: git-send-email.perl:2014
+#: git-send-email.perl:2022
msgid "invalid transfer encoding"
msgstr "無效的傳送編碼"
-#: git-send-email.perl:2051
+#: git-send-email.perl:2059
#, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -25890,12 +25772,12 @@
"%s\n"
"警告：修補檔未能傳送\n"
-#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能開啟 %s：%s\n"
-#: git-send-email.perl:2064
+#: git-send-email.perl:2072
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -25904,16 +25786,504 @@
"致命錯誤：%s:%d 的字元數超過 998\n"
"警告：修補檔未能傳送\n"
-#: git-send-email.perl:2082
+#: git-send-email.perl:2090
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略過 %s 含備份後綴 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2086
+#: git-send-email.perl:2094
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr "您真的要傳送 %s？[y|N]："
+msgstr "您真的要傳送 %s？[y|N]： "
+
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "下列路徑規格不符合任何適合路徑，\n"
+#~ "但符合目前稀疏簽出外的索引項目：\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr "若有意更新這些項目，請停用或修改稀疏規則。"
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "不能設定 GIT_DIR 為 '%s'"
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "不能開啟 /dev/null"
+
+#~ 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 ""
+#~ "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
+#~ "對修正後的檔案做標記，然後用 'git commit' 提交"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "不能開啟或者複製 /dev/null"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "嘗試不在 cone 模式使用稀疏索引"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "無法更新快取樹，保持完整"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "無法為寫入開啟 '%s'。"
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "不能建立歸檔檔案 '%s'"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check 需要 2 或 3 個參數"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "不要在「%s」建立新檔案"
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree：無法開啟 '%s'"
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "無法開啟 packfile '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "無法儲存包檔案"
+
+#~ msgid "cannot store index file"
+#~ msgstr "無法儲存索引檔案"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "從 <檔案> 中讀取排除模式"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "merge-recursive 的未知選項：-X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "不可用的待辦列表：'%s'"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<選項>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "對合併提交重定基底"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "保持兄弟提交的原始分支點"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "移動以 squash!/fixup! 開頭的提交"
+
+#~ msgid "sign commits"
+#~ msgstr "簽名提交"
+
+#~ msgid "continue rebase"
+#~ msgstr "繼續重定基底"
+
+#~ msgid "skip commit"
+#~ msgstr "略過提交"
+
+#~ msgid "edit the todo list"
+#~ msgstr "重定基底待辦列表"
+
+#~ msgid "show the current patch"
+#~ msgstr "顯示目前修補檔"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "縮短待辦列表中的提交號"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "擴展待辦列表中的提交號"
+
+#~ msgid "check the todo list"
+#~ msgstr "檢查待辦列表"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "重新排列 fixup/squash 行"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "在待辦列表中插入 exec 執行指令"
+
+#~ msgid "onto"
+#~ msgstr "onto"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "限制版本"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "squash onto"
+
+#~ msgid "the upstream commit"
+#~ msgstr "上游提交"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "head 名稱"
+
+#~ msgid "rebase strategy"
+#~ msgstr "重定基底策略"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "策略選項"
+
+#~ msgid "switch-to"
+#~ msgstr "切換到"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "要簽出的分支或提交"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "onto name"
+
+#~ msgid "cmd"
+#~ msgstr "cmd"
+
+#~ msgid "the command to run"
+#~ msgstr "要執行的指令"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --"
+#~ "name <名稱>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "建立檔案 %s 失敗"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "在初始的引用廣告後立即離開"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」"
+
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "無法在下述位置啟動伺服器：「%s」"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "無法在背景啟動 (spawn) 守護程式"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid 失敗"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "守護程式尚未上線"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "無法啟動守護程式"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid 被混淆"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "守護程式尚未關閉"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "不支援協定限制，因為 cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "執行 $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' 沒有簽出的提交"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "子模組 '$displaypath'：'$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "已套用 autostash。"
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "不能儲存 $stash_sha1"
+
+#~ 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 ""
+#~ "套用 autostash 導致衝突。\n"
+#~ "您的修改安全地儲存在儲藏區中。\n"
+#~ "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "重定基底中（$new_count/$total）"
+
+#~ msgid ""
+#~ "\n"
+#~ "Commands:\n"
+#~ "p, pick <commit> = use commit\n"
+#~ "r, reword <commit> = use commit, but edit the commit message\n"
+#~ "e, edit <commit> = use commit, but stop for amending\n"
+#~ "s, squash <commit> = use commit, but meld into previous commit\n"
+#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
+#~ "message\n"
+#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
+#~ "d, drop <commit> = remove commit\n"
+#~ "l, label <label> = label current HEAD with a name\n"
+#~ "t, reset <label> = reset HEAD to a label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ". create a merge commit using the original merge commit's\n"
+#~ ". message (or the oneline, if no original merge commit was\n"
+#~ ". specified). Use -c <commit> to reword the commit message.\n"
+#~ "\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "指令:\n"
+#~ "p, pick <提交> = 使用提交\n"
+#~ "r, reword <提交> = 使用提交，但修改提交說明\n"
+#~ "e, edit <提交> = 使用提交，但停下來修補\n"
+#~ "s, squash <提交> = 使用提交，但融合到前一個提交\n"
+#~ "f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
+#~ "x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
+#~ "d, drop <提交> = 刪除提交\n"
+#~ "l, label <標籤> = 為目前 HEAD 打上標籤\n"
+#~ "t, reset <標籤> = 重設 HEAD 到該標籤\n"
+#~ "m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n"
+#~ ". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
+#~ ". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
+#~ ". -c <提交> 可以編輯提交說明。\n"
+#~ "\n"
+#~ "可以對這些行重新排序，將從上至下執行。\n"
+
+#~ msgid ""
+#~ "You can amend the commit now, with\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Once you are satisfied with your changes, run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您現在可以修補這個提交，使用\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "當您對變更感到滿意，執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1：不是一個可以被揀選的提交"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "無效的提交名：$sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "不能寫入目前提交的替代 sha1"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "快轉到 $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "不能快轉到 $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "不能移動 HEAD 到 $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "拒絕壓縮一個合併：$sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "無法重做合併 $sha1"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "不能揀選 $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "這是提交說明 #${n}："
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "提交說明 #${n} 將被略過："
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "這是一個 $count 個提交的組合。"
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "不能寫入 $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "這是一個 2 個提交的組合。"
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "不能套用 $sha1... $rest"
+
+#~ msgid ""
+#~ "Could not amend commit after successfully picking $sha1... $rest\n"
+#~ "This is most likely due to an empty commit message, or the pre-commit "
+#~ "hook\n"
+#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
+#~ "before\n"
+#~ "you are able to reword the commit."
+#~ msgstr ""
+#~ "不能在成功揀選 $sha1... $rest 之後修補提交\n"
+#~ "這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-"
+#~ "commit\n"
+#~ "掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。"
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "停止在 $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "沒有父提交的情況下不能 '$squash_style'"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "執行：$rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "執行失敗：$rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "並且修改索引和/或工作區"
+
+# 譯者：請維持前導空格
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "您可以解決這個問題，然後執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid ""
+#~ "Execution succeeded: $rest\n"
+#~ "but left changes to the index and/or the working tree\n"
+#~ "Commit or stash your changes, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "執行成功：$rest\n"
+#~ "但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "未知指令：$command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "要修改請使用指令 'git rebase --edit-todo'。"
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "成功重定基底並更新 $head_name。"
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "不能刪除 CHERRY_PICK_HEAD"
+
+#~ msgid ""
+#~ "You have staged changes in your working tree.\n"
+#~ "If these changes are meant to be\n"
+#~ "squashed into the previous commit, run:\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "If they are meant to go into a new commit, run:\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "In both cases, once you're done, continue with:\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+#~ msgstr ""
+#~ "您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n"
+#~ "\n"
+#~ " git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "如果這些變更要形成一個新提交，執行：\n"
+#~ "\n"
+#~ " git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "無論哪種情況，當您完成提交，繼續執行：\n"
+#~ "\n"
+#~ " git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr "在修補提交中尋找作者訊息時遇到錯誤"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "不能提交暫存的修改。"
+
+#~ msgid "Could not execute editor"
+#~ msgstr "無法執行編輯器"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "不能簽出 $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "沒有 HEAD？"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "不能建立暫時 $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "不能標記為互動式"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "注意空提交已被備註掉"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "不能對重寫提交進行初始化"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "不能重定基底：您有未暫存的變更。"
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "無法透過重定基底方式拉取：您有未暫存的變更。"
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "不能重定基底：您的索引中包含未提交的變更。"
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。"
#~ msgid "unable to write stateless separator packet"
#~ msgstr "無法寫入無狀態的分隔符號封包"
diff --git a/pretty.c b/pretty.c
index 9631529..1af5b09 100644
--- a/pretty.c
+++ b/pretty.c
@@ -431,6 +431,52 @@
return show_date(date, tz, mode);
}
+static inline void strbuf_add_with_color(struct strbuf *sb, const char *color,
+ const char *buf, size_t buflen)
+{
+ strbuf_addstr(sb, color);
+ strbuf_add(sb, buf, buflen);
+ if (*color)
+ strbuf_addstr(sb, GIT_COLOR_RESET);
+}
+
+static void append_line_with_color(struct strbuf *sb, struct grep_opt *opt,
+ const char *line, size_t linelen,
+ int color, enum grep_context ctx,
+ enum grep_header_field field)
+{
+ const char *buf, *eol, *line_color, *match_color;
+ regmatch_t match;
+ int eflags = 0;
+
+ buf = line;
+ eol = buf + linelen;
+
+ if (!opt || !want_color(color) || opt->invert)
+ goto end;
+
+ line_color = opt->colors[GREP_COLOR_SELECTED];
+ match_color = opt->colors[GREP_COLOR_MATCH_SELECTED];
+
+ while (grep_next_match(opt, buf, eol, ctx, &match, field, eflags)) {
+ if (match.rm_so == match.rm_eo)
+ break;
+
+ strbuf_add_with_color(sb, line_color, buf, match.rm_so);
+ strbuf_add_with_color(sb, match_color, buf + match.rm_so,
+ match.rm_eo - match.rm_so);
+ buf += match.rm_eo;
+ eflags = REG_NOTBOL;
+ }
+
+ if (eflags)
+ strbuf_add_with_color(sb, line_color, buf, eol - buf);
+ else {
+end:
+ strbuf_add(sb, buf, eol - buf);
+ }
+}
+
void pp_user_info(struct pretty_print_context *pp,
const char *what, struct strbuf *sb,
const char *line, const char *encoding)
@@ -496,9 +542,26 @@
strbuf_addch(sb, '\n');
strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf);
} else {
- strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what,
- (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ",
- (int)namelen, namebuf, (int)maillen, mailbuf);
+ struct strbuf id = STRBUF_INIT;
+ enum grep_header_field field = GREP_HEADER_FIELD_MAX;
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
+ if (!strcmp(what, "Author"))
+ field = GREP_HEADER_AUTHOR;
+ else if (!strcmp(what, "Commit"))
+ field = GREP_HEADER_COMMITTER;
+
+ strbuf_addf(sb, "%s: ", what);
+ if (pp->fmt == CMIT_FMT_FULLER)
+ strbuf_addchars(sb, ' ', 4);
+
+ strbuf_addf(&id, "%.*s <%.*s>", (int)namelen, namebuf,
+ (int)maillen, mailbuf);
+
+ append_line_with_color(sb, opt, id.buf, id.len, pp->color,
+ GREP_CONTEXT_HEAD, field);
+ strbuf_addch(sb, '\n');
+ strbuf_release(&id);
}
switch (pp->fmt) {
@@ -1432,8 +1495,8 @@
check_commit_signature(c->commit, &(c->signature_check));
switch (placeholder[1]) {
case 'G':
- if (c->signature_check.gpg_output)
- strbuf_addstr(sb, c->signature_check.gpg_output);
+ if (c->signature_check.output)
+ strbuf_addstr(sb, c->signature_check.output);
break;
case '?':
switch (c->signature_check.result) {
@@ -1935,8 +1998,9 @@
return width;
}
-static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
- const char *line, int linelen)
+static void strbuf_add_tabexpand(struct strbuf *sb, struct grep_opt *opt,
+ int color, int tabwidth, const char *line,
+ int linelen)
{
const char *tab;
@@ -1953,7 +2017,9 @@
break;
/* Output the data .. */
- strbuf_add(sb, line, tab - line);
+ append_line_with_color(sb, opt, line, tab - line, color,
+ GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
/* .. and the de-tabified tab */
strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth));
@@ -1968,7 +2034,8 @@
* worrying about width - there's nothing more to
* align.
*/
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen, color, GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
/*
@@ -1980,11 +2047,16 @@
struct strbuf *sb, int indent,
const char *line, int linelen)
{
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
strbuf_addchars(sb, ' ', indent);
if (pp->expand_tabs_in_log)
- strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen);
+ strbuf_add_tabexpand(sb, opt, pp->color, pp->expand_tabs_in_log,
+ line, linelen);
else
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen, pp->color,
+ GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
static int is_mboxrd_from(const char *line, int len)
@@ -2002,7 +2074,9 @@
struct strbuf *sb,
int indent)
{
+ struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
int first = 1;
+
for (;;) {
const char *line = *msg_p;
int linelen = get_one_line(line);
@@ -2023,14 +2097,17 @@
if (indent)
pp_handle_indent(pp, sb, indent, line, linelen);
else if (pp->expand_tabs_in_log)
- strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
- line, linelen);
+ strbuf_add_tabexpand(sb, opt, pp->color,
+ pp->expand_tabs_in_log, line,
+ linelen);
else {
if (pp->fmt == CMIT_FMT_MBOXRD &&
is_mboxrd_from(line, linelen))
strbuf_addch(sb, '>');
- strbuf_add(sb, line, linelen);
+ append_line_with_color(sb, opt, line, linelen,
+ pp->color, GREP_CONTEXT_BODY,
+ GREP_HEADER_FIELD_MAX);
}
strbuf_addch(sb, '\n');
}
diff --git a/protocol-caps.c b/protocol-caps.c
index 901b679..bbde918 100644
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@ -75,8 +75,7 @@
strbuf_release(&send_buffer);
}
-int cap_object_info(struct repository *r, struct strvec *keys,
- struct packet_reader *request)
+int cap_object_info(struct repository *r, struct packet_reader *request)
{
struct requested_info info;
struct packet_writer writer;
diff --git a/protocol-caps.h b/protocol-caps.h
index 0a9f49d..15c4550 100644
--- a/protocol-caps.h
+++ b/protocol-caps.h
@@ -2,9 +2,7 @@
#define PROTOCOL_CAPS_H
struct repository;
-struct strvec;
struct packet_reader;
-int cap_object_info(struct repository *r, struct strvec *keys,
- struct packet_reader *request);
+int cap_object_info(struct repository *r, struct packet_reader *request);
#endif /* PROTOCOL_CAPS_H */
diff --git a/quote.c b/quote.c
index 8a3a5e3..26719d2 100644
--- a/quote.c
+++ b/quote.c
@@ -471,6 +471,23 @@
strbuf_addch(sb, sq);
}
+void perl_quote_buf_with_len(struct strbuf *sb, const char *src, size_t len)
+{
+ const char sq = '\'';
+ const char bq = '\\';
+ const char *c = src;
+ const char *end = src + len;
+
+ strbuf_addch(sb, sq);
+ while (c != end) {
+ if (*c == sq || *c == bq)
+ strbuf_addch(sb, bq);
+ strbuf_addch(sb, *c);
+ c++;
+ }
+ strbuf_addch(sb, sq);
+}
+
void python_quote_buf(struct strbuf *sb, const char *src)
{
const char sq = '\'';
diff --git a/quote.h b/quote.h
index 049d8dd..87ff458 100644
--- a/quote.h
+++ b/quote.h
@@ -95,6 +95,7 @@
/* quoting as a string literal for other languages */
void perl_quote_buf(struct strbuf *sb, const char *src);
+void perl_quote_buf_with_len(struct strbuf *sb, const char *src, size_t len);
void python_quote_buf(struct strbuf *sb, const char *src);
void tcl_quote_buf(struct strbuf *sb, const char *src);
void basic_regex_quote_buf(struct strbuf *sb, const char *src);
diff --git a/read-cache.c b/read-cache.c
index 9048ef9..f398659 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -738,7 +738,7 @@
int intent_only = flags & ADD_CACHE_INTENT;
int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
(intent_only ? ADD_CACHE_NEW_ONLY : 0));
- int hash_flags = HASH_WRITE_OBJECT;
+ unsigned hash_flags = pretend ? 0 : HASH_WRITE_OBJECT;
struct object_id oid;
if (flags & ADD_CACHE_RENORMALIZE)
@@ -849,6 +849,19 @@
return xcalloc(1, cache_entry_size(len));
}
+enum verify_path_result {
+ PATH_OK,
+ PATH_INVALID,
+ PATH_DIR_WITH_SEP,
+};
+
+static enum verify_path_result verify_path_internal(const char *, unsigned);
+
+int verify_path(const char *path, unsigned mode)
+{
+ return verify_path_internal(path, mode) == PATH_OK;
+}
+
struct cache_entry *make_cache_entry(struct index_state *istate,
unsigned int mode,
const struct object_id *oid,
@@ -859,7 +872,7 @@
struct cache_entry *ce, *ret;
int len;
- if (!verify_path(path, mode)) {
+ if (verify_path_internal(path, mode) == PATH_INVALID) {
error(_("invalid path '%s'"), path);
return NULL;
}
@@ -993,60 +1006,62 @@
return 1;
}
-int verify_path(const char *path, unsigned mode)
+static enum verify_path_result verify_path_internal(const char *path,
+ unsigned mode)
{
char c = 0;
if (has_dos_drive_prefix(path))
- return 0;
+ return PATH_INVALID;
if (!is_valid_path(path))
- return 0;
+ return PATH_INVALID;
goto inside;
for (;;) {
if (!c)
- return 1;
+ return PATH_OK;
if (is_dir_sep(c)) {
inside:
if (protect_hfs) {
if (is_hfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_hfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
if (protect_ntfs) {
#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
if (c == '\\')
- return 0;
+ return PATH_INVALID;
#endif
if (is_ntfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_ntfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
c = *path++;
if ((c == '.' && !verify_dotfile(path, mode)) ||
is_dir_sep(c))
- return 0;
+ return PATH_INVALID;
/*
* allow terminating directory separators for
* sparse directory entries.
*/
if (c == '\0')
- return S_ISDIR(mode);
+ return S_ISDIR(mode) ? PATH_DIR_WITH_SEP :
+ PATH_INVALID;
} else if (c == '\\' && protect_ntfs) {
if (is_ntfs_dotgit(path))
- return 0;
+ return PATH_INVALID;
if (S_ISLNK(mode)) {
if (is_ntfs_dotgitmodules(path))
- return 0;
+ return PATH_INVALID;
}
}
@@ -1349,7 +1364,7 @@
if (!ok_to_add)
return -1;
- if (!verify_path(ce->name, ce->ce_mode))
+ if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
return error(_("invalid path '%s'"), ce->name);
if (!skip_df_check &&
@@ -1944,13 +1959,22 @@
prepare_repo_settings(r);
- if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) {
+ switch (r->settings.core_untracked_cache) {
+ case UNTRACKED_CACHE_REMOVE:
remove_untracked_cache(istate);
- return;
- }
-
- if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+ break;
+ case UNTRACKED_CACHE_WRITE:
add_untracked_cache(istate);
+ break;
+ case UNTRACKED_CACHE_KEEP:
+ /*
+ * Either an explicit "core.untrackedCache=keep", the
+ * default if "core.untrackedCache" isn't configured,
+ * or a fallback on an unknown "core.untrackedCache"
+ * value.
+ */
+ break;
+ }
}
static void tweak_split_index(struct index_state *istate)
@@ -2391,9 +2415,21 @@
base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
trace2_region_enter_printf("index", "shared/do_read_index",
the_repository, "%s", base_path);
- ret = do_read_index(split_index->base, base_path, 1);
+ ret = do_read_index(split_index->base, base_path, 0);
trace2_region_leave_printf("index", "shared/do_read_index",
the_repository, "%s", base_path);
+ if (!ret) {
+ char *path_copy = xstrdup(path);
+ const char *base_path2 = xstrfmt("%s/sharedindex.%s",
+ dirname(path_copy),
+ base_oid_hex);
+ free(path_copy);
+ trace2_region_enter_printf("index", "shared/do_read_index",
+ the_repository, "%s", base_path2);
+ ret = do_read_index(split_index->base, base_path2, 1);
+ trace2_region_leave_printf("index", "shared/do_read_index",
+ the_repository, "%s", base_path2);
+ }
if (!oideq(&split_index->base_oid, &split_index->base->oid))
die(_("broken index, expect %s in %s, got %s"),
base_oid_hex, base_path,
@@ -2812,11 +2848,8 @@
}
}
- if (!istate->version) {
+ if (!istate->version)
istate->version = get_index_format_default(the_repository);
- if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
- init_split_index(istate);
- }
/* demote version 3 to version 2 when the latter suffices */
if (istate->version == 3 || istate->version == 2)
@@ -3069,7 +3102,7 @@
int ret;
int was_full = !istate->sparse_index;
- ret = convert_to_sparse(istate);
+ ret = convert_to_sparse(istate, 0);
if (ret) {
warning(_("failed to convert to a sparse-index"));
@@ -3182,7 +3215,7 @@
int ret, was_full = !istate->sparse_index;
move_cache_to_base_index(istate);
- convert_to_sparse(istate);
+ convert_to_sparse(istate, 0);
trace2_region_enter_printf("index", "shared/do_write_index",
the_repository, "%s", get_tempfile_path(*temp));
@@ -3243,7 +3276,7 @@
int write_locked_index(struct index_state *istate, struct lock_file *lock,
unsigned flags)
{
- int new_shared_index, ret;
+ int new_shared_index, ret, test_split_index_env;
struct split_index *si = istate->split_index;
if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
@@ -3258,7 +3291,10 @@
if (istate->fsmonitor_last_update)
fill_fsmonitor_bitmap(istate);
- if (!si || alternate_index_output ||
+ test_split_index_env = git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
+
+ if ((!si && !test_split_index_env) ||
+ alternate_index_output ||
(istate->cache_changed & ~EXTMASK)) {
if (si)
oidclr(&si->base_oid);
@@ -3266,10 +3302,15 @@
goto out;
}
- if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
- int v = si->base_oid.hash[0];
- if ((v & 15) < 6)
+ if (test_split_index_env) {
+ if (!si) {
+ si = init_split_index(istate);
istate->cache_changed |= SPLIT_INDEX_ORDERED;
+ } else {
+ int v = si->base_oid.hash[0];
+ if ((v & 15) < 6)
+ istate->cache_changed |= SPLIT_INDEX_ORDERED;
+ }
}
if (too_many_not_shared_entries(istate))
istate->cache_changed |= SPLIT_INDEX_ORDERED;
diff --git a/rebase-interactive.c b/rebase-interactive.c
index b6cbd16..87649d0 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -226,32 +226,3 @@
todo_list_release(&backup);
return res;
}
-
-int check_todo_list_from_file(struct repository *r)
-{
- struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
- int res = 0;
-
- if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
- res = error(_("could not read '%s'."), rebase_path_todo());
- goto out;
- }
-
- if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
- res = error(_("could not read '%s'."), rebase_path_todo_backup());
- goto out;
- }
-
- res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
- if (!res)
- res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
- if (res)
- fprintf(stderr, _(edit_todo_list_advice));
- if (!res)
- res = todo_list_check(&old_todo, &new_todo);
-out:
- todo_list_release(&old_todo);
- todo_list_release(&new_todo);
-
- return res;
-}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index dc2cf0e..7239c60 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -16,6 +16,4 @@
int todo_list_check_against_backup(struct repository *r,
struct todo_list *todo_list);
-int check_todo_list_from_file(struct repository *r);
-
#endif
diff --git a/rebase.c b/rebase.c
index f8137d8..6775cdd 100644
--- a/rebase.c
+++ b/rebase.c
@@ -1,5 +1,6 @@
#include "rebase.h"
#include "config.h"
+#include "gettext.h"
/*
* Parses textual value for pull.rebase, branch.<name>.rebase, etc.
@@ -20,12 +21,12 @@
return REBASE_FALSE;
else if (v > 0)
return REBASE_TRUE;
- else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
- return REBASE_PRESERVE;
else if (!strcmp(value, "merges") || !strcmp(value, "m"))
return REBASE_MERGES;
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
return REBASE_INTERACTIVE;
+ else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
+ error(_("%s: 'preserve' superseded by 'merges'"), value);
/*
* Please update _git_config() in git-completion.bash when you
* add new rebase modes.
diff --git a/rebase.h b/rebase.h
index cc723d4..203b437 100644
--- a/rebase.h
+++ b/rebase.h
@@ -5,7 +5,6 @@
REBASE_INVALID = -1,
REBASE_FALSE = 0,
REBASE_TRUE,
- REBASE_PRESERVE,
REBASE_MERGES,
REBASE_INTERACTIVE
};
diff --git a/ref-filter.c b/ref-filter.c
index 0cfef7b..08a3f83 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -144,6 +144,7 @@
ATOM_BODY,
ATOM_TRAILERS,
ATOM_CONTENTS,
+ ATOM_RAW,
ATOM_UPSTREAM,
ATOM_PUSH,
ATOM_SYMREF,
@@ -156,6 +157,7 @@
ATOM_IF,
ATOM_THEN,
ATOM_ELSE,
+ ATOM_REST,
};
/*
@@ -190,6 +192,9 @@
unsigned int nlines;
} contents;
struct {
+ enum { RAW_BARE, RAW_LENGTH } option;
+ } raw_data;
+ struct {
cmp_status cmp_status;
const char *str;
} if_then_else;
@@ -223,7 +228,7 @@
return ret;
}
-static int color_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int color_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *color_value, struct strbuf *err)
{
if (!color_value)
@@ -261,7 +266,7 @@
return 0;
}
-static int remote_ref_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int remote_ref_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
struct string_list params = STRING_LIST_INIT_DUP;
@@ -308,7 +313,7 @@
return 0;
}
-static int objecttype_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int objecttype_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (arg)
@@ -320,7 +325,7 @@
return 0;
}
-static int objectsize_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int objectsize_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg) {
@@ -340,7 +345,7 @@
return 0;
}
-static int deltabase_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int deltabase_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (arg)
@@ -352,7 +357,7 @@
return 0;
}
-static int body_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int body_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (arg)
@@ -361,7 +366,7 @@
return 0;
}
-static int subject_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int subject_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg)
@@ -373,7 +378,7 @@
return 0;
}
-static int trailers_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int trailers_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
atom->u.contents.trailer_opts.no_divider = 1;
@@ -399,7 +404,7 @@
return 0;
}
-static int contents_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int contents_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg)
@@ -427,7 +432,19 @@
return 0;
}
-static int oid_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
+ const char *arg, struct strbuf *err)
+{
+ if (!arg)
+ atom->u.raw_data.option = RAW_BARE;
+ else if (!strcmp(arg, "size"))
+ atom->u.raw_data.option = RAW_LENGTH;
+ else
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(raw) argument: %s"), arg);
+ return 0;
+}
+
+static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg)
@@ -446,7 +463,7 @@
return 0;
}
-static int person_email_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int person_email_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg)
@@ -460,7 +477,7 @@
return 0;
}
-static int refname_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int refname_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
return refname_atom_parser_internal(&atom->u.refname, arg, atom->name, err);
@@ -477,7 +494,7 @@
return -1;
}
-static int align_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
struct align *align = &atom->u.align;
@@ -529,7 +546,7 @@
return 0;
}
-static int if_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
if (!arg) {
@@ -544,7 +561,16 @@
return 0;
}
-static int head_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int rest_atom_parser(struct ref_format *format, struct used_atom *atom,
+ const char *arg, struct strbuf *err)
+{
+ if (arg)
+ return strbuf_addf_ret(err, -1, _("%%(rest) does not take arguments"));
+ format->use_rest = 1;
+ return 0;
+}
+
+static int head_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *unused_err)
{
atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
@@ -555,7 +581,7 @@
const char *name;
info_source source;
cmp_type cmp_type;
- int (*parser)(const struct ref_format *format, struct used_atom *atom,
+ int (*parser)(struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err);
} valid_atom[] = {
[ATOM_REFNAME] = { "refname", SOURCE_NONE, FIELD_STR, refname_atom_parser },
@@ -587,6 +613,7 @@
[ATOM_BODY] = { "body", SOURCE_OBJ, FIELD_STR, body_atom_parser },
[ATOM_TRAILERS] = { "trailers", SOURCE_OBJ, FIELD_STR, trailers_atom_parser },
[ATOM_CONTENTS] = { "contents", SOURCE_OBJ, FIELD_STR, contents_atom_parser },
+ [ATOM_RAW] = { "raw", SOURCE_OBJ, FIELD_STR, raw_atom_parser },
[ATOM_UPSTREAM] = { "upstream", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
[ATOM_PUSH] = { "push", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
[ATOM_SYMREF] = { "symref", SOURCE_NONE, FIELD_STR, refname_atom_parser },
@@ -599,13 +626,14 @@
[ATOM_IF] = { "if", SOURCE_NONE, FIELD_STR, if_atom_parser },
[ATOM_THEN] = { "then", SOURCE_NONE },
[ATOM_ELSE] = { "else", SOURCE_NONE },
+ [ATOM_REST] = { "rest", SOURCE_NONE, FIELD_STR, rest_atom_parser },
/*
* Please update $__git_ref_fieldlist in git-completion.bash
* when you add new atoms
*/
};
-#define REF_FORMATTING_STATE_INIT { 0, NULL }
+#define REF_FORMATTING_STATE_INIT { 0 }
struct ref_formatting_stack {
struct ref_formatting_stack *prev;
@@ -621,16 +649,23 @@
struct atom_value {
const char *s;
+ ssize_t s_size;
int (*handler)(struct atom_value *atomv, struct ref_formatting_state *state,
struct strbuf *err);
uintmax_t value; /* used for sorting when not FIELD_STR */
struct used_atom *atom;
};
+#define ATOM_SIZE_UNSPECIFIED (-1)
+
+#define ATOM_VALUE_INIT { \
+ .s_size = ATOM_SIZE_UNSPECIFIED \
+}
+
/*
* Used to parse format string and sort specifiers
*/
-static int parse_ref_filter_atom(const struct ref_format *format,
+static int parse_ref_filter_atom(struct ref_format *format,
const char *atom, const char *ep,
struct strbuf *err)
{
@@ -645,13 +680,6 @@
return strbuf_addf_ret(err, -1, _("malformed field name: %.*s"),
(int)(ep-atom), atom);
- /* Do we have the atom already used elsewhere? */
- for (i = 0; i < used_atom_cnt; i++) {
- int len = strlen(used_atom[i].name);
- if (len == ep - atom && !memcmp(used_atom[i].name, atom, len))
- return i;
- }
-
/*
* If the atom name has a colon, strip it and everything after
* it off - it specifies the format for this entry, and
@@ -661,6 +689,13 @@
arg = memchr(sp, ':', ep - sp);
atom_len = (arg ? arg : ep) - sp;
+ /* Do we have the atom already used elsewhere? */
+ for (i = 0; i < used_atom_cnt; i++) {
+ int len = strlen(used_atom[i].name);
+ if (len == ep - atom && !memcmp(used_atom[i].name, atom, len))
+ return i;
+ }
+
/* Is the atom a valid one? */
for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
int len = strlen(valid_atom[i].name);
@@ -710,17 +745,23 @@
return at;
}
-static void quote_formatting(struct strbuf *s, const char *str, int quote_style)
+static void quote_formatting(struct strbuf *s, const char *str, ssize_t len, int quote_style)
{
switch (quote_style) {
case QUOTE_NONE:
- strbuf_addstr(s, str);
+ if (len < 0)
+ strbuf_addstr(s, str);
+ else
+ strbuf_add(s, str, len);
break;
case QUOTE_SHELL:
sq_quote_buf(s, str);
break;
case QUOTE_PERL:
- perl_quote_buf(s, str);
+ if (len < 0)
+ perl_quote_buf(s, str);
+ else
+ perl_quote_buf_with_len(s, str, len);
break;
case QUOTE_PYTHON:
python_quote_buf(s, str);
@@ -741,9 +782,11 @@
* encountered.
*/
if (!state->stack->prev)
- quote_formatting(&state->stack->output, v->s, state->quote_style);
- else
+ quote_formatting(&state->stack->output, v->s, v->s_size, state->quote_style);
+ else if (v->s_size < 0)
strbuf_addstr(&state->stack->output, v->s);
+ else
+ strbuf_add(&state->stack->output, v->s, v->s_size);
return 0;
}
@@ -843,21 +886,23 @@
return 0;
}
-static int is_empty(const char *s)
+static int is_empty(struct strbuf *buf)
{
- while (*s != '\0') {
- if (!isspace(*s))
- return 0;
- s++;
- }
- return 1;
-}
+ const char *cur = buf->buf;
+ const char *end = buf->buf + buf->len;
+
+ while (cur != end && (isspace(*cur)))
+ cur++;
+
+ return cur == end;
+ }
static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state,
struct strbuf *err)
{
struct ref_formatting_stack *cur = state->stack;
struct if_then_else *if_then_else = NULL;
+ size_t str_len = 0;
if (cur->at_end == if_then_else_handler)
if_then_else = (struct if_then_else *)cur->at_end_data;
@@ -868,18 +913,22 @@
if (if_then_else->else_atom_seen)
return strbuf_addf_ret(err, -1, _("format: %%(then) atom used after %%(else)"));
if_then_else->then_atom_seen = 1;
+ if (if_then_else->str)
+ str_len = strlen(if_then_else->str);
/*
* If the 'equals' or 'notequals' attribute is used then
* perform the required comparison. If not, only non-empty
* strings satisfy the 'if' condition.
*/
if (if_then_else->cmp_status == COMPARE_EQUAL) {
- if (!strcmp(if_then_else->str, cur->output.buf))
+ if (str_len == cur->output.len &&
+ !memcmp(if_then_else->str, cur->output.buf, cur->output.len))
if_then_else->condition_satisfied = 1;
} else if (if_then_else->cmp_status == COMPARE_UNEQUAL) {
- if (strcmp(if_then_else->str, cur->output.buf))
+ if (str_len != cur->output.len ||
+ memcmp(if_then_else->str, cur->output.buf, cur->output.len))
if_then_else->condition_satisfied = 1;
- } else if (cur->output.len && !is_empty(cur->output.buf))
+ } else if (cur->output.len && !is_empty(&cur->output))
if_then_else->condition_satisfied = 1;
strbuf_reset(&cur->output);
return 0;
@@ -925,7 +974,7 @@
* only on the topmost supporting atom.
*/
if (!current->prev->prev) {
- quote_formatting(&s, current->output.buf, state->quote_style);
+ quote_formatting(&s, current->output.buf, current->output.len, state->quote_style);
strbuf_swap(¤t->output, &s);
}
strbuf_release(&s);
@@ -955,6 +1004,11 @@
return NULL;
}
+static int reject_atom(enum atom_type atom_type)
+{
+ return atom_type == ATOM_REST;
+}
+
/*
* Make sure the format string is well formed, and parse out
* the used atoms.
@@ -975,6 +1029,16 @@
at = parse_ref_filter_atom(format, sp + 2, ep, &err);
if (at < 0)
die("%s", err.buf);
+ if (reject_atom(used_atom[at].atom_type))
+ die(_("this command reject atom %%(%.*s)"), (int)(ep - sp - 2), sp + 2);
+
+ if ((format->quote_style == QUOTE_PYTHON ||
+ format->quote_style == QUOTE_SHELL ||
+ format->quote_style == QUOTE_TCL) &&
+ used_atom[at].atom_type == ATOM_RAW &&
+ used_atom[at].u.raw_data.option == RAW_BARE)
+ die(_("--format=%.*s cannot be used with "
+ "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
cp = ep + 1;
if (skip_prefix(used_atom[at].name, "color:", &color))
@@ -1357,25 +1421,42 @@
}
/* See grab_values */
-static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
+static void grab_sub_body_contents(struct atom_value *val, int deref, struct expand_data *data)
{
int i;
const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;
size_t sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
+ void *buf = data->content;
for (i = 0; i < used_atom_cnt; i++) {
struct used_atom *atom = &used_atom[i];
const char *name = atom->name;
struct atom_value *v = &val[i];
+ enum atom_type atom_type = atom->atom_type;
if (!!deref != (*name == '*'))
continue;
if (deref)
name++;
- if (strcmp(name, "body") &&
- !starts_with(name, "subject") &&
- !starts_with(name, "trailers") &&
- !starts_with(name, "contents"))
+
+ if (atom_type == ATOM_RAW) {
+ unsigned long buf_size = data->size;
+
+ if (atom->u.raw_data.option == RAW_BARE) {
+ v->s = xmemdupz(buf, buf_size);
+ v->s_size = buf_size;
+ } else if (atom->u.raw_data.option == RAW_LENGTH) {
+ v->s = xstrfmt("%"PRIuMAX, (uintmax_t)buf_size);
+ }
+ continue;
+ }
+
+ if ((data->type != OBJ_TAG &&
+ data->type != OBJ_COMMIT) ||
+ (strcmp(name, "body") &&
+ !starts_with(name, "subject") &&
+ !starts_with(name, "trailers") &&
+ !starts_with(name, "contents")))
continue;
if (!subpos)
find_subpos(buf,
@@ -1439,25 +1520,29 @@
* pointed at by the ref itself; otherwise it is the object the
* ref (which is a tag) refers to.
*/
-static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf)
+static void grab_values(struct atom_value *val, int deref, struct object *obj, struct expand_data *data)
{
+ void *buf = data->content;
+
switch (obj->type) {
case OBJ_TAG:
grab_tag_values(val, deref, obj);
- grab_sub_body_contents(val, deref, buf);
+ grab_sub_body_contents(val, deref, data);
grab_person("tagger", val, deref, buf);
break;
case OBJ_COMMIT:
grab_commit_values(val, deref, obj);
- grab_sub_body_contents(val, deref, buf);
+ grab_sub_body_contents(val, deref, data);
grab_person("author", val, deref, buf);
grab_person("committer", val, deref, buf);
break;
case OBJ_TREE:
/* grab_tree_values(val, deref, obj, buf, sz); */
+ grab_sub_body_contents(val, deref, data);
break;
case OBJ_BLOB:
/* grab_blob_values(val, deref, obj, buf, sz); */
+ grab_sub_body_contents(val, deref, data);
break;
default:
die("Eh? Object of type %d?", obj->type);
@@ -1679,7 +1764,7 @@
return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
oid_to_hex(&oi->oid), ref->refname);
}
- grab_values(ref->value, deref, *obj, oi->content);
+ grab_values(ref->value, deref, *obj, oi);
}
grab_common_values(ref->value, deref, oi);
@@ -1761,6 +1846,7 @@
const char *refname;
struct branch *branch = NULL;
+ v->s_size = ATOM_SIZE_UNSPECIFIED;
v->handler = append_atom;
v->atom = atom;
@@ -1864,6 +1950,12 @@
v->handler = else_atom_handler;
v->s = xstrdup("");
continue;
+ } else if (atom_type == ATOM_REST) {
+ if (ref->rest)
+ v->s = xstrdup(ref->rest);
+ else
+ v->s = xstrdup("");
+ continue;
} else
continue;
@@ -2008,8 +2100,7 @@
*/
static int for_each_fullref_in_pattern(struct ref_filter *filter,
each_ref_fn cb,
- void *cb_data,
- int broken)
+ void *cb_data)
{
if (!filter->match_as_path) {
/*
@@ -2017,7 +2108,7 @@
* prefixes like "refs/heads/" etc. are stripped off,
* so we have to look at everything:
*/
- return for_each_fullref_in("", cb, cb_data, broken);
+ return for_each_fullref_in("", cb, cb_data);
}
if (filter->ignore_case) {
@@ -2026,16 +2117,16 @@
* so just return everything and let the caller
* sort it out.
*/
- return for_each_fullref_in("", cb, cb_data, broken);
+ return for_each_fullref_in("", cb, cb_data);
}
if (!filter->name_patterns[0]) {
/* no patterns; we have to look at everything */
- return for_each_fullref_in("", cb, cb_data, broken);
+ return for_each_fullref_in("", cb, cb_data);
}
return for_each_fullref_in_prefixes(NULL, filter->name_patterns,
- cb, cb_data, broken);
+ cb, cb_data);
}
/*
@@ -2081,6 +2172,7 @@
FLEX_ALLOC_STR(ref, refname, refname);
oidcpy(&ref->objectname, oid);
+ ref->rest = NULL;
return ref;
}
@@ -2312,13 +2404,10 @@
{
struct ref_filter_cbdata ref_cbdata;
int ret = 0;
- unsigned int broken = 0;
ref_cbdata.array = array;
ref_cbdata.filter = filter;
- if (type & FILTER_REFS_INCLUDE_BROKEN)
- broken = 1;
filter->kind = type & FILTER_REFS_KIND_MASK;
init_contains_cache(&ref_cbdata.contains_cache);
@@ -2335,13 +2424,13 @@
* of filter_ref_kind().
*/
if (filter->kind == FILTER_REFS_BRANCHES)
- ret = for_each_fullref_in("refs/heads/", ref_filter_handler, &ref_cbdata, broken);
+ ret = for_each_fullref_in("refs/heads/", ref_filter_handler, &ref_cbdata);
else if (filter->kind == FILTER_REFS_REMOTES)
- ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata, broken);
+ ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata);
else if (filter->kind == FILTER_REFS_TAGS)
- ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata, broken);
+ ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata);
else if (filter->kind & FILTER_REFS_ALL)
- ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata, broken);
+ ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata);
if (!ret && (filter->kind & FILTER_REFS_DETACHED_HEAD))
head_ref(ref_filter_handler, &ref_cbdata);
}
@@ -2368,6 +2457,19 @@
return 0;
}
+static int memcasecmp(const void *vs1, const void *vs2, size_t n)
+{
+ const char *s1 = vs1, *s2 = vs2;
+ const char *end = s1 + n;
+
+ for (; s1 < end; s1++, s2++) {
+ int diff = tolower(*s1) - tolower(*s2);
+ if (diff)
+ return diff;
+ }
+ return 0;
+}
+
static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
{
struct atom_value *va, *vb;
@@ -2388,10 +2490,29 @@
} else if (s->sort_flags & REF_SORTING_VERSION) {
cmp = versioncmp(va->s, vb->s);
} else if (cmp_type == FIELD_STR) {
- int (*cmp_fn)(const char *, const char *);
- cmp_fn = s->sort_flags & REF_SORTING_ICASE
- ? strcasecmp : strcmp;
- cmp = cmp_fn(va->s, vb->s);
+ if (va->s_size < 0 && vb->s_size < 0) {
+ int (*cmp_fn)(const char *, const char *);
+ cmp_fn = s->sort_flags & REF_SORTING_ICASE
+ ? strcasecmp : strcmp;
+ cmp = cmp_fn(va->s, vb->s);
+ } else {
+ size_t a_size = va->s_size < 0 ?
+ strlen(va->s) : va->s_size;
+ size_t b_size = vb->s_size < 0 ?
+ strlen(vb->s) : vb->s_size;
+ int (*cmp_fn)(const void *, const void *, size_t);
+ cmp_fn = s->sort_flags & REF_SORTING_ICASE
+ ? memcasecmp : memcmp;
+
+ cmp = cmp_fn(va->s, vb->s, b_size > a_size ?
+ a_size : b_size);
+ if (!cmp) {
+ if (a_size > b_size)
+ cmp = 1;
+ else if (a_size < b_size)
+ cmp = -1;
+ }
+ }
} else {
if (va->value < vb->value)
cmp = -1;
@@ -2461,9 +2582,9 @@
}
int format_ref_array_item(struct ref_array_item *info,
- const struct ref_format *format,
- struct strbuf *final_buf,
- struct strbuf *error_buf)
+ struct ref_format *format,
+ struct strbuf *final_buf,
+ struct strbuf *error_buf)
{
const char *cp, *sp, *ep;
struct ref_formatting_state state = REF_FORMATTING_STATE_INIT;
@@ -2490,7 +2611,7 @@
append_literal(cp, sp, &state);
}
if (format->need_color_reset_at_eol) {
- struct atom_value resetv;
+ struct atom_value resetv = ATOM_VALUE_INIT;
resetv.s = GIT_COLOR_RESET;
if (append_atom(&resetv, &state, error_buf)) {
pop_stack_element(&state.stack);
@@ -2507,7 +2628,7 @@
}
void pretty_print_ref(const char *name, const struct object_id *oid,
- const struct ref_format *format)
+ struct ref_format *format)
{
struct ref_array_item *ref_item;
struct strbuf output = STRBUF_INIT;
@@ -2584,6 +2705,15 @@
return 0;
}
+void ref_sorting_release(struct ref_sorting *sorting)
+{
+ while (sorting) {
+ struct ref_sorting *next = sorting->next;
+ free(sorting);
+ sorting = next;
+ }
+}
+
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
{
struct ref_filter *rf = opt->value;
diff --git a/ref-filter.h b/ref-filter.h
index baf72a7..6228458 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -13,7 +13,6 @@
#define QUOTE_PYTHON 4
#define QUOTE_TCL 8
-#define FILTER_REFS_INCLUDE_BROKEN 0x0001
#define FILTER_REFS_TAGS 0x0002
#define FILTER_REFS_BRANCHES 0x0004
#define FILTER_REFS_REMOTES 0x0008
@@ -38,6 +37,7 @@
struct ref_array_item {
struct object_id objectname;
+ const char *rest;
int flag;
unsigned int kind;
const char *symref;
@@ -76,14 +76,16 @@
* verify_ref_format() afterwards to finalize.
*/
const char *format;
+ const char *rest;
int quote_style;
+ int use_rest;
int use_color;
/* Internal state to ref-filter */
int need_color_reset_at_eol;
};
-#define REF_FORMAT_INIT { NULL, 0, -1 }
+#define REF_FORMAT_INIT { .use_color = -1 }
/* Macros for checking --merged and --no-merged options */
#define _OPT_MERGED_NO_MERGED(option, filter, h) \
@@ -116,7 +118,7 @@
void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting, unsigned int mask, int on);
/* Based on the given format and quote_style, fill the strbuf */
int format_ref_array_item(struct ref_array_item *info,
- const struct ref_format *format,
+ struct ref_format *format,
struct strbuf *final_buf,
struct strbuf *error_buf);
/* Parse a single sort specifier and add it to the list */
@@ -125,6 +127,8 @@
int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);
/* Default sort option based on refname */
struct ref_sorting *ref_default_sorting(void);
+/* Release a "struct ref_sorting" */
+void ref_sorting_release(struct ref_sorting *);
/* Function to parse --merged and --no-merged options */
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
/* Get the current HEAD's description */
@@ -137,7 +141,7 @@
* name must be a fully qualified refname.
*/
void pretty_print_ref(const char *name, const struct object_id *oid,
- const struct ref_format *format);
+ struct ref_format *format);
/*
* Push a single ref onto the array; this can be used to construct your own
diff --git a/reflog-walk.c b/reflog-walk.c
index e9cd328..8ac4b28 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -158,10 +158,9 @@
}
reflogs = read_complete_reflog(branch);
if (!reflogs || reflogs->nr == 0) {
- struct object_id oid;
char *b;
int ret = dwim_log(branch, strlen(branch),
- &oid, &b);
+ NULL, &b);
if (ret > 1)
free(b);
else if (ret == 1) {
diff --git a/refs.c b/refs.c
index 8b9f7c3..d7cc0a2 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,7 @@
#include "refs.h"
#include "refs/refs-internal.h"
#include "run-command.h"
+#include "hook.h"
#include "object-store.h"
#include "object.h"
#include "tag.h"
@@ -33,11 +34,6 @@
return NULL;
}
-int ref_storage_backend_exists(const char *name)
-{
- return find_ref_storage_backend(name) != NULL;
-}
-
/*
* How to handle various characters in refnames:
* 0: An acceptable character for refs
@@ -255,12 +251,13 @@
* does not exist, emit a warning and return false.
*/
int ref_resolves_to_object(const char *refname,
+ struct repository *repo,
const struct object_id *oid,
unsigned int flags)
{
if (flags & REF_ISBROKEN)
return 0;
- if (!has_object_file(oid)) {
+ if (!repo_has_object_file(repo, oid)) {
error(_("%s does not point to a valid object!"), refname);
return 0;
}
@@ -698,7 +695,7 @@
strbuf_addf(&path, *p, len, str);
ref = refs_resolve_ref_unsafe(refs, path.buf,
RESOLVE_REF_READING,
- &hash, NULL);
+ oid ? &hash : NULL, NULL);
if (!ref)
continue;
if (refs_reflog_exists(refs, path.buf))
@@ -710,7 +707,8 @@
continue;
if (!logs_found++) {
*log = xstrdup(it);
- oidcpy(oid, &hash);
+ if (oid)
+ oidcpy(oid, &hash);
}
if (!warn_ambiguous_refs)
break;
@@ -1413,14 +1411,21 @@
struct ref_iterator *refs_ref_iterator_begin(
struct ref_store *refs,
- const char *prefix, int trim, int flags)
+ const char *prefix, int trim,
+ enum do_for_each_ref_flags flags)
{
struct ref_iterator *iter;
- if (ref_paranoia < 0)
- ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
- if (ref_paranoia)
- flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+ if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {
+ static int ref_paranoia = -1;
+
+ if (ref_paranoia < 0)
+ ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 1);
+ if (ref_paranoia) {
+ flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+ flags |= DO_FOR_EACH_OMIT_DANGLING_SYMREFS;
+ }
+ }
iter = refs->be->iterator_begin(refs, prefix, flags);
@@ -1479,7 +1484,8 @@
}
static int do_for_each_ref(struct ref_store *refs, const char *prefix,
- each_ref_fn fn, int trim, int flags, void *cb_data)
+ each_ref_fn fn, int trim,
+ enum do_for_each_ref_flags flags, void *cb_data)
{
struct ref_iterator *iter;
struct do_for_each_ref_help hp = { fn, cb_data };
@@ -1514,25 +1520,16 @@
return refs_for_each_ref_in(get_main_ref_store(the_repository), prefix, fn, cb_data);
}
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data)
{
- unsigned int flag = 0;
-
- if (broken)
- flag = DO_FOR_EACH_INCLUDE_BROKEN;
return do_for_each_ref(get_main_ref_store(the_repository),
- prefix, fn, 0, flag, cb_data);
+ prefix, fn, 0, 0, cb_data);
}
int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
- each_ref_fn fn, void *cb_data,
- unsigned int broken)
+ each_ref_fn fn, void *cb_data)
{
- unsigned int flag = 0;
-
- if (broken)
- flag = DO_FOR_EACH_INCLUDE_BROKEN;
- return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
+ return do_for_each_ref(refs, prefix, fn, 0, 0, cb_data);
}
int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data)
@@ -1624,8 +1621,7 @@
int for_each_fullref_in_prefixes(const char *namespace,
const char **patterns,
- each_ref_fn fn, void *cb_data,
- unsigned int broken)
+ each_ref_fn fn, void *cb_data)
{
struct string_list prefixes = STRING_LIST_INIT_DUP;
struct string_list_item *prefix;
@@ -1640,7 +1636,7 @@
for_each_string_list_item(prefix, &prefixes) {
strbuf_addstr(&buf, prefix->string);
- ret = for_each_fullref_in(buf.buf, fn, cb_data, broken);
+ ret = for_each_fullref_in(buf.buf, fn, cb_data);
if (ret)
break;
strbuf_setlen(&buf, namespace_len);
@@ -1681,7 +1677,7 @@
}
return ref_store->be->read_raw_ref(ref_store, refname, oid, referent,
- type);
+ type, &errno);
}
/* This function needs to return a meaningful errno on failure */
@@ -1875,7 +1871,8 @@
* Create, record, and return a ref_store instance for the specified
* gitdir.
*/
-static struct ref_store *ref_store_init(const char *gitdir,
+static struct ref_store *ref_store_init(struct repository *repo,
+ const char *gitdir,
unsigned int flags)
{
const char *be_name = "files";
@@ -1885,7 +1882,7 @@
if (!be)
BUG("reference backend %s is unknown", be_name);
- refs = be->init(gitdir, flags);
+ refs = be->init(repo, gitdir, flags);
return refs;
}
@@ -1897,7 +1894,7 @@
if (!r->gitdir)
BUG("attempting to get main_ref_store outside of repository");
- r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+ r->refs_private = ref_store_init(r, r->gitdir, REF_STORE_ALL_CAPS);
r->refs_private = maybe_debug_wrap_ref_store(r->gitdir, r->refs_private);
return r->refs_private;
}
@@ -1927,6 +1924,7 @@
struct ref_store *refs;
char *to_free = NULL;
size_t len;
+ struct repository *subrepo;
if (!submodule)
return NULL;
@@ -1952,8 +1950,19 @@
if (submodule_to_gitdir(&submodule_sb, submodule))
goto done;
- /* assume that add_submodule_odb() has been called */
- refs = ref_store_init(submodule_sb.buf,
+ subrepo = xmalloc(sizeof(*subrepo));
+ /*
+ * NEEDSWORK: Make get_submodule_ref_store() work with arbitrary
+ * superprojects other than the_repository. This probably should be
+ * done by making it take a struct repository * parameter instead of a
+ * submodule path.
+ */
+ if (repo_submodule_init(subrepo, the_repository, submodule,
+ null_oid())) {
+ free(subrepo);
+ goto done;
+ }
+ refs = ref_store_init(subrepo, submodule_sb.buf,
REF_STORE_READ | REF_STORE_ODB);
register_ref_store_map(&submodule_ref_stores, "submodule",
refs, submodule);
@@ -1979,10 +1988,12 @@
return refs;
if (wt->id)
- refs = ref_store_init(git_common_path("worktrees/%s", wt->id),
+ refs = ref_store_init(the_repository,
+ git_common_path("worktrees/%s", wt->id),
REF_STORE_ALL_CAPS);
else
- refs = ref_store_init(get_git_common_dir(),
+ refs = ref_store_init(the_repository,
+ get_git_common_dir(),
REF_STORE_ALL_CAPS);
if (refs)
@@ -2370,19 +2381,19 @@
}
int refs_reflog_expire(struct ref_store *refs,
- const char *refname, const struct object_id *oid,
+ const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data)
{
- return refs->be->reflog_expire(refs, refname, oid, flags,
+ return refs->be->reflog_expire(refs, refname, flags,
prepare_fn, should_prune_fn,
cleanup_fn, policy_cb_data);
}
-int reflog_expire(const char *refname, const struct object_id *oid,
+int reflog_expire(const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -2390,7 +2401,7 @@
void *policy_cb_data)
{
return refs_reflog_expire(get_main_ref_store(the_repository),
- refname, oid, flags,
+ refname, flags,
prepare_fn, should_prune_fn,
cleanup_fn, policy_cb_data);
}
diff --git a/refs.h b/refs.h
index 48970df..d5099d4 100644
--- a/refs.h
+++ b/refs.h
@@ -342,10 +342,8 @@
int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
- each_ref_fn fn, void *cb_data,
- unsigned int broken);
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
- unsigned int broken);
+ each_ref_fn fn, void *cb_data);
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data);
/**
* iterate all refs in "patterns" by partitioning patterns into disjoint sets
@@ -354,8 +352,7 @@
* callers should be prepared to ignore references that they did not ask for.
*/
int for_each_fullref_in_prefixes(const char *namespace, const char **patterns,
- each_ref_fn fn, void *cb_data,
- unsigned int broken);
+ each_ref_fn fn, void *cb_data);
/**
* iterate refs from the respective area.
*/
@@ -796,7 +793,7 @@
* expiration policy that is desired.
*
* reflog_expiry_prepare_fn -- Called once after the reference is
- * locked.
+ * locked. Called with the OID of the locked reference.
*
* reflog_expiry_should_prune_fn -- Called once for each entry in the
* existing reflog. It should return true iff that entry should be
@@ -816,28 +813,25 @@
typedef void reflog_expiry_cleanup_fn(void *cb_data);
/*
- * Expire reflog entries for the specified reference. oid is the old
- * value of the reference. flags is a combination of the constants in
+ * Expire reflog entries for the specified reference.
+ * flags is a combination of the constants in
* enum expire_reflog_flags. The three function pointers are described
* above. On success, return zero.
*/
int refs_reflog_expire(struct ref_store *refs,
const char *refname,
- const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
-int reflog_expire(const char *refname, const struct object_id *oid,
+int reflog_expire(const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
-int ref_storage_backend_exists(const char *name);
-
struct ref_store *get_main_ref_store(struct repository *r);
/**
diff --git a/refs/debug.c b/refs/debug.c
index 1a7a9e1..8667c64 100644
--- a/refs/debug.c
+++ b/refs/debug.c
@@ -239,15 +239,14 @@
static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname,
struct object_id *oid, struct strbuf *referent,
- unsigned int *type)
+ unsigned int *type, int *failure_errno)
{
struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
int res = 0;
oidcpy(oid, null_oid());
- errno = 0;
res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent,
- type);
+ type, failure_errno);
if (res == 0) {
trace_printf_key(&trace_refs, "read_raw_ref: %s: %s (=> %s) type %x: %d\n",
@@ -255,7 +254,7 @@
} else {
trace_printf_key(&trace_refs,
"read_raw_ref: %s: %d (errno %d)\n", refname,
- res, errno);
+ res, *failure_errno);
}
return res;
}
@@ -365,8 +364,8 @@
};
static void debug_reflog_expiry_prepare(const char *refname,
- const struct object_id *oid,
- void *cb_data)
+ const struct object_id *oid,
+ void *cb_data)
{
struct debug_reflog_expiry_should_prune *prune = cb_data;
trace_printf_key(&trace_refs, "reflog_expire_prepare: %s\n", refname);
@@ -392,7 +391,7 @@
}
static int debug_reflog_expire(struct ref_store *ref_store, const char *refname,
- const struct object_id *oid, unsigned int flags,
+ unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
@@ -405,7 +404,7 @@
.should_prune = should_prune_fn,
.cb_data = policy_cb_data,
};
- int res = drefs->refs->be->reflog_expire(drefs->refs, refname, oid,
+ int res = drefs->refs->be->reflog_expire(drefs->refs, refname,
flags, &debug_reflog_expiry_prepare,
&debug_reflog_expiry_should_prune_fn,
&debug_reflog_expiry_cleanup,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 74c0385..151b005 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -79,13 +79,15 @@
* Create a new submodule ref cache and add it to the internal
* set of caches.
*/
-static struct ref_store *files_ref_store_create(const char *gitdir,
+static struct ref_store *files_ref_store_create(struct repository *repo,
+ const char *gitdir,
unsigned int flags)
{
struct files_ref_store *refs = xcalloc(1, sizeof(*refs));
struct ref_store *ref_store = (struct ref_store *)refs;
struct strbuf sb = STRBUF_INIT;
+ ref_store->repo = repo;
ref_store->gitdir = xstrdup(gitdir);
base_ref_store_init(ref_store, &refs_be_files);
refs->store_flags = flags;
@@ -93,7 +95,7 @@
get_common_dir_noenv(&sb, gitdir);
refs->gitcommondir = strbuf_detach(&sb, NULL);
strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
- refs->packed_ref_store = packed_ref_store_create(sb.buf, flags);
+ refs->packed_ref_store = packed_ref_store_create(repo, sb.buf, flags);
strbuf_release(&sb);
chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir);
@@ -227,7 +229,7 @@
pos = search_ref_dir(dir, prefix, prefix_len);
if (pos >= 0)
continue;
- child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
+ child_entry = create_dir_entry(dir->cache, prefix, prefix_len);
add_entry_to_dir(dir, child_entry);
}
}
@@ -278,7 +280,7 @@
strbuf_addch(&refname, '/');
add_entry_to_dir(dir,
create_dir_entry(dir->cache, refname.buf,
- refname.len, 1));
+ refname.len));
} else {
if (!refs_resolve_ref_unsafe(&refs->base,
refname.buf,
@@ -336,14 +338,14 @@
* lazily):
*/
add_entry_to_dir(get_ref_dir(refs->loose->root),
- create_dir_entry(refs->loose, "refs/", 5, 1));
+ create_dir_entry(refs->loose, "refs/", 5));
}
return refs->loose;
}
-static int files_read_raw_ref(struct ref_store *ref_store,
- const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type)
+static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno)
{
struct files_ref_store *refs =
files_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
@@ -354,7 +356,6 @@
struct stat st;
int fd;
int ret = -1;
- int save_errno;
int remaining_retries = 3;
*type = 0;
@@ -459,10 +460,9 @@
ret = parse_loose_ref_contents(buf, oid, referent, type);
out:
- save_errno = errno;
+ *failure_errno = errno;
strbuf_release(&sb_path);
strbuf_release(&sb_contents);
- errno = save_errno;
return ret;
}
@@ -531,7 +531,6 @@
static int lock_raw_ref(struct files_ref_store *refs,
const char *refname, int mustexist,
const struct string_list *extras,
- const struct string_list *skip,
struct ref_lock **lock_p,
struct strbuf *referent,
unsigned int *type,
@@ -541,6 +540,7 @@
struct strbuf ref_file = STRBUF_INIT;
int attempts_remaining = 3;
int ret = TRANSACTION_GENERIC_ERROR;
+ int failure_errno;
assert(err);
files_assert_main_repository(refs, "lock_raw_ref");
@@ -568,7 +568,7 @@
* reason to expect this error to be transitory.
*/
if (refs_verify_refname_available(&refs->base, refname,
- extras, skip, err)) {
+ extras, NULL, err)) {
if (mustexist) {
/*
* To the user the relevant error is
@@ -611,7 +611,9 @@
if (hold_lock_file_for_update_timeout(
&lock->lk, ref_file.buf, LOCK_NO_DEREF,
get_files_ref_lock_timeout_ms()) < 0) {
- if (errno == ENOENT && --attempts_remaining > 0) {
+ int myerr = errno;
+ errno = 0;
+ if (myerr == ENOENT && --attempts_remaining > 0) {
/*
* Maybe somebody just deleted one of the
* directories leading to ref_file. Try
@@ -619,7 +621,7 @@
*/
goto retry;
} else {
- unable_to_lock_message(ref_file.buf, errno, err);
+ unable_to_lock_message(ref_file.buf, myerr, err);
goto error_return;
}
}
@@ -629,9 +631,9 @@
* fear that its value will change.
*/
- if (files_read_raw_ref(&refs->base, refname,
- &lock->old_oid, referent, type)) {
- if (errno == ENOENT) {
+ if (files_read_raw_ref(&refs->base, refname, &lock->old_oid, referent,
+ type, &failure_errno)) {
+ if (failure_errno == ENOENT) {
if (mustexist) {
/* Garden variety missing reference. */
strbuf_addf(err, "unable to resolve reference '%s'",
@@ -655,7 +657,7 @@
* reference named "refs/foo/bar/baz".
*/
}
- } else if (errno == EISDIR) {
+ } else if (failure_errno == EISDIR) {
/*
* There is a directory in the way. It might have
* contained references that have been deleted. If
@@ -673,7 +675,7 @@
REMOVE_DIR_EMPTY_ONLY)) {
if (refs_verify_refname_available(
&refs->base, refname,
- extras, skip, err)) {
+ extras, NULL, err)) {
/*
* The error message set by
* verify_refname_available() is OK.
@@ -693,13 +695,13 @@
goto error_return;
}
}
- } else if (errno == EINVAL && (*type & REF_ISBROKEN)) {
+ } else if (failure_errno == EINVAL && (*type & REF_ISBROKEN)) {
strbuf_addf(err, "unable to resolve reference '%s': "
"reference broken", refname);
goto error_return;
} else {
strbuf_addf(err, "unable to resolve reference '%s': %s",
- refname, strerror(errno));
+ refname, strerror(failure_errno));
goto error_return;
}
@@ -710,7 +712,7 @@
*/
if (refs_verify_refname_available(
refs->packed_ref_store, refname,
- extras, skip, err))
+ extras, NULL, err))
goto error_return;
}
@@ -730,6 +732,7 @@
struct ref_iterator base;
struct ref_iterator *iter0;
+ struct repository *repo;
unsigned int flags;
};
@@ -744,8 +747,14 @@
ref_type(iter->iter0->refname) != REF_TYPE_PER_WORKTREE)
continue;
+ if ((iter->flags & DO_FOR_EACH_OMIT_DANGLING_SYMREFS) &&
+ (iter->iter0->flags & REF_ISSYMREF) &&
+ (iter->iter0->flags & REF_ISBROKEN))
+ continue;
+
if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
!ref_resolves_to_object(iter->iter0->refname,
+ iter->repo,
iter->iter0->oid,
iter->iter0->flags))
continue;
@@ -824,7 +833,7 @@
*/
loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
- prefix, 1);
+ prefix, ref_store->repo, 1);
/*
* The packed-refs file might contain broken references, for
@@ -848,45 +857,119 @@
base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
overlay_iter->ordered);
iter->iter0 = overlay_iter;
+ iter->repo = ref_store->repo;
iter->flags = flags;
return ref_iterator;
}
/*
- * Verify that the reference locked by lock has the value old_oid
- * (unless it is NULL). Fail if the reference doesn't exist and
- * mustexist is set. Return 0 on success. On error, write an error
- * message to err, set errno, and return a negative value.
+ * Callback function for raceproof_create_file(). This function is
+ * expected to do something that makes dirname(path) permanent despite
+ * the fact that other processes might be cleaning up empty
+ * directories at the same time. Usually it will create a file named
+ * path, but alternatively it could create another file in that
+ * directory, or even chdir() into that directory. The function should
+ * return 0 if the action was completed successfully. On error, it
+ * should return a nonzero result and set errno.
+ * raceproof_create_file() treats two errno values specially:
+ *
+ * - ENOENT -- dirname(path) does not exist. In this case,
+ * raceproof_create_file() tries creating dirname(path)
+ * (and any parent directories, if necessary) and calls
+ * the function again.
+ *
+ * - EISDIR -- the file already exists and is a directory. In this
+ * case, raceproof_create_file() removes the directory if
+ * it is empty (and recursively any empty directories that
+ * it contains) and calls the function again.
+ *
+ * Any other errno causes raceproof_create_file() to fail with the
+ * callback's return value and errno.
+ *
+ * Obviously, this function should be OK with being called again if it
+ * fails with ENOENT or EISDIR. In other scenarios it will not be
+ * called again.
*/
-static int verify_lock(struct ref_store *ref_store, struct ref_lock *lock,
- const struct object_id *old_oid, int mustexist,
- struct strbuf *err)
-{
- assert(err);
+typedef int create_file_fn(const char *path, void *cb);
- if (refs_read_ref_full(ref_store, lock->ref_name,
- mustexist ? RESOLVE_REF_READING : 0,
- &lock->old_oid, NULL)) {
- if (old_oid) {
- int save_errno = errno;
- strbuf_addf(err, "can't verify ref '%s'", lock->ref_name);
- errno = save_errno;
- return -1;
- } else {
- oidclr(&lock->old_oid);
- return 0;
- }
+/*
+ * Create a file in dirname(path) by calling fn, creating leading
+ * directories if necessary. Retry a few times in case we are racing
+ * with another process that is trying to clean up the directory that
+ * contains path. See the documentation for create_file_fn for more
+ * details.
+ *
+ * Return the value and set the errno that resulted from the most
+ * recent call of fn. fn is always called at least once, and will be
+ * called more than once if it returns ENOENT or EISDIR.
+ */
+static int raceproof_create_file(const char *path, create_file_fn fn, void *cb)
+{
+ /*
+ * The number of times we will try to remove empty directories
+ * in the way of path. This is only 1 because if another
+ * process is racily creating directories that conflict with
+ * us, we don't want to fight against them.
+ */
+ int remove_directories_remaining = 1;
+
+ /*
+ * The number of times that we will try to create the
+ * directories containing path. We are willing to attempt this
+ * more than once, because another process could be trying to
+ * clean up empty directories at the same time as we are
+ * trying to create them.
+ */
+ int create_directories_remaining = 3;
+
+ /* A scratch copy of path, filled lazily if we need it: */
+ struct strbuf path_copy = STRBUF_INIT;
+
+ int ret, save_errno;
+
+ /* Sanity check: */
+ assert(*path);
+
+retry_fn:
+ ret = fn(path, cb);
+ save_errno = errno;
+ if (!ret)
+ goto out;
+
+ if (errno == EISDIR && remove_directories_remaining-- > 0) {
+ /*
+ * A directory is in the way. Maybe it is empty; try
+ * to remove it:
+ */
+ if (!path_copy.len)
+ strbuf_addstr(&path_copy, path);
+
+ if (!remove_dir_recursively(&path_copy, REMOVE_DIR_EMPTY_ONLY))
+ goto retry_fn;
+ } else if (errno == ENOENT && create_directories_remaining-- > 0) {
+ /*
+ * Maybe the containing directory didn't exist, or
+ * maybe it was just deleted by a process that is
+ * racing with us to clean up empty directories. Try
+ * to create it:
+ */
+ enum scld_error scld_result;
+
+ if (!path_copy.len)
+ strbuf_addstr(&path_copy, path);
+
+ do {
+ scld_result = safe_create_leading_directories(path_copy.buf);
+ if (scld_result == SCLD_OK)
+ goto retry_fn;
+ } while (scld_result == SCLD_VANISHED && create_directories_remaining-- > 0);
}
- if (old_oid && !oideq(&lock->old_oid, old_oid)) {
- strbuf_addf(err, "ref '%s' is at %s but expected %s",
- lock->ref_name,
- oid_to_hex(&lock->old_oid),
- oid_to_hex(old_oid));
- errno = EBUSY;
- return -1;
- }
- return 0;
+
+out:
+ strbuf_release(&path_copy);
+ errno = save_errno;
+ return ret;
}
static int remove_empty_directories(struct strbuf *path)
@@ -910,64 +993,27 @@
/*
* Locks a ref returning the lock on success and NULL on failure.
- * On failure errno is set to something meaningful.
*/
static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
- const char *refname,
- const struct object_id *old_oid,
- const struct string_list *extras,
- const struct string_list *skip,
- unsigned int flags, int *type,
+ const char *refname, int *type,
struct strbuf *err)
{
struct strbuf ref_file = STRBUF_INIT;
struct ref_lock *lock;
- int last_errno = 0;
- int mustexist = (old_oid && !is_null_oid(old_oid));
- int resolve_flags = RESOLVE_REF_NO_RECURSE;
- int resolved;
files_assert_main_repository(refs, "lock_ref_oid_basic");
assert(err);
CALLOC_ARRAY(lock, 1);
- if (mustexist)
- resolve_flags |= RESOLVE_REF_READING;
- if (flags & REF_DELETING)
- resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
-
files_ref_path(refs, &ref_file, refname);
- resolved = !!refs_resolve_ref_unsafe(&refs->base,
- refname, resolve_flags,
- &lock->old_oid, type);
- if (!resolved && errno == EISDIR) {
- /*
- * we are trying to lock foo but we used to
- * have foo/bar which now does not exist;
- * it is normal for the empty directory 'foo'
- * to remain.
- */
- if (remove_empty_directories(&ref_file)) {
- last_errno = errno;
- if (!refs_verify_refname_available(
- &refs->base,
- refname, extras, skip, err))
- strbuf_addf(err, "there are still refs under '%s'",
- refname);
- goto error_return;
- }
- resolved = !!refs_resolve_ref_unsafe(&refs->base,
- refname, resolve_flags,
- &lock->old_oid, type);
- }
- if (!resolved) {
- last_errno = errno;
- if (last_errno != ENOTDIR ||
- !refs_verify_refname_available(&refs->base, refname,
- extras, skip, err))
+ if (!refs_resolve_ref_unsafe(&refs->base, refname,
+ RESOLVE_REF_NO_RECURSE,
+ &lock->old_oid, type)) {
+ if (!refs_verify_refname_available(&refs->base, refname,
+ NULL, NULL, err))
strbuf_addf(err, "unable to resolve reference '%s': %s",
- refname, strerror(last_errno));
+ refname, strerror(errno));
goto error_return;
}
@@ -980,23 +1026,20 @@
*/
if (is_null_oid(&lock->old_oid) &&
refs_verify_refname_available(refs->packed_ref_store, refname,
- extras, skip, err)) {
- last_errno = ENOTDIR;
+ NULL, NULL, err))
goto error_return;
- }
lock->ref_name = xstrdup(refname);
if (raceproof_create_file(ref_file.buf, create_reflock, &lock->lk)) {
- last_errno = errno;
unable_to_lock_message(ref_file.buf, errno, err);
goto error_return;
}
- if (verify_lock(&refs->base, lock, old_oid, mustexist, err)) {
- last_errno = errno;
- goto error_return;
- }
+ if (refs_read_ref_full(&refs->base, lock->ref_name,
+ 0,
+ &lock->old_oid, NULL))
+ oidclr(&lock->old_oid);
goto out;
error_return:
@@ -1005,7 +1048,6 @@
out:
strbuf_release(&ref_file);
- errno = last_errno;
return lock;
}
@@ -1132,7 +1174,7 @@
return 0;
/* Do not pack broken refs: */
- if (!ref_resolves_to_object(refname, oid, ref_flags))
+ if (!ref_resolves_to_object(refname, the_repository, oid, ref_flags))
return 0;
return 1;
@@ -1155,7 +1197,8 @@
packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
- iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
+ iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL,
+ the_repository, 0);
while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
/*
* If the loose reference can be packed, add an entry
@@ -1415,8 +1458,7 @@
logmoved = log;
- lock = lock_ref_oid_basic(refs, newrefname, NULL, NULL, NULL,
- REF_NO_DEREF, NULL, &err);
+ lock = lock_ref_oid_basic(refs, newrefname, NULL, &err);
if (!lock) {
if (copy)
error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
@@ -1438,8 +1480,7 @@
goto out;
rollback:
- lock = lock_ref_oid_basic(refs, oldrefname, NULL, NULL, NULL,
- REF_NO_DEREF, NULL, &err);
+ lock = lock_ref_oid_basic(refs, oldrefname, NULL, &err);
if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -1846,9 +1887,7 @@
struct ref_lock *lock;
int ret;
- lock = lock_ref_oid_basic(refs, refname, NULL,
- NULL, NULL, REF_NO_DEREF, NULL,
- &err);
+ lock = lock_ref_oid_basic(refs, refname, NULL, &err);
if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
@@ -2416,7 +2455,7 @@
}
ret = lock_raw_ref(refs, update->refname, mustexist,
- affected_refnames, NULL,
+ affected_refnames,
&lock, &referent,
&update->type, err);
if (ret) {
@@ -3037,7 +3076,7 @@
}
static int files_reflog_expire(struct ref_store *ref_store,
- const char *refname, const struct object_id *oid,
+ const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -3054,6 +3093,7 @@
int status = 0;
int type;
struct strbuf err = STRBUF_INIT;
+ const struct object_id *oid;
memset(&cb, 0, sizeof(cb));
cb.flags = flags;
@@ -3065,14 +3105,26 @@
* reference itself, plus we might need to update the
* reference if --updateref was specified:
*/
- lock = lock_ref_oid_basic(refs, refname, oid,
- NULL, NULL, REF_NO_DEREF,
- &type, &err);
+ lock = lock_ref_oid_basic(refs, refname, &type, &err);
if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err);
return -1;
}
+ oid = &lock->old_oid;
+
+ /*
+ * When refs are deleted, their reflog is deleted before the
+ * ref itself is deleted. This is because there is no separate
+ * lock for reflog; instead we take a lock on the ref with
+ * lock_ref_oid_basic().
+ *
+ * If a race happens and the reflog doesn't exist after we've
+ * acquired the lock that's OK. We've got nothing more to do;
+ * We were asked to delete the reflog, but someone else
+ * deleted it! The caller doesn't care that we deleted it,
+ * just that it is deleted. So we can return successfully.
+ */
if (!refs_reflog_exists(ref_store, refname)) {
unlock_ref(lock);
return 0;
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index f8aa97d..1c5211b 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -193,13 +193,15 @@
}
}
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+ const char *path,
unsigned int store_flags)
{
struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
struct ref_store *ref_store = (struct ref_store *)refs;
base_ref_store_init(ref_store, &refs_be_packed);
+ ref_store->repo = repo;
ref_store->gitdir = xstrdup(path);
refs->store_flags = store_flags;
@@ -724,9 +726,9 @@
return refs->snapshot;
}
-static int packed_read_raw_ref(struct ref_store *ref_store,
- const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type)
+static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno)
{
struct packed_ref_store *refs =
packed_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
@@ -739,7 +741,7 @@
if (!rec) {
/* refname is not a packed reference. */
- errno = ENOENT;
+ *failure_errno = ENOENT;
return -1;
}
@@ -776,6 +778,7 @@
struct object_id oid, peeled;
struct strbuf refname_buf;
+ struct repository *repo;
unsigned int flags;
};
@@ -864,8 +867,8 @@
continue;
if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
- !ref_resolves_to_object(iter->base.refname, &iter->oid,
- iter->flags))
+ !ref_resolves_to_object(iter->base.refname, iter->repo,
+ &iter->oid, iter->flags))
continue;
return ITER_OK;
@@ -883,6 +886,9 @@
struct packed_ref_iterator *iter =
(struct packed_ref_iterator *)ref_iterator;
+ if (iter->repo != the_repository)
+ BUG("peeling for non-the_repository is not supported");
+
if ((iter->base.flags & REF_KNOWS_PEELED)) {
oidcpy(peeled, &iter->peeled);
return is_null_oid(&iter->peeled) ? -1 : 0;
@@ -954,6 +960,7 @@
iter->base.oid = &iter->oid;
+ iter->repo = ref_store->repo;
iter->flags = flags;
if (prefix && *prefix)
@@ -1600,6 +1607,7 @@
const char *refname,
each_reflog_ent_fn fn, void *cb_data)
{
+ BUG("packed reference store does not support reflogs");
return 0;
}
@@ -1608,12 +1616,14 @@
each_reflog_ent_fn fn,
void *cb_data)
{
+ BUG("packed reference store does not support reflogs");
return 0;
}
static int packed_reflog_exists(struct ref_store *ref_store,
const char *refname)
{
+ BUG("packed reference store does not support reflogs");
return 0;
}
@@ -1627,17 +1637,19 @@
static int packed_delete_reflog(struct ref_store *ref_store,
const char *refname)
{
+ BUG("packed reference store does not support reflogs");
return 0;
}
static int packed_reflog_expire(struct ref_store *ref_store,
- const char *refname, const struct object_id *oid,
+ const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data)
{
+ BUG("packed reference store does not support reflogs");
return 0;
}
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
index a01a0af..f61a73e 100644
--- a/refs/packed-backend.h
+++ b/refs/packed-backend.h
@@ -1,6 +1,7 @@
#ifndef REFS_PACKED_BACKEND_H
#define REFS_PACKED_BACKEND_H
+struct repository;
struct ref_transaction;
/*
@@ -12,7 +13,8 @@
* even among packed refs.
*/
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+ const char *path,
unsigned int store_flags);
/*
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 49d732f..be4aa5e 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -49,7 +49,7 @@
ret->ref_store = refs;
ret->fill_ref_dir = fill_ref_dir;
- ret->root = create_dir_entry(ret, "", 0, 1);
+ ret->root = create_dir_entry(ret, "", 0);
return ret;
}
@@ -86,14 +86,13 @@
}
struct ref_entry *create_dir_entry(struct ref_cache *cache,
- const char *dirname, size_t len,
- int incomplete)
+ const char *dirname, size_t len)
{
struct ref_entry *direntry;
FLEX_ALLOC_MEM(direntry, name, dirname, len);
direntry->u.subdir.cache = cache;
- direntry->flag = REF_DIR | (incomplete ? REF_INCOMPLETE : 0);
+ direntry->flag = REF_DIR | REF_INCOMPLETE;
return direntry;
}
@@ -144,30 +143,19 @@
/*
* Search for a directory entry directly within dir (without
* recursing). Sort dir if necessary. subdirname must be a directory
- * name (i.e., end in '/'). If mkdir is set, then create the
- * directory if it is missing; otherwise, return NULL if the desired
+ * name (i.e., end in '/'). Returns NULL if the desired
* directory cannot be found. dir must already be complete.
*/
static struct ref_dir *search_for_subdir(struct ref_dir *dir,
- const char *subdirname, size_t len,
- int mkdir)
+ const char *subdirname, size_t len)
{
int entry_index = search_ref_dir(dir, subdirname, len);
struct ref_entry *entry;
- if (entry_index == -1) {
- if (!mkdir)
- return NULL;
- /*
- * Since dir is complete, the absence of a subdir
- * means that the subdir really doesn't exist;
- * therefore, create an empty record for it but mark
- * the record complete.
- */
- entry = create_dir_entry(dir->cache, subdirname, len, 0);
- add_entry_to_dir(dir, entry);
- } else {
- entry = dir->entries[entry_index];
- }
+
+ if (entry_index == -1)
+ return NULL;
+
+ entry = dir->entries[entry_index];
return get_ref_dir(entry);
}
@@ -176,18 +164,17 @@
* tree that should hold refname. If refname is a directory name
* (i.e., it ends in '/'), then return that ref_dir itself. dir must
* represent the top-level directory and must already be complete.
- * Sort ref_dirs and recurse into subdirectories as necessary. If
- * mkdir is set, then create any missing directories; otherwise,
+ * Sort ref_dirs and recurse into subdirectories as necessary. Will
* return NULL if the desired directory cannot be found.
*/
static struct ref_dir *find_containing_dir(struct ref_dir *dir,
- const char *refname, int mkdir)
+ const char *refname)
{
const char *slash;
for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
size_t dirnamelen = slash - refname + 1;
struct ref_dir *subdir;
- subdir = search_for_subdir(dir, refname, dirnamelen, mkdir);
+ subdir = search_for_subdir(dir, refname, dirnamelen);
if (!subdir) {
dir = NULL;
break;
@@ -202,7 +189,7 @@
{
int entry_index;
struct ref_entry *entry;
- dir = find_containing_dir(dir, refname, 0);
+ dir = find_containing_dir(dir, refname);
if (!dir)
return NULL;
entry_index = search_ref_dir(dir, refname, strlen(refname));
@@ -212,50 +199,6 @@
return (entry->flag & REF_DIR) ? NULL : entry;
}
-int remove_entry_from_dir(struct ref_dir *dir, const char *refname)
-{
- int refname_len = strlen(refname);
- int entry_index;
- struct ref_entry *entry;
- int is_dir = refname[refname_len - 1] == '/';
- if (is_dir) {
- /*
- * refname represents a reference directory. Remove
- * the trailing slash; otherwise we will get the
- * directory *representing* refname rather than the
- * one *containing* it.
- */
- char *dirname = xmemdupz(refname, refname_len - 1);
- dir = find_containing_dir(dir, dirname, 0);
- free(dirname);
- } else {
- dir = find_containing_dir(dir, refname, 0);
- }
- if (!dir)
- return -1;
- entry_index = search_ref_dir(dir, refname, refname_len);
- if (entry_index == -1)
- return -1;
- entry = dir->entries[entry_index];
-
- MOVE_ARRAY(&dir->entries[entry_index],
- &dir->entries[entry_index + 1], dir->nr - entry_index - 1);
- dir->nr--;
- if (dir->sorted > entry_index)
- dir->sorted--;
- free_ref_entry(entry);
- return dir->nr;
-}
-
-int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref)
-{
- dir = find_containing_dir(dir, ref->name, 1);
- if (!dir)
- return -1;
- add_entry_to_dir(dir, ref);
- return 0;
-}
-
/*
* Emit a warning and return true iff ref1 and ref2 have the same name
* and the same oid. Die if they have the same name but different
@@ -435,6 +378,8 @@
* on from there.)
*/
struct cache_ref_iterator_level *levels;
+
+ struct repository *repo;
};
static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
@@ -491,6 +436,11 @@
static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
struct object_id *peeled)
{
+ struct cache_ref_iterator *iter =
+ (struct cache_ref_iterator *)ref_iterator;
+
+ if (iter->repo != the_repository)
+ BUG("peeling for non-the_repository is not supported");
return peel_object(ref_iterator->oid, peeled) ? -1 : 0;
}
@@ -513,6 +463,7 @@
struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
const char *prefix,
+ struct repository *repo,
int prime_dir)
{
struct ref_dir *dir;
@@ -522,7 +473,7 @@
dir = get_ref_dir(cache->root);
if (prefix && *prefix)
- dir = find_containing_dir(dir, prefix, 0);
+ dir = find_containing_dir(dir, prefix);
if (!dir)
/* There's nothing to iterate over. */
return empty_ref_iterator_begin();
@@ -547,5 +498,7 @@
level->prefix_state = PREFIX_CONTAINS_DIR;
}
+ iter->repo = repo;
+
return ref_iterator;
}
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index 3bfb89d..850d9d3 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -169,8 +169,7 @@
* "refs/heads/") or "" for the top-level directory.
*/
struct ref_entry *create_dir_entry(struct ref_cache *cache,
- const char *dirname, size_t len,
- int incomplete);
+ const char *dirname, size_t len);
struct ref_entry *create_ref_entry(const char *refname,
const struct object_id *oid, int flag);
@@ -200,29 +199,6 @@
void add_entry_to_dir(struct ref_dir *dir, struct ref_entry *entry);
/*
- * Remove the entry with the given name from dir, recursing into
- * subdirectories as necessary. If refname is the name of a directory
- * (i.e., ends with '/'), then remove the directory and its contents.
- * If the removal was successful, return the number of entries
- * remaining in the directory entry that contained the deleted entry.
- * If the name was not found, return -1. Please note that this
- * function only deletes the entry from the cache; it does not delete
- * it from the filesystem or ensure that other cache entries (which
- * might be symbolic references to the removed entry) are updated.
- * Nor does it remove any containing dir entries that might be made
- * empty by the removal. dir must represent the top-level directory
- * and must already be complete.
- */
-int remove_entry_from_dir(struct ref_dir *dir, const char *refname);
-
-/*
- * Add a ref_entry to the ref_dir (unsorted), recursing into
- * subdirectories as necessary. dir must represent the top-level
- * directory. Return 0 on success.
- */
-int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref);
-
-/*
* Find the value entry with the given name in dir, sorting ref_dirs
* and recursing into subdirectories as necessary. If the name is not
* found or it corresponds to a directory entry, return NULL.
@@ -238,6 +214,7 @@
*/
struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
const char *prefix,
+ struct repository *repo,
int prime_dir);
#endif /* REFS_REF_CACHE_H */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 3155708..1222474 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -66,6 +66,7 @@
* referred-to object does not exist, emit a warning and return false.
*/
int ref_resolves_to_object(const char *refname,
+ struct repository *repo,
const struct object_id *oid,
unsigned int flags);
@@ -245,8 +246,36 @@
/* We allow "recursive" symbolic refs. Only within reason, though */
#define SYMREF_MAXDEPTH 5
-/* Include broken references in a do_for_each_ref*() iteration: */
-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+/*
+ * These flags are passed to refs_ref_iterator_begin() (and do_for_each_ref(),
+ * which feeds it).
+ */
+enum do_for_each_ref_flags {
+ /*
+ * Include broken references in a do_for_each_ref*() iteration, which
+ * would normally be omitted. This includes both refs that point to
+ * missing objects (a true repository corruption), ones with illegal
+ * names (which we prefer not to expose to callers), as well as
+ * dangling symbolic refs (i.e., those that point to a non-existent
+ * ref; this is not a corruption, but as they have no valid oid, we
+ * omit them from normal iteration results).
+ */
+ DO_FOR_EACH_INCLUDE_BROKEN = (1 << 0),
+
+ /*
+ * Only include per-worktree refs in a do_for_each_ref*() iteration.
+ * Normally this will be used with a files ref_store, since that's
+ * where all reference backends will presumably store their
+ * per-worktree refs.
+ */
+ DO_FOR_EACH_PER_WORKTREE_ONLY = (1 << 1),
+
+ /*
+ * Omit dangling symrefs from output; this only has an effect with
+ * INCLUDE_BROKEN, since they are otherwise not included at all.
+ */
+ DO_FOR_EACH_OMIT_DANGLING_SYMREFS = (1 << 2),
+};
/*
* Reference iterators
@@ -349,16 +378,12 @@
* Return an iterator that goes over each reference in `refs` for
* which the refname begins with prefix. If trim is non-zero, then
* trim that many characters off the beginning of each refname.
- * The output is ordered by refname. The following flags are supported:
- *
- * DO_FOR_EACH_INCLUDE_BROKEN: include broken references in
- * the iteration.
- *
- * DO_FOR_EACH_PER_WORKTREE_ONLY: only produce REF_TYPE_PER_WORKTREE refs.
+ * The output is ordered by refname.
*/
struct ref_iterator *refs_ref_iterator_begin(
struct ref_store *refs,
- const char *prefix, int trim, int flags);
+ const char *prefix, int trim,
+ enum do_for_each_ref_flags flags);
/*
* A callback function used to instruct merge_ref_iterator how to
@@ -446,10 +471,8 @@
/*
* backend-specific implementation of ref_iterator_advance. For symrefs, the
* function should set REF_ISSYMREF, and it should also dereference the symref
- * to provide the OID referent. If DO_FOR_EACH_INCLUDE_BROKEN is set, symrefs
- * with non-existent referents and refs pointing to non-existent object names
- * should also be returned. If DO_FOR_EACH_PER_WORKTREE_ONLY, only
- * REF_TYPE_PER_WORKTREE refs should be returned.
+ * to provide the OID referent. It should respect do_for_each_ref_flags
+ * that were passed to refs_ref_iterator_begin().
*/
typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
@@ -498,14 +521,6 @@
struct ref_iterator *iter,
each_repo_ref_fn fn, void *cb_data);
-/*
- * Only include per-worktree refs in a do_for_each_ref*() iteration.
- * Normally this will be used with a files ref_store, since that's
- * where all reference backends will presumably store their
- * per-worktree refs.
- */
-#define DO_FOR_EACH_PER_WORKTREE_ONLY 0x02
-
struct ref_store;
/* refs backends */
@@ -525,7 +540,8 @@
* should call base_ref_store_init() to initialize the shared part of
* the ref_store and to record the ref_store for later lookup.
*/
-typedef struct ref_store *ref_store_init_fn(const char *gitdir,
+typedef struct ref_store *ref_store_init_fn(struct repository *repo,
+ const char *gitdir,
unsigned int flags);
typedef int ref_init_db_fn(struct ref_store *refs, struct strbuf *err);
@@ -593,7 +609,7 @@
int force_create, struct strbuf *err);
typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
typedef int reflog_expire_fn(struct ref_store *ref_store,
- const char *refname, const struct object_id *oid,
+ const char *refname,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -620,11 +636,15 @@
* properly-formatted or even safe reference name. NEITHER INPUT NOR
* OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION.
*
- * Return 0 on success. If the ref doesn't exist, set errno to ENOENT
- * and return -1. If the ref exists but is neither a symbolic ref nor
- * an object ID, it is broken; set REF_ISBROKEN in type, set errno to
- * EINVAL, and return -1. If there is another error reading the ref,
- * set errno appropriately and return -1.
+ * Return 0 on success, or -1 on failure. If the ref exists but is neither a
+ * symbolic ref nor an object ID, it is broken. In this case set REF_ISBROKEN in
+ * type, and return -1 (failure_errno should not be ENOENT)
+ *
+ * failure_errno provides errno codes that are interpreted beyond error
+ * reporting. The following error codes have special meaning:
+ * * ENOENT: the ref doesn't exist
+ * * EISDIR: ref name is a directory
+ * * ENOTDIR: ref prefix is not a directory
*
* Backend-specific flags might be set in type as well, regardless of
* outcome.
@@ -638,9 +658,9 @@
* - in all other cases, referent will be untouched, and therefore
* refname will still be valid and unchanged.
*/
-typedef int read_raw_ref_fn(struct ref_store *ref_store,
- const char *refname, struct object_id *oid,
- struct strbuf *referent, unsigned int *type);
+typedef int read_raw_ref_fn(struct ref_store *ref_store, const char *refname,
+ struct object_id *oid, struct strbuf *referent,
+ unsigned int *type, int *failure_errno);
struct ref_storage_be {
struct ref_storage_be *next;
@@ -683,7 +703,12 @@
/* The backend describing this ref_store's storage scheme: */
const struct ref_storage_be *be;
- /* The gitdir that this ref_store applies to: */
+ struct repository *repo;
+
+ /*
+ * The gitdir that this ref_store applies to. Note that this is not
+ * necessarily repo->gitdir if the repo has multiple worktrees.
+ */
char *gitdir;
};
diff --git a/remote-curl.c b/remote-curl.c
index 6c320d5..d691563 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -185,8 +185,6 @@
strbuf_detach(&unquoted, NULL));
}
return 0;
-
-#if LIBCURL_VERSION_NUM >= 0x070a08
} else if (!strcmp(name, "family")) {
if (!strcmp(value, "ipv4"))
git_curl_ipresolve = CURL_IPRESOLVE_V4;
@@ -197,7 +195,6 @@
else
return -1;
return 0;
-#endif /* LIBCURL_VERSION_NUM >= 0x070a08 */
} else if (!strcmp(name, "from-promisor")) {
options.from_promisor = 1;
return 0;
@@ -502,6 +499,10 @@
show_http_message(&type, &charset, &buffer);
die(_("Authentication failed for '%s'"),
transport_anonymize_url(url.buf));
+ case HTTP_NOMATCHPUBLICKEY:
+ show_http_message(&type, &charset, &buffer);
+ die(_("unable to access '%s' with http.pinnedPubkey configuration: %s"),
+ transport_anonymize_url(url.buf), curl_errorstr);
default:
show_http_message(&type, &charset, &buffer);
die(_("unable to access '%s': %s"),
@@ -709,7 +710,6 @@
return avail;
}
-#ifndef NO_CURL_IOCTL
static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
{
struct rpc_state *rpc = clientp;
@@ -730,7 +730,6 @@
return CURLIOE_UNKNOWNCMD;
}
}
-#endif
struct check_pktline_state {
char len_buf[4];
@@ -858,7 +857,7 @@
curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &buf);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buf);
err = run_slot(slot, results);
@@ -949,10 +948,8 @@
rpc->initial_buffer = 1;
curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, rpc_out);
curl_easy_setopt(slot->curl, CURLOPT_INFILE, rpc);
-#ifndef NO_CURL_IOCTL
curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, rpc_ioctl);
curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, rpc);
-#endif
if (options.verbosity > 1) {
fprintf(stderr, "POST %s (chunked)\n", rpc->service_name);
fflush(stderr);
@@ -1023,7 +1020,7 @@
rpc_in_data.slot = slot;
rpc_in_data.check_pktline = stateless_connect;
memset(&rpc_in_data.pktline_state, 0, sizeof(rpc_in_data.pktline_state));
- curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data);
+ curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &rpc_in_data);
curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0);
@@ -1091,7 +1088,7 @@
rpc->protocol_header = NULL;
while (!err) {
- int n = packet_read(rpc->out, NULL, NULL, rpc->buf, rpc->alloc, 0);
+ int n = packet_read(rpc->out, rpc->buf, rpc->alloc, 0);
if (!n)
break;
rpc->pos = 0;
@@ -1485,8 +1482,8 @@
options.verbosity = 1;
options.progress = !!isatty(2);
options.thin = 1;
- string_list_init(&options.deepen_not, 1);
- string_list_init(&options.push_options, 1);
+ string_list_init_dup(&options.deepen_not);
+ string_list_init_dup(&options.push_options);
/*
* Just report "remote-curl" here (folding all the various aliases
diff --git a/remote.c b/remote.c
index 40e785d..f958543 100644
--- a/remote.c
+++ b/remote.c
@@ -1111,7 +1111,7 @@
"Neither worked, so we gave up. You must fully qualify the ref."),
dst_value, matched_src_name);
- if (!advice_push_unqualified_ref_name)
+ if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME))
return;
if (get_oid(matched_src_name, &oid))
@@ -2118,7 +2118,7 @@
strbuf_addf(sb,
_("Your branch is based on '%s', but the upstream is gone.\n"),
base);
- if (advice_status_hints)
+ if (advice_enabled(ADVICE_STATUS_HINTS))
strbuf_addstr(sb,
_(" (use \"git branch --unset-upstream\" to fixup)\n"));
} else if (!sti) {
@@ -2129,7 +2129,7 @@
strbuf_addf(sb,
_("Your branch and '%s' refer to different commits.\n"),
base);
- if (advice_status_hints)
+ if (advice_enabled(ADVICE_STATUS_HINTS))
strbuf_addf(sb, _(" (use \"%s\" for details)\n"),
"git status --ahead-behind");
} else if (!theirs) {
@@ -2138,7 +2138,7 @@
"Your branch is ahead of '%s' by %d commits.\n",
ours),
base, ours);
- if (advice_status_hints)
+ if (advice_enabled(ADVICE_STATUS_HINTS))
strbuf_addstr(sb,
_(" (use \"git push\" to publish your local commits)\n"));
} else if (!ours) {
@@ -2149,7 +2149,7 @@
"and can be fast-forwarded.\n",
theirs),
base, theirs);
- if (advice_status_hints)
+ if (advice_enabled(ADVICE_STATUS_HINTS))
strbuf_addstr(sb,
_(" (use \"git pull\" to update your local branch)\n"));
} else {
@@ -2162,7 +2162,7 @@
"respectively.\n",
ours + theirs),
base, ours, theirs);
- if (advice_status_hints)
+ if (advice_enabled(ADVICE_STATUS_HINTS))
strbuf_addstr(sb,
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
}
@@ -2403,7 +2403,7 @@
size_t nr, alloc;
};
-#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
+#define REFLOG_COMMIT_ARRAY_INIT { 0 }
/* Append a commit to the array. */
static void append_commit(struct reflog_commit_array *arr,
diff --git a/repo-settings.c b/repo-settings.c
index 0cfe8b7..b93e91a 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -3,40 +3,77 @@
#include "repository.h"
#include "midx.h"
-#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
+static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
+ int def)
+{
+ if (repo_config_get_bool(r, key, dest))
+ *dest = def;
+}
void prepare_repo_settings(struct repository *r)
{
+ int experimental;
int value;
char *strval;
+ int manyfiles;
- if (r->settings.initialized)
+ if (r->settings.initialized++)
return;
/* Defaults */
- memset(&r->settings, -1, sizeof(r->settings));
+ r->settings.index_version = -1;
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
- if (!repo_config_get_bool(r, "core.commitgraph", &value))
- r->settings.core_commit_graph = value;
- if (!repo_config_get_bool(r, "commitgraph.readchangedpaths", &value))
- r->settings.commit_graph_read_changed_paths = value;
- if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
- r->settings.gc_write_commit_graph = value;
- UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
- UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1);
- UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
+ /* Booleans config or default, cascades to other settings */
+ repo_cfg_bool(r, "feature.manyfiles", &manyfiles, 0);
+ repo_cfg_bool(r, "feature.experimental", &experimental, 0);
+ /* Defaults modified by feature.* */
+ if (experimental) {
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+ }
+ if (manyfiles) {
+ r->settings.index_version = 4;
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+ }
+
+ /* Boolean config or default, does not cascade (simple) */
+ repo_cfg_bool(r, "core.commitgraph", &r->settings.core_commit_graph, 1);
+ repo_cfg_bool(r, "commitgraph.readchangedpaths", &r->settings.commit_graph_read_changed_paths, 1);
+ repo_cfg_bool(r, "gc.writecommitgraph", &r->settings.gc_write_commit_graph, 1);
+ repo_cfg_bool(r, "fetch.writecommitgraph", &r->settings.fetch_write_commit_graph, 0);
+ repo_cfg_bool(r, "pack.usesparse", &r->settings.pack_use_sparse, 1);
+ repo_cfg_bool(r, "core.multipackindex", &r->settings.core_multi_pack_index, 1);
+ repo_cfg_bool(r, "index.sparse", &r->settings.sparse_index, 0);
+
+ /*
+ * The GIT_TEST_MULTI_PACK_INDEX variable is special in that
+ * either it *or* the config sets
+ * r->settings.core_multi_pack_index if true. We don't take
+ * the environment variable if it exists (even if false) over
+ * any config, as in most other cases.
+ */
+ if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
+ r->settings.core_multi_pack_index = 1;
+
+ /*
+ * Non-boolean config
+ */
if (!repo_config_get_int(r, "index.version", &value))
r->settings.index_version = value;
- if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
- if (value == 0)
- r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
- else
- r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
- } else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
- if (!strcasecmp(strval, "keep"))
- r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+ if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+ int v = git_parse_maybe_bool(strval);
+
+ /*
+ * If it's set to "keep", or some other non-boolean
+ * value then "v < 0". Then we do nothing and keep it
+ * at the default of UNTRACKED_CACHE_KEEP.
+ */
+ if (v >= 0)
+ r->settings.core_untracked_cache = v ?
+ UNTRACKED_CACHE_WRITE : UNTRACKED_CACHE_REMOVE;
free(strval);
}
@@ -45,39 +82,8 @@
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
else if (!strcasecmp(strval, "noop"))
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;
- else
- r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
}
- if (!repo_config_get_bool(r, "pack.usesparse", &value))
- r->settings.pack_use_sparse = value;
- UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
-
- value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
- if (value || !repo_config_get_bool(r, "core.multipackindex", &value))
- r->settings.core_multi_pack_index = value;
- UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 1);
-
- if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
- UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
- UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
- }
-
- if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
- r->settings.fetch_write_commit_graph = value;
- UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
-
- if (!repo_config_get_bool(r, "feature.experimental", &value) && value)
- UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
-
- /* Hack for test programs like test-dump-untracked-cache */
- if (ignore_untracked_cache_config)
- r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
- else
- UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
-
- UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
-
/*
* This setting guards all index reads to require a full index
* over a sparse index. After suitable guards are placed in the
@@ -85,11 +91,4 @@
* removed.
*/
r->settings.command_requires_full_index = 1;
-
- /*
- * Initialize this as off.
- */
- r->settings.sparse_index = 0;
- if (!repo_config_get_bool(r, "index.sparse", &value) && value)
- r->settings.sparse_index = 1;
}
diff --git a/repository.c b/repository.c
index b2bf44c..c5b90ba 100644
--- a/repository.c
+++ b/repository.c
@@ -190,19 +190,15 @@
int repo_submodule_init(struct repository *subrepo,
struct repository *superproject,
- const struct submodule *sub)
+ const char *path,
+ const struct object_id *treeish_name)
{
struct strbuf gitdir = STRBUF_INIT;
struct strbuf worktree = STRBUF_INIT;
int ret = 0;
- if (!sub) {
- ret = -1;
- goto out;
- }
-
- strbuf_repo_worktree_path(&gitdir, superproject, "%s/.git", sub->path);
- strbuf_repo_worktree_path(&worktree, superproject, "%s", sub->path);
+ strbuf_repo_worktree_path(&gitdir, superproject, "%s/.git", path);
+ strbuf_repo_worktree_path(&worktree, superproject, "%s", path);
if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
/*
@@ -212,9 +208,15 @@
* in the superproject's 'modules' directory. In this case the
* submodule would not have a worktree.
*/
+ const struct submodule *sub =
+ submodule_from_path(superproject, treeish_name, path);
+ if (!sub) {
+ ret = -1;
+ goto out;
+ }
+
strbuf_reset(&gitdir);
- strbuf_repo_git_path(&gitdir, superproject,
- "modules/%s", sub->name);
+ submodule_name_to_gitdir(&gitdir, superproject, sub->name);
if (repo_init(subrepo, gitdir.buf, NULL)) {
ret = -1;
@@ -225,7 +227,7 @@
subrepo->submodule_prefix = xstrfmt("%s%s/",
superproject->submodule_prefix ?
superproject->submodule_prefix :
- "", sub->path);
+ "", path);
out:
strbuf_release(&gitdir);
diff --git a/repository.h b/repository.h
index 3740c93..a057653 100644
--- a/repository.h
+++ b/repository.h
@@ -13,18 +13,15 @@
struct promisor_remote_config;
enum untracked_cache_setting {
- UNTRACKED_CACHE_UNSET = -1,
- UNTRACKED_CACHE_REMOVE = 0,
- UNTRACKED_CACHE_KEEP = 1,
- UNTRACKED_CACHE_WRITE = 2
+ UNTRACKED_CACHE_KEEP,
+ UNTRACKED_CACHE_REMOVE,
+ UNTRACKED_CACHE_WRITE,
};
enum fetch_negotiation_setting {
- FETCH_NEGOTIATION_UNSET = -1,
- FETCH_NEGOTIATION_NONE = 0,
- FETCH_NEGOTIATION_DEFAULT = 1,
- FETCH_NEGOTIATION_SKIPPING = 2,
- FETCH_NEGOTIATION_NOOP = 3,
+ FETCH_NEGOTIATION_DEFAULT,
+ FETCH_NEGOTIATION_SKIPPING,
+ FETCH_NEGOTIATION_NOOP,
};
struct repo_settings {
@@ -34,6 +31,8 @@
int commit_graph_read_changed_paths;
int gc_write_commit_graph;
int fetch_write_commit_graph;
+ int command_requires_full_index;
+ int sparse_index;
int index_version;
enum untracked_cache_setting core_untracked_cache;
@@ -42,9 +41,6 @@
enum fetch_negotiation_setting fetch_negotiation_algorithm;
int core_multi_pack_index;
-
- unsigned command_requires_full_index:1,
- sparse_index:1;
};
struct repository {
@@ -172,15 +168,18 @@
int repo_init(struct repository *r, const char *gitdir, const char *worktree);
/*
- * Initialize the repository 'subrepo' as the submodule given by the
- * struct submodule 'sub' in parent repository 'superproject'.
- * Return 0 upon success and a non-zero value upon failure, which may happen
- * if the submodule is not found, or 'sub' is NULL.
+ * Initialize the repository 'subrepo' as the submodule at the given path. If
+ * the submodule's gitdir cannot be found at <path>/.git, this function calls
+ * submodule_from_path() to try to find it. treeish_name is only used if
+ * submodule_from_path() needs to be called; see its documentation for more
+ * information.
+ * Return 0 upon success and a non-zero value upon failure.
*/
-struct submodule;
+struct object_id;
int repo_submodule_init(struct repository *subrepo,
struct repository *superproject,
- const struct submodule *sub);
+ const char *path,
+ const struct object_id *treeish_name);
void repo_clear(struct repository *repo);
/*
diff --git a/reset.c b/reset.c
index 79310ae..f214df3 100644
--- a/reset.c
+++ b/reset.c
@@ -56,9 +56,10 @@
unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
unpack_tree_opts.update = 1;
unpack_tree_opts.merge = 1;
+ unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
if (!detach_head)
- unpack_tree_opts.reset = 1;
+ unpack_tree_opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
if (repo_read_index_unmerged(r) < 0) {
ret = error(_("could not read index"));
diff --git a/revision.c b/revision.c
index cddd054..1981a08 100644
--- a/revision.c
+++ b/revision.c
@@ -249,7 +249,7 @@
struct commit **items;
size_t nr, alloc;
};
-#define COMMIT_STACK_INIT { NULL, 0, 0 }
+#define COMMIT_STACK_INIT { 0 }
static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
{
@@ -360,20 +360,18 @@
unsigned int flags)
{
struct object *object;
+ struct commit *commit;
/*
- * If the repository has commit graphs, repo_parse_commit() avoids
- * reading the object buffer, so use it whenever possible.
+ * If the repository has commit graphs, we try to opportunistically
+ * look up the object ID in those graphs. Like this, we can avoid
+ * parsing commit data from disk.
*/
- if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
- struct commit *c = lookup_commit(revs->repo, oid);
- if (!repo_parse_commit(revs->repo, c))
- object = (struct object *) c;
- else
- object = NULL;
- } else {
+ commit = lookup_commit_in_graph(revs->repo, oid);
+ if (commit)
+ object = &commit->object;
+ else
object = parse_object(revs->repo, oid);
- }
if (!object) {
if (revs->ignore_missing)
@@ -1534,7 +1532,7 @@
object = get_reference(cb->all_revs, path, oid, cb->all_flags);
add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
- add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
+ add_pending_object(cb->all_revs, object, path);
return 0;
}
@@ -2546,7 +2544,7 @@
struct strbuf bisect_refs = STRBUF_INIT;
int status;
strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
- status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
+ status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data);
strbuf_release(&bisect_refs);
return status;
}
@@ -2561,8 +2559,7 @@
return for_each_bisect_ref(refs, fn, cb_data, term_good);
}
-static int handle_revision_pseudo_opt(const char *submodule,
- struct rev_info *revs,
+static int handle_revision_pseudo_opt(struct rev_info *revs,
const char **argv, int *flags)
{
const char *arg = argv[0];
@@ -2570,7 +2567,7 @@
struct ref_store *refs;
int argcount;
- if (submodule) {
+ if (revs->repo != the_repository) {
/*
* We need some something like get_submodule_worktrees()
* before we can go through all worktrees of a submodule,
@@ -2579,9 +2576,8 @@
*/
if (!revs->single_worktree)
BUG("--single-worktree cannot be used together with submodule");
- refs = get_submodule_ref_store(submodule);
- } else
- refs = get_main_ref_store(revs->repo);
+ }
+ refs = get_main_ref_store(revs->repo);
/*
* NOTE!
@@ -2651,16 +2647,17 @@
} else if (!strcmp(arg, "--not")) {
*flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) {
- revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
+ revs->no_walk = 1;
} else if (skip_prefix(arg, "--no-walk=", &optarg)) {
/*
* Detached form ("--no-walk X" as opposed to "--no-walk=X")
* not allowed, since the argument is optional.
*/
+ revs->no_walk = 1;
if (!strcmp(optarg, "sorted"))
- revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
+ revs->unsorted_input = 0;
else if (!strcmp(optarg, "unsorted"))
- revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
+ revs->unsorted_input = 1;
else
return error("invalid argument to --no-walk");
} else if (!strcmp(arg, "--do-walk")) {
@@ -2699,12 +2696,8 @@
{
int i, flags, left, seen_dashdash, revarg_opt;
struct strvec prune_data = STRVEC_INIT;
- const char *submodule = NULL;
int seen_end_of_options = 0;
- if (opt)
- submodule = opt->submodule;
-
/* First, search for "--" */
if (opt && opt->assume_dashdash) {
seen_dashdash = 1;
@@ -2733,7 +2726,7 @@
if (!seen_end_of_options && *arg == '-') {
int opts;
- opts = handle_revision_pseudo_opt(submodule,
+ opts = handle_revision_pseudo_opt(
revs, argv + i,
&flags);
if (opts > 0) {
@@ -3584,7 +3577,7 @@
if (!revs->reflog_info)
prepare_to_use_bloom_filter(revs);
- if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
+ if (!revs->unsorted_input)
commit_list_sort_by_date(&revs->commits);
if (revs->no_walk)
return 0;
diff --git a/revision.h b/revision.h
index fbb068d..5578bb4 100644
--- a/revision.h
+++ b/revision.h
@@ -79,10 +79,6 @@
} *rev;
};
-#define REVISION_WALK_WALK 0
-#define REVISION_WALK_NO_WALK_SORTED 1
-#define REVISION_WALK_NO_WALK_UNSORTED 2
-
struct oidset;
struct topo_walk_info;
@@ -129,7 +125,8 @@
/* Traversal flags */
unsigned int dense:1,
prune:1,
- no_walk:2,
+ no_walk:1,
+ unsorted_input:1,
remove_empty_trees:1,
simplify_history:1,
show_pulls:1,
@@ -339,7 +336,6 @@
struct setup_revision_opt {
const char *def;
void (*tweak)(struct rev_info *, struct setup_revision_opt *);
- const char *submodule; /* TODO: drop this and use rev_info->repo */
unsigned int assume_dashdash:1,
allow_exclude_promisor_objects:1;
unsigned revarg_opt;
diff --git a/run-command.c b/run-command.c
index f329391..f40df01 100644
--- a/run-command.c
+++ b/run-command.c
@@ -8,6 +8,8 @@
#include "string-list.h"
#include "quote.h"
#include "config.h"
+#include "packfile.h"
+#include "hook.h"
void child_process_init(struct child_process *child)
{
@@ -210,9 +212,9 @@
return NULL;
}
-static int exists_in_PATH(const char *file)
+int exists_in_PATH(const char *command)
{
- char *r = locate_in_PATH(file);
+ char *r = locate_in_PATH(command);
int found = r != NULL;
free(r);
return found;
@@ -740,6 +742,9 @@
fflush(NULL);
+ if (cmd->close_object_store)
+ close_object_store(the_repository->objects);
+
#ifndef GIT_WINDOWS_NATIVE
{
int notify_pipe[2];
@@ -1042,6 +1047,7 @@
cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0;
cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0;
+ cmd.close_object_store = opt & RUN_CLOSE_OBJECT_STORE ? 1 : 0;
cmd.dir = dir;
cmd.env = env;
cmd.trace2_child_class = tr2_class;
@@ -1317,40 +1323,6 @@
#endif
}
-const char *find_hook(const char *name)
-{
- static struct strbuf path = STRBUF_INIT;
-
- strbuf_reset(&path);
- strbuf_git_path(&path, "hooks/%s", name);
- if (access(path.buf, X_OK) < 0) {
- int err = errno;
-
-#ifdef STRIP_EXTENSION
- strbuf_addstr(&path, STRIP_EXTENSION);
- if (access(path.buf, X_OK) >= 0)
- return path.buf;
- if (errno == EACCES)
- err = errno;
-#endif
-
- if (err == EACCES && advice_ignored_hook) {
- static struct string_list advise_given = STRING_LIST_INIT_DUP;
-
- if (!string_list_lookup(&advise_given, name)) {
- string_list_insert(&advise_given, name);
- advise(_("The '%s' hook was ignored because "
- "it's not set as executable.\n"
- "You can disable this warning with "
- "`git config advice.ignoredHook false`."),
- path.buf);
- }
- }
- return NULL;
- }
- return path.buf;
-}
-
int run_hook_ve(const char *const *env, const char *name, va_list args)
{
struct child_process hook = CHILD_PROCESS_INIT;
@@ -1884,6 +1856,7 @@
return 0;
maint.git_cmd = 1;
+ maint.close_object_store = 1;
strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL);
strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet");
@@ -1901,3 +1874,132 @@
}
strvec_pushf(env_array, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
}
+
+enum start_bg_result start_bg_command(struct child_process *cmd,
+ start_bg_wait_cb *wait_cb,
+ void *cb_data,
+ unsigned int timeout_sec)
+{
+ enum start_bg_result sbgr = SBGR_ERROR;
+ int ret;
+ int wait_status;
+ pid_t pid_seen;
+ time_t time_limit;
+
+ /*
+ * We do not allow clean-on-exit because the child process
+ * should persist in the background and possibly/probably
+ * after this process exits. So we don't want to kill the
+ * child during our atexit routine.
+ */
+ if (cmd->clean_on_exit)
+ BUG("start_bg_command() does not allow non-zero clean_on_exit");
+
+ if (!cmd->trace2_child_class)
+ cmd->trace2_child_class = "background";
+
+ ret = start_command(cmd);
+ if (ret) {
+ /*
+ * We assume that if `start_command()` fails, we
+ * either get a complete `trace2_child_start() /
+ * trace2_child_exit()` pair or it fails before the
+ * `trace2_child_start()` is emitted, so we do not
+ * need to worry about it here.
+ *
+ * We also assume that `start_command()` does not add
+ * us to the cleanup list. And that it calls
+ * calls `child_process_clear()`.
+ */
+ sbgr = SBGR_ERROR;
+ goto done;
+ }
+
+ time(&time_limit);
+ time_limit += timeout_sec;
+
+wait:
+ pid_seen = waitpid(cmd->pid, &wait_status, WNOHANG);
+
+ if (!pid_seen) {
+ /*
+ * The child is currently running. Ask the callback
+ * if the child is ready to do work or whether we
+ * should keep waiting for it to boot up.
+ */
+ ret = (*wait_cb)(cmd, cb_data);
+ if (!ret) {
+ /*
+ * The child is running and "ready".
+ */
+ trace2_child_ready(cmd, "ready");
+ sbgr = SBGR_READY;
+ goto done;
+ } else if (ret > 0) {
+ /*
+ * The callback said to give it more time to boot up
+ * (subject to our timeout limit).
+ */
+ time_t now;
+
+ time(&now);
+ if (now < time_limit)
+ goto wait;
+
+ /*
+ * Our timeout has expired. We don't try to
+ * kill the child, but rather let it continue
+ * (hopefully) trying to startup.
+ */
+ trace2_child_ready(cmd, "timeout");
+ sbgr = SBGR_TIMEOUT;
+ goto done;
+ } else {
+ /*
+ * The cb gave up on this child. It is still running,
+ * but our cb got an error trying to probe it.
+ */
+ trace2_child_ready(cmd, "error");
+ sbgr = SBGR_CB_ERROR;
+ goto done;
+ }
+ }
+
+ else if (pid_seen == cmd->pid) {
+ int child_code = -1;
+
+ /*
+ * The child started, but exited or was terminated
+ * before becoming "ready".
+ *
+ * We try to match the behavior of `wait_or_whine()`
+ * WRT the handling of WIFSIGNALED() and WIFEXITED()
+ * and convert the child's status to a return code for
+ * tracing purposes and emit the `trace2_child_exit()`
+ * event.
+ *
+ * We do not want the wait_or_whine() error message
+ * because we will be called by client-side library
+ * routines.
+ */
+ if (WIFEXITED(wait_status))
+ child_code = WEXITSTATUS(wait_status);
+ else if (WIFSIGNALED(wait_status))
+ child_code = WTERMSIG(wait_status) + 128;
+ trace2_child_exit(cmd, child_code);
+
+ sbgr = SBGR_DIED;
+ goto done;
+ }
+
+ else if (pid_seen < 0 && errno == EINTR)
+ goto wait;
+
+ trace2_child_exit(cmd, -1);
+ sbgr = SBGR_ERROR;
+
+done:
+ child_process_clear(cmd);
+ invalidate_lstat_cache();
+ return sbgr;
+}
diff --git a/run-command.h b/run-command.h
index af12967..4987826 100644
--- a/run-command.h
+++ b/run-command.h
@@ -134,6 +134,14 @@
*/
unsigned use_shell:1;
+ /**
+ * Release any open file handles to the object store before running
+ * the command; This is necessary e.g. when the spawned process may
+ * want to repack because that would delete `.pack` files (and on
+ * Windows, you cannot delete files that are still in use).
+ */
+ unsigned close_object_store:1;
+
unsigned stdout_to_stderr:1;
unsigned clean_on_exit:1;
unsigned wait_after_clean:1;
@@ -183,6 +191,18 @@
int is_executable(const char *name);
/**
+ * Check if the command exists on $PATH. This emulates the path search that
+ * execvp would perform, without actually executing the command so it
+ * can be used before fork() to prepare to run a command using
+ * execve() or after execvp() to diagnose why it failed.
+ *
+ * The caller should ensure that command contains no directory separators.
+ *
+ * Returns 1 if it is found in $PATH or 0 if the command could not be found.
+ */
+int exists_in_PATH(const char *command);
+
+/**
* Start a sub-process. Takes a pointer to a `struct child_process`
* that specifies the details and returns pipe FDs (if requested).
* See below for details.
@@ -204,13 +224,6 @@
*/
int run_command(struct child_process *);
-/*
- * Returns the path to the hook file, or NULL if the hook is missing
- * or disabled. Note that this points to static storage that will be
- * overwritten by further calls to find_hook and run_hook_*.
- */
-const char *find_hook(const char *name);
-
/**
* Run a hook.
* The first argument is a pathname to an index file, or NULL
@@ -233,13 +246,14 @@
*/
int run_auto_maintenance(int quiet);
-#define RUN_COMMAND_NO_STDIN 1
-#define RUN_GIT_CMD 2 /*If this is to be git sub-command */
-#define RUN_COMMAND_STDOUT_TO_STDERR 4
-#define RUN_SILENT_EXEC_FAILURE 8
-#define RUN_USING_SHELL 16
-#define RUN_CLEAN_ON_EXIT 32
-#define RUN_WAIT_AFTER_CLEAN 64
+#define RUN_COMMAND_NO_STDIN (1<<0)
+#define RUN_GIT_CMD (1<<1)
+#define RUN_COMMAND_STDOUT_TO_STDERR (1<<2)
+#define RUN_SILENT_EXEC_FAILURE (1<<3)
+#define RUN_USING_SHELL (1<<4)
+#define RUN_CLEAN_ON_EXIT (1<<5)
+#define RUN_WAIT_AFTER_CLEAN (1<<6)
+#define RUN_CLOSE_OBJECT_STORE (1<<7)
/**
* Convenience functions that encapsulate a sequence of
@@ -496,4 +510,61 @@
*/
void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir);
+/**
+ * Possible return values for start_bg_command().
+ */
+enum start_bg_result {
+ /* child process is "ready" */
+ SBGR_READY = 0,
+
+ /* child process could not be started */
+ SBGR_ERROR,
+
+ /* callback error when testing for "ready" */
+ SBGR_CB_ERROR,
+
+ /* timeout expired waiting for child to become "ready" */
+ SBGR_TIMEOUT,
+
+ /* child process exited or was signalled before becomming "ready" */
+ SBGR_DIED,
+};
+
+/**
+ * Callback used by start_bg_command() to ask whether the
+ * child process is ready or needs more time to become "ready".
+ *
+ * The callback will receive the cmd and cb_data arguments given to
+ * start_bg_command().
+ *
+ * Returns 1 is child needs more time (subject to the requested timeout).
+ * Returns 0 if child is "ready".
+ * Returns -1 on any error and cause start_bg_command() to also error out.
+ */
+typedef int(start_bg_wait_cb)(const struct child_process *cmd, void *cb_data);
+
+/**
+ * Start a command in the background. Wait long enough for the child
+ * to become "ready" (as defined by the provided callback). Capture
+ * immediate errors (like failure to start) and any immediate exit
+ * status (such as a shutdown/signal before the child became "ready")
+ * and return this like start_command().
+ *
+ * We run a custom wait loop using the provided callback to wait for
+ * the child to start and become "ready". This is limited by the given
+ * timeout value.
+ *
+ * If the child does successfully start and become "ready", we orphan
+ * it into the background.
+ *
+ * The caller must not call finish_command().
+ *
+ * The opaque cb_data argument will be forwarded to the callback for
+ * any instance data that it might require. This may be NULL.
+ */
+enum start_bg_result start_bg_command(struct child_process *cmd,
+ start_bg_wait_cb *wait_cb,
+ void *cb_data,
+ unsigned int timeout_sec);
+
#endif
diff --git a/send-pack.c b/send-pack.c
index b3a495b..bc0fcdb 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -341,13 +341,13 @@
{
const struct ref *ref;
struct string_list_item *item;
- char *signing_key = xstrdup(get_signing_key());
+ char *signing_key_id = xstrdup(get_signing_key_id());
const char *cp, *np;
struct strbuf cert = STRBUF_INIT;
int update_seen = 0;
strbuf_addstr(&cert, "certificate version 0.1\n");
- strbuf_addf(&cert, "pusher %s ", signing_key);
+ strbuf_addf(&cert, "pusher %s ", signing_key_id);
datestamp(&cert);
strbuf_addch(&cert, '\n');
if (args->url && *args->url) {
@@ -374,7 +374,7 @@
if (!update_seen)
goto free_return;
- if (sign_buffer(&cert, &cert, signing_key))
+ if (sign_buffer(&cert, &cert, get_signing_key()))
die(_("failed to sign the push certificate"));
packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
@@ -386,7 +386,7 @@
packet_buf_write(req_buf, "push-cert-end\n");
free_return:
- free(signing_key);
+ free(signing_key_id);
strbuf_release(&cert);
return update_seen;
}
diff --git a/sequencer.c b/sequencer.c
index 5c705f2..ea96837 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -8,6 +8,7 @@
#include "sequencer.h"
#include "tag.h"
#include "run-command.h"
+#include "hook.h"
#include "exec-cmd.h"
#include "utf8.h"
#include "cache-tree.h"
@@ -403,7 +404,7 @@
char *msg = getenv("GIT_CHERRY_PICK_HELP");
if (msg) {
- fprintf(stderr, "%s\n", msg);
+ advise("%s\n", msg);
/*
* A conflict has occurred but the porcelain
* (typically rebase --interactive) wants to take care
@@ -418,10 +419,22 @@
if (opts->no_commit)
advise(_("after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"));
+ else if (opts->action == REPLAY_PICK)
+ advise(_("After resolving the conflicts, mark them with\n"
+ "\"git add/rm <pathspec>\", then run\n"
+ "\"git cherry-pick --continue\".\n"
+ "You can instead skip this commit with \"git cherry-pick --skip\".\n"
+ "To abort and get back to the state before \"git cherry-pick\",\n"
+ "run \"git cherry-pick --abort\"."));
+ else if (opts->action == REPLAY_REVERT)
+ advise(_("After resolving the conflicts, mark them with\n"
+ "\"git add/rm <pathspec>\", then run\n"
+ "\"git revert --continue\".\n"
+ "You can instead skip this commit with \"git revert --skip\".\n"
+ "To abort and get back to the state before \"git revert\",\n"
+ "run \"git revert --abort\"."));
else
- advise(_("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'"));
+ BUG("unexpected pick action in print_advice()");
}
}
@@ -486,7 +499,7 @@
error(_("your local changes would be overwritten by %s."),
_(action_name(opts)));
- if (advice_commit_before_merge)
+ if (advice_enabled(ADVICE_COMMIT_BEFORE_MERGE))
advise(_("commit your changes or stash them to proceed."));
return -1;
}
@@ -636,7 +649,7 @@
for (i = 0; i < opts->xopts_nr; i++)
parse_merge_opt(&o, opts->xopts[i]);
- if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
memset(&result, 0, sizeof(result));
merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
&result);
@@ -652,6 +665,7 @@
merge_switch_to_result(&o, head_tree, &result, 1, show_output);
clean = result.clean;
} else {
+ ensure_full_index(r->index);
clean = merge_trees(&o, head_tree, next_tree, base_tree);
if (is_rebase_i(opts) && clean <= 0)
fputs(o.obuf.buf, stdout);
@@ -1244,7 +1258,7 @@
static const char *implicit_ident_advice(void)
{
- char *user_config = expand_user_path("~/.gitconfig", 0);
+ char *user_config = interpolate_path("~/.gitconfig", 0);
char *xdg_config = xdg_config_home("config");
int config_exists = file_exists(user_config) || file_exists(xdg_config);
@@ -1296,7 +1310,7 @@
if (!committer_ident_sufficiently_given()) {
strbuf_addstr(&format, "\n Committer: ");
strbuf_addbuf_percentquote(&format, &committer_ident);
- if (advice_implicit_identity) {
+ if (advice_enabled(ADVICE_IMPLICIT_IDENTITY)) {
strbuf_addch(&format, '\n');
strbuf_addstr(&format, implicit_ident_advice());
}
@@ -1448,7 +1462,7 @@
}
}
- if (find_hook("prepare-commit-msg")) {
+ if (hook_exists("prepare-commit-msg")) {
res = run_prepare_commit_msg_hook(r, msg, hook_commit);
if (res)
goto out;
@@ -2349,6 +2363,7 @@
_(action_name(opts)));
}
refresh_index(r->index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
+
if (index_fd >= 0) {
if (write_locked_index(r->index, &index_lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED)) {
@@ -2356,6 +2371,13 @@
_(action_name(opts)));
}
}
+
+ /*
+ * If we are resolving merges in any way other than "ort", then
+ * expand the sparse index.
+ */
+ if (opts->strategy && strcmp(opts->strategy, "ort"))
+ ensure_full_index(r->index);
return 0;
}
@@ -2674,7 +2696,6 @@
struct todo_list *todo_list,
struct replay_opts *opts)
{
- struct stat st;
const char *todo_file = get_todo_path(opts);
int res;
@@ -2682,11 +2703,6 @@
if (strbuf_read_file_or_whine(&todo_list->buf, todo_file) < 0)
return -1;
- res = stat(todo_file, &st);
- if (res)
- return error(_("could not stat '%s'"), todo_file);
- fill_stat_data(&todo_list->stat, &st);
-
res = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
if (res) {
if (is_rebase_i(opts))
@@ -3044,7 +3060,7 @@
}
if (in_progress_error) {
error("%s", in_progress_error);
- if (advice_sequencer_in_use)
+ if (advice_enabled(ADVICE_SEQUENCER_IN_USE))
advise(in_progress_advice,
advise_skip ? "--skip | " : "");
return -1;
@@ -3248,7 +3264,7 @@
give_advice:
error(_("there is nothing to skip"));
- if (advice_resolve_conflict) {
+ if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) {
advise(_("have you committed already?\n"
"try \"git %s --continue\""),
action == REPLAY_REVERT ? "revert" : "cherry-pick");
@@ -3631,9 +3647,9 @@
struct strbuf ref_name = STRBUF_INIT;
struct object_id oid;
struct lock_file lock = LOCK_INIT;
- struct tree_desc desc;
+ struct tree_desc desc = { 0 };
struct tree *tree;
- struct unpack_trees_options unpack_tree_opts;
+ struct unpack_trees_options unpack_tree_opts = { 0 };
int ret = 0;
if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0)
@@ -3665,14 +3681,11 @@
strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
if (get_oid(ref_name.buf, &oid) &&
get_oid(ref_name.buf + strlen("refs/rewritten/"), &oid)) {
- error(_("could not read '%s'"), ref_name.buf);
- rollback_lock_file(&lock);
- strbuf_release(&ref_name);
- return -1;
+ ret = error(_("could not read '%s'"), ref_name.buf);
+ goto cleanup;
}
}
- memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
setup_unpack_trees_porcelain(&unpack_tree_opts, "reset");
unpack_tree_opts.head_idx = 1;
unpack_tree_opts.src_index = r->index;
@@ -3680,27 +3693,22 @@
unpack_tree_opts.fn = oneway_merge;
unpack_tree_opts.merge = 1;
unpack_tree_opts.update = 1;
+ unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
if (repo_read_index_unmerged(r)) {
- rollback_lock_file(&lock);
- strbuf_release(&ref_name);
- return error_resolve_conflict(_(action_name(opts)));
+ ret = error_resolve_conflict(_(action_name(opts)));
+ goto cleanup;
}
if (!fill_tree_descriptor(r, &desc, &oid)) {
- error(_("failed to find tree of %s"), oid_to_hex(&oid));
- rollback_lock_file(&lock);
- free((void *)desc.buffer);
- strbuf_release(&ref_name);
- return -1;
+ ret = error(_("failed to find tree of %s"), oid_to_hex(&oid));
+ goto cleanup;
}
if (unpack_trees(1, &desc, &unpack_tree_opts)) {
- rollback_lock_file(&lock);
- free((void *)desc.buffer);
- strbuf_release(&ref_name);
- return -1;
+ ret = -1;
+ goto cleanup;
}
tree = parse_tree_indirect(&oid);
@@ -3708,14 +3716,17 @@
if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0)
ret = error(_("could not write index"));
- free((void *)desc.buffer);
if (!ret)
ret = update_ref(reflog_message(opts, "reset", "'%.*s'",
len, name), "HEAD", &oid,
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
-
+cleanup:
+ free((void *)desc.buffer);
+ if (ret < 0)
+ rollback_lock_file(&lock);
strbuf_release(&ref_name);
+ clear_unpack_trees_porcelain(&unpack_tree_opts);
return ret;
}
@@ -3992,7 +4003,7 @@
o.branch2 = ref_name.buf;
o.buffer_output = 2;
- if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
/*
* TODO: Should use merge_incore_recursive() and
* merge_switch_to_result(), skipping the call to
@@ -4265,6 +4276,30 @@
}
+static int reread_todo_if_changed(struct repository *r,
+ struct todo_list *todo_list,
+ struct replay_opts *opts)
+{
+ int offset;
+ struct strbuf buf = STRBUF_INIT;
+
+ if (strbuf_read_file_or_whine(&buf, get_todo_path(opts)) < 0)
+ return -1;
+ offset = get_item_line_offset(todo_list, todo_list->current + 1);
+ if (buf.len != todo_list->buf.len - offset ||
+ memcmp(buf.buf, todo_list->buf.buf + offset, buf.len)) {
+ /* Reread the todo file if it has changed. */
+ todo_list_release(todo_list);
+ if (read_populate_todo(r, todo_list, opts))
+ return -1; /* message was printed */
+ /* `current` will be incremented on return */
+ todo_list->current = -1;
+ }
+ strbuf_release(&buf);
+
+ return 0;
+}
+
static const char rescheduled_advice[] =
N_("Could not execute the todo command\n"
"\n"
@@ -4443,20 +4478,9 @@
item->commit,
arg, item->arg_len,
opts, res, 0);
- } else if (is_rebase_i(opts) && check_todo && !res) {
- struct stat st;
-
- if (stat(get_todo_path(opts), &st)) {
- res = error_errno(_("could not stat '%s'"),
- get_todo_path(opts));
- } else if (match_stat_data(&todo_list->stat, &st)) {
- /* Reread the todo file if it has changed. */
- todo_list_release(todo_list);
- if (read_populate_todo(r, todo_list, opts))
- res = -1; /* message was printed */
- /* `current` will be incremented below */
- todo_list->current = -1;
- }
+ } else if (is_rebase_i(opts) && check_todo && !res &&
+ reread_todo_if_changed(r, todo_list, opts)) {
+ return -1;
}
todo_list->current++;
@@ -5112,6 +5136,7 @@
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
+ int skipped_commit = 0;
struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
struct strbuf label = STRBUF_INIT;
struct commit_list *commits = NULL, **tail = &commits, *iter;
@@ -5162,8 +5187,13 @@
oidset_insert(&interesting, &commit->object.oid);
is_empty = is_original_commit_empty(commit);
- if (!is_empty && (commit->object.flags & PATCHSAME))
+ if (!is_empty && (commit->object.flags & PATCHSAME)) {
+ if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS)
+ warning(_("skipped previously applied commit %s"),
+ short_commit_name(commit));
+ skipped_commit = 1;
continue;
+ }
if (is_empty && !keep_empty)
continue;
@@ -5227,6 +5257,9 @@
oidcpy(&entry->entry.oid, &commit->object.oid);
oidmap_put(&commit2todo, entry);
}
+ if (skipped_commit)
+ advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
+ _("use --reapply-cherry-picks to include skipped commits"));
/*
* Second phase:
@@ -5347,6 +5380,7 @@
const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS;
+ int skipped_commit = 0;
repo_init_revisions(r, &revs, NULL);
revs.verbose_header = 1;
@@ -5382,8 +5416,13 @@
while ((commit = get_revision(&revs))) {
int is_empty = is_original_commit_empty(commit);
- if (!is_empty && (commit->object.flags & PATCHSAME))
+ if (!is_empty && (commit->object.flags & PATCHSAME)) {
+ if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS)
+ warning(_("skipped previously applied commit %s"),
+ short_commit_name(commit));
+ skipped_commit = 1;
continue;
+ }
if (is_empty && !keep_empty)
continue;
strbuf_addf(out, "%s %s ", insn,
@@ -5393,6 +5432,9 @@
strbuf_addf(out, " %c empty", comment_line_char);
strbuf_addch(out, '\n');
}
+ if (skipped_commit)
+ advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
+ _("use --reapply-cherry-picks to include skipped commits"));
return 0;
}
@@ -5400,8 +5442,8 @@
* Add commands after pick and (series of) squash/fixup commands
* in the todo list.
*/
-void todo_list_add_exec_commands(struct todo_list *todo_list,
- struct string_list *commands)
+static void todo_list_add_exec_commands(struct todo_list *todo_list,
+ struct string_list *commands)
{
struct strbuf *buf = &todo_list->buf;
size_t base_offset = buf->len;
diff --git a/sequencer.h b/sequencer.h
index d57d8ea..05a7d2b 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -116,10 +116,11 @@
struct todo_item *items;
int nr, alloc, current;
int done_nr, total_nr;
- struct stat_data stat;
};
-#define TODO_LIST_INIT { STRBUF_INIT }
+#define TODO_LIST_INIT { \
+ .buf = STRBUF_INIT, \
+}
int todo_list_parse_insn_buffer(struct repository *r, char *buf,
struct todo_list *todo_list);
@@ -156,12 +157,11 @@
*/
#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
+#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8)
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
const char **argv, unsigned flags);
-void todo_list_add_exec_commands(struct todo_list *todo_list,
- struct string_list *commands);
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
struct commit *onto, const struct object_id *orig_head,
diff --git a/serve.c b/serve.c
index f11c0e0..b3fe9b5 100644
--- a/serve.c
+++ b/serve.c
@@ -9,7 +9,8 @@
#include "serve.h"
#include "upload-pack.h"
-static int advertise_sid;
+static int advertise_sid = -1;
+static int client_hash_algo = GIT_HASH_SHA1;
static int always_advertise(struct repository *r,
struct strbuf *value)
@@ -33,8 +34,22 @@
return 1;
}
+static void object_format_receive(struct repository *r,
+ const char *algo_name)
+{
+ if (!algo_name)
+ die("object-format capability requires an argument");
+
+ client_hash_algo = hash_algo_by_name(algo_name);
+ if (client_hash_algo == GIT_HASH_UNKNOWN)
+ die("unknown object format '%s'", algo_name);
+}
+
static int session_id_advertise(struct repository *r, struct strbuf *value)
{
+ if (advertise_sid == -1 &&
+ git_config_get_bool("transfer.advertisesid", &advertise_sid))
+ advertise_sid = 0;
if (!advertise_sid)
return 0;
if (value)
@@ -42,6 +57,14 @@
return 1;
}
+static void session_id_receive(struct repository *r,
+ const char *client_sid)
+{
+ if (!client_sid)
+ client_sid = "";
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
+}
+
struct protocol_capability {
/*
* The name of the capability. The server uses this name when
@@ -60,34 +83,70 @@
/*
* Function called when a client requests the capability as a command.
- * The function will be provided the capabilities requested via 'keys'
- * as well as a struct packet_reader 'request' which the command should
+ * Will be provided a struct packet_reader 'request' which it should
* use to read the command specific part of the request. Every command
* MUST read until a flush packet is seen before sending a response.
*
* This field should be NULL for capabilities which are not commands.
*/
- int (*command)(struct repository *r,
- struct strvec *keys,
- struct packet_reader *request);
+ int (*command)(struct repository *r, struct packet_reader *request);
+
+ /*
+ * Function called when a client requests the capability as a
+ * non-command. This may be NULL if the capability does nothing.
+ *
+ * For a capability of the form "foo=bar", the value string points to
+ * the content after the "=" (i.e., "bar"). For simple capabilities
+ * (just "foo"), it is NULL.
+ */
+ void (*receive)(struct repository *r, const char *value);
};
static struct protocol_capability capabilities[] = {
- { "agent", agent_advertise, NULL },
- { "ls-refs", ls_refs_advertise, ls_refs },
- { "fetch", upload_pack_advertise, upload_pack_v2 },
- { "server-option", always_advertise, NULL },
- { "object-format", object_format_advertise, NULL },
- { "session-id", session_id_advertise, NULL },
- { "object-info", always_advertise, cap_object_info },
+ {
+ .name = "agent",
+ .advertise = agent_advertise,
+ },
+ {
+ .name = "ls-refs",
+ .advertise = ls_refs_advertise,
+ .command = ls_refs,
+ },
+ {
+ .name = "fetch",
+ .advertise = upload_pack_advertise,
+ .command = upload_pack_v2,
+ },
+ {
+ .name = "server-option",
+ .advertise = always_advertise,
+ },
+ {
+ .name = "object-format",
+ .advertise = object_format_advertise,
+ .receive = object_format_receive,
+ },
+ {
+ .name = "session-id",
+ .advertise = session_id_advertise,
+ .receive = session_id_receive,
+ },
+ {
+ .name = "object-info",
+ .advertise = always_advertise,
+ .command = cap_object_info,
+ },
};
-static void advertise_capabilities(void)
+void protocol_v2_advertise_capabilities(void)
{
struct strbuf capability = STRBUF_INIT;
struct strbuf value = STRBUF_INIT;
int i;
+ /* serve by default supports v2 */
+ packet_write_fmt(1, "version 2\n");
+
for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
struct protocol_capability *c = &capabilities[i];
@@ -112,7 +171,7 @@
strbuf_release(&value);
}
-static struct protocol_capability *get_capability(const char *key)
+static struct protocol_capability *get_capability(const char *key, const char **value)
{
int i;
@@ -122,31 +181,46 @@
for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
struct protocol_capability *c = &capabilities[i];
const char *out;
- if (skip_prefix(key, c->name, &out) && (!*out || *out == '='))
+ if (!skip_prefix(key, c->name, &out))
+ continue;
+ if (!*out) {
+ *value = NULL;
return c;
+ }
+ if (*out++ == '=') {
+ *value = out;
+ return c;
+ }
}
return NULL;
}
-static int is_valid_capability(const char *key)
+static int receive_client_capability(const char *key)
{
- const struct protocol_capability *c = get_capability(key);
+ const char *value;
+ const struct protocol_capability *c = get_capability(key, &value);
- return c && c->advertise(the_repository, NULL);
+ if (!c || c->command || !c->advertise(the_repository, NULL))
+ return 0;
+
+ if (c->receive)
+ c->receive(the_repository, value);
+ return 1;
}
-static int is_command(const char *key, struct protocol_capability **command)
+static int parse_command(const char *key, struct protocol_capability **command)
{
const char *out;
if (skip_prefix(key, "command=", &out)) {
- struct protocol_capability *cmd = get_capability(out);
+ const char *value;
+ struct protocol_capability *cmd = get_capability(out, &value);
if (*command)
die("command '%s' requested after already requesting command '%s'",
out, (*command)->name);
- if (!cmd || !cmd->advertise(the_repository, NULL) || !cmd->command)
+ if (!cmd || !cmd->advertise(the_repository, NULL) || !cmd->command || value)
die("invalid command '%s'", out);
*command = cmd;
@@ -156,42 +230,6 @@
return 0;
}
-int has_capability(const struct strvec *keys, const char *capability,
- const char **value)
-{
- int i;
- for (i = 0; i < keys->nr; i++) {
- const char *out;
- if (skip_prefix(keys->v[i], capability, &out) &&
- (!*out || *out == '=')) {
- if (value) {
- if (*out == '=')
- out++;
- *value = out;
- }
- return 1;
- }
- }
-
- return 0;
-}
-
-static void check_algorithm(struct repository *r, struct strvec *keys)
-{
- int client = GIT_HASH_SHA1, server = hash_algo_by_ptr(r->hash_algo);
- const char *algo_name;
-
- if (has_capability(keys, "object-format", &algo_name)) {
- client = hash_algo_by_name(algo_name);
- if (client == GIT_HASH_UNKNOWN)
- die("unknown object format '%s'", algo_name);
- }
-
- if (client != server)
- die("mismatched object format: server %s; client %s\n",
- r->hash_algo->name, hash_algos[client].name);
-}
-
enum request_state {
PROCESS_REQUEST_KEYS,
PROCESS_REQUEST_DONE,
@@ -201,9 +239,8 @@
{
enum request_state state = PROCESS_REQUEST_KEYS;
struct packet_reader reader;
- struct strvec keys = STRVEC_INIT;
+ int seen_capability_or_command = 0;
struct protocol_capability *command = NULL;
- const char *client_sid;
packet_reader_init(&reader, 0, NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
@@ -223,10 +260,9 @@
case PACKET_READ_EOF:
BUG("Should have already died when seeing EOF");
case PACKET_READ_NORMAL:
- /* collect request; a sequence of keys and values */
- if (is_command(reader.line, &command) ||
- is_valid_capability(reader.line))
- strvec_push(&keys, reader.line);
+ if (parse_command(reader.line, &command) ||
+ receive_client_capability(reader.line))
+ seen_capability_or_command = 1;
else
die("unknown capability '%s'", reader.line);
@@ -238,7 +274,7 @@
* If no command and no keys were given then the client
* wanted to terminate the connection.
*/
- if (!keys.nr)
+ if (!seen_capability_or_command)
return 1;
/*
@@ -265,40 +301,26 @@
if (!command)
die("no command requested");
- check_algorithm(the_repository, &keys);
+ if (client_hash_algo != hash_algo_by_ptr(the_repository->hash_algo))
+ die("mismatched object format: server %s; client %s\n",
+ the_repository->hash_algo->name,
+ hash_algos[client_hash_algo].name);
- if (has_capability(&keys, "session-id", &client_sid))
- trace2_data_string("transfer", NULL, "client-sid", client_sid);
+ command->command(the_repository, &reader);
- command->command(the_repository, &keys, &reader);
-
- strvec_clear(&keys);
return 0;
}
-/* Main serve loop for protocol version 2 */
-void serve(struct serve_options *options)
+void protocol_v2_serve_loop(int stateless_rpc)
{
- git_config_get_bool("transfer.advertisesid", &advertise_sid);
-
- if (options->advertise_capabilities || !options->stateless_rpc) {
- /* serve by default supports v2 */
- packet_write_fmt(1, "version 2\n");
-
- advertise_capabilities();
- /*
- * If only the list of capabilities was requested exit
- * immediately after advertising capabilities
- */
- if (options->advertise_capabilities)
- return;
- }
+ if (!stateless_rpc)
+ protocol_v2_advertise_capabilities();
/*
* If stateless-rpc was requested then exit after
* a single request/response exchange
*/
- if (options->stateless_rpc) {
+ if (stateless_rpc) {
process_request();
} else {
for (;;)
diff --git a/serve.h b/serve.h
index fc2683e..f946cf9 100644
--- a/serve.h
+++ b/serve.h
@@ -1,15 +1,7 @@
#ifndef SERVE_H
#define SERVE_H
-struct strvec;
-int has_capability(const struct strvec *keys, const char *capability,
- const char **value);
-
-struct serve_options {
- unsigned advertise_capabilities;
- unsigned stateless_rpc;
-};
-#define SERVE_OPTIONS_INIT { 0 }
-void serve(struct serve_options *options);
+void protocol_v2_advertise_capabilities(void);
+void protocol_v2_serve_loop(int stateless_rpc);
#endif /* SERVE_H */
diff --git a/shallow.h b/shallow.h
index 5b4a96d..aba6ff5 100644
--- a/shallow.h
+++ b/shallow.h
@@ -23,7 +23,9 @@
struct shallow_lock {
struct lock_file lock;
};
-#define SHALLOW_LOCK_INIT { LOCK_INIT }
+#define SHALLOW_LOCK_INIT { \
+ .lock = LOCK_INIT, \
+}
/* commit $GIT_DIR/shallow and reset stat-validity checks */
int commit_shallow_file(struct repository *r, struct shallow_lock *lk);
diff --git a/simple-ipc.h b/simple-ipc.h
index 2c48a5e..a849d9f 100644
--- a/simple-ipc.h
+++ b/simple-ipc.h
@@ -5,13 +5,6 @@
* See Documentation/technical/api-simple-ipc.txt
*/
-#ifdef SUPPORTS_SIMPLE_IPC
-#include "pkt-line.h"
-
-/*
- * Simple IPC Client Side API.
- */
-
enum ipc_active_state {
/*
* The pipe/socket exists and the daemon is waiting for connections.
@@ -43,6 +36,13 @@
IPC_STATE__OTHER_ERROR,
};
+#ifdef SUPPORTS_SIMPLE_IPC
+#include "pkt-line.h"
+
+/*
+ * Simple IPC Client Side API.
+ */
+
struct ipc_client_connect_options {
/*
* Spin under timeout if the server is running but can't
@@ -65,11 +65,7 @@
unsigned int uds_disallow_chdir:1;
};
-#define IPC_CLIENT_CONNECT_OPTIONS_INIT { \
- .wait_if_busy = 0, \
- .wait_if_not_found = 0, \
- .uds_disallow_chdir = 0, \
-}
+#define IPC_CLIENT_CONNECT_OPTIONS_INIT { 0 }
/*
* Determine if a server is listening on this named pipe or socket using
@@ -107,7 +103,8 @@
*/
int ipc_client_send_command_to_connection(
struct ipc_client_connection *connection,
- const char *message, struct strbuf *answer);
+ const char *message, size_t message_len,
+ struct strbuf *answer);
/*
* Used by the client to synchronously connect and send and receive a
@@ -119,7 +116,8 @@
*/
int ipc_client_send_command(const char *path,
const struct ipc_client_connect_options *options,
- const char *message, struct strbuf *answer);
+ const char *message, size_t message_len,
+ struct strbuf *answer);
/*
* Simple IPC Server Side API.
@@ -144,6 +142,7 @@
*/
typedef int (ipc_server_application_cb)(void *application_data,
const char *request,
+ size_t request_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data);
diff --git a/sparse-index.c b/sparse-index.c
index 56eb65d..7b7ff79 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -33,19 +33,14 @@
{
int i, can_convert = 1;
int start_converted = num_converted;
- enum pattern_match_result match;
- int dtype = DT_UNKNOWN;
struct strbuf child_path = STRBUF_INIT;
- struct pattern_list *pl = istate->sparse_checkout_patterns;
/*
* Is the current path outside of the sparse cone?
* Then check if the region can be replaced by a sparse
* directory entry (everything is sparse and merged).
*/
- match = path_matches_pattern_list(ct_path, ct_pathlen,
- NULL, &dtype, pl, istate);
- if (match != NOT_MATCHED)
+ if (path_in_sparse_checkout(ct_path, istate))
can_convert = 0;
for (i = start; can_convert && i < end; i++) {
@@ -127,41 +122,51 @@
return 0;
}
-int convert_to_sparse(struct index_state *istate)
+int convert_to_sparse(struct index_state *istate, int flags)
{
int test_env;
- if (istate->split_index || istate->sparse_index ||
+ if (istate->sparse_index || !istate->cache_nr ||
!core_apply_sparse_checkout || !core_sparse_checkout_cone)
return 0;
if (!istate->repo)
istate->repo = the_repository;
- /*
- * The GIT_TEST_SPARSE_INDEX environment variable triggers the
- * index.sparse config variable to be on.
- */
- test_env = git_env_bool("GIT_TEST_SPARSE_INDEX", -1);
- if (test_env >= 0)
- set_sparse_index_config(istate->repo, test_env);
+ if (!(flags & SPARSE_INDEX_MEMORY_ONLY)) {
+ /*
+ * The sparse index is not (yet) integrated with a split index.
+ */
+ if (istate->split_index)
+ return 0;
+ /*
+ * The GIT_TEST_SPARSE_INDEX environment variable triggers the
+ * index.sparse config variable to be on.
+ */
+ test_env = git_env_bool("GIT_TEST_SPARSE_INDEX", -1);
+ if (test_env >= 0)
+ set_sparse_index_config(istate->repo, test_env);
- /*
- * Only convert to sparse if index.sparse is set.
- */
- prepare_repo_settings(istate->repo);
- if (!istate->repo->settings.sparse_index)
- return 0;
-
- if (!istate->sparse_checkout_patterns) {
- istate->sparse_checkout_patterns = xcalloc(1, sizeof(struct pattern_list));
- if (get_sparse_checkout_patterns(istate->sparse_checkout_patterns) < 0)
+ /*
+ * Only convert to sparse if index.sparse is set.
+ */
+ prepare_repo_settings(istate->repo);
+ if (!istate->repo->settings.sparse_index)
return 0;
}
- if (!istate->sparse_checkout_patterns->use_cone_patterns) {
- warning(_("attempting to use sparse-index without cone mode"));
- return -1;
- }
+ if (init_sparse_checkout_patterns(istate))
+ return 0;
+
+ /*
+ * We need cone-mode patterns to use sparse-index. If a user edits
+ * their sparse-checkout file manually, then we can detect during
+ * parsing that they are not actually using cone-mode patterns and
+ * hence we need to abort this conversion _without error_. Warnings
+ * already exist in the pattern parsing to inform the user of their
+ * bad patterns.
+ */
+ if (!istate->sparse_checkout_patterns->use_cone_patterns)
+ return 0;
/*
* NEEDSWORK: If we have unmerged entries, then stay full.
@@ -172,10 +177,15 @@
/* Clear and recompute the cache-tree */
cache_tree_free(&istate->cache_tree);
- if (cache_tree_update(istate, 0)) {
- warning(_("unable to update cache-tree, staying full"));
- return -1;
- }
+ /*
+ * Silently return if there is a problem with the cache tree update,
+ * which might just be due to a conflict state in some entry.
+ *
+ * This might create new tree objects, so be sure to use
+ * WRITE_TREE_MISSING_OK.
+ */
+ if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
+ return 0;
remove_fsmonitor(istate);
diff --git a/sparse-index.h b/sparse-index.h
index 1115a0d..9f3d7bc 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -2,7 +2,8 @@
#define SPARSE_INDEX_H__
struct index_state;
-int convert_to_sparse(struct index_state *istate);
+#define SPARSE_INDEX_MEMORY_ONLY (1 << 0)
+int convert_to_sparse(struct index_state *istate, int flags);
/*
* Some places in the codebase expect to search for a specific path.
diff --git a/strbuf.c b/strbuf.c
index c8a5789..b22e981 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -1059,15 +1059,21 @@
strbuf_setlen(sb, sb->len + len);
}
-void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
- int abbrev_len)
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+ const struct object_id *oid, int abbrev_len)
{
int r;
strbuf_grow(sb, GIT_MAX_HEXSZ + 1);
- r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);
+ r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len);
strbuf_setlen(sb, sb->len + r);
}
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
+ int abbrev_len)
+{
+ strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len);
+}
+
/*
* Returns the length of a line, without trailing spaces.
*
diff --git a/strbuf.h b/strbuf.h
index 5b1113a..96512f8 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -70,7 +70,7 @@
};
extern char strbuf_slopbuf[];
-#define STRBUF_INIT { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
+#define STRBUF_INIT { .buf = strbuf_slopbuf }
/*
* Predeclare this here, since cache.h includes this file before it defines the
@@ -634,8 +634,10 @@
* Add the abbreviation, as generated by find_unique_abbrev, of `sha1` to
* the strbuf `sb`.
*/
-void strbuf_add_unique_abbrev(struct strbuf *sb,
- const struct object_id *oid,
+struct repository;
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+ const struct object_id *oid, int abbrev_len);
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
int abbrev_len);
/**
diff --git a/streaming.c b/streaming.c
index 5f480ad..fe54665 100644
--- a/streaming.c
+++ b/streaming.c
@@ -223,19 +223,24 @@
const struct object_id *oid,
enum object_type *type)
{
+ struct object_info oi = OBJECT_INFO_INIT;
+ oi.sizep = &st->size;
+ oi.typep = type;
+
st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize);
if (!st->u.loose.mapped)
return -1;
- if ((unpack_loose_header(&st->z,
- st->u.loose.mapped,
- st->u.loose.mapsize,
- st->u.loose.hdr,
- sizeof(st->u.loose.hdr)) < 0) ||
- (parse_loose_header(st->u.loose.hdr, &st->size) < 0)) {
- git_inflate_end(&st->z);
- munmap(st->u.loose.mapped, st->u.loose.mapsize);
- return -1;
+ switch (unpack_loose_header(&st->z, st->u.loose.mapped,
+ st->u.loose.mapsize, st->u.loose.hdr,
+ sizeof(st->u.loose.hdr), NULL)) {
+ case ULHR_OK:
+ break;
+ case ULHR_BAD:
+ case ULHR_TOO_LONG:
+ goto error;
}
+ if (parse_loose_header(st->u.loose.hdr, &oi) < 0 || *type < 0)
+ goto error;
st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
st->u.loose.hdr_avail = st->z.total_out;
@@ -244,6 +249,10 @@
st->read = read_istream_loose;
return 0;
+error:
+ git_inflate_end(&st->z);
+ munmap(st->u.loose.mapped, st->u.loose.mapsize);
+ return -1;
}
diff --git a/string-list.c b/string-list.c
index 43576ad..549fc41 100644
--- a/string-list.c
+++ b/string-list.c
@@ -13,14 +13,6 @@
memcpy(list, &blank, sizeof(*list));
}
-void string_list_init(struct string_list *list, int strdup_strings)
-{
- if (strdup_strings)
- string_list_init_dup(list);
- else
- string_list_init_nodup(list);
-}
-
/* if there is no exact match, point to the index where the entry could be
* inserted */
static int get_entry_index(const struct string_list *list, const char *string,
diff --git a/string-list.h b/string-list.h
index 0d6b469..267d6e5 100644
--- a/string-list.h
+++ b/string-list.h
@@ -104,11 +104,6 @@
void string_list_init_nodup(struct string_list *list);
void string_list_init_dup(struct string_list *list);
-/**
- * TODO remove: For compatibility with any in-flight older API users
- */
-void string_list_init(struct string_list *list, int strdup_strings);
-
/** Callback function type for for_each_string_list */
typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
diff --git a/strvec.h b/strvec.h
index 6b3cbd6..9f55c87 100644
--- a/strvec.h
+++ b/strvec.h
@@ -33,7 +33,9 @@
size_t alloc;
};
-#define STRVEC_INIT { empty_strvec, 0, 0 }
+#define STRVEC_INIT { \
+ .v = empty_strvec, \
+}
/**
* Initialize an array. This is no different than assigning from
diff --git a/submodule-config.c b/submodule-config.c
index 2026120..f953440 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -649,9 +649,10 @@
config_source.file = file;
} else if (repo_get_oid(repo, GITMODULES_INDEX, &oid) >= 0 ||
repo_get_oid(repo, GITMODULES_HEAD, &oid) >= 0) {
+ config_source.repo = repo;
config_source.blob = oidstr = xstrdup(oid_to_hex(&oid));
if (repo != the_repository)
- add_to_alternates_memory(repo->objects->odb->path);
+ add_submodule_odb_by_path(repo->objects->odb->path);
} else {
goto out;
}
@@ -702,7 +703,7 @@
if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
git_config_from_blob_oid(gitmodules_cb, rev.buf,
- &oid, the_repository);
+ the_repository, &oid, the_repository);
}
strbuf_release(&rev);
diff --git a/submodule-config.h b/submodule-config.h
index c11e22c..65875b9 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -45,10 +45,6 @@
struct object_id gitmodules_oid;
int recommend_shallow;
};
-
-#define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \
- NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, { { 0 } }, -1 };
-
struct submodule_cache;
struct repository;
diff --git a/submodule.c b/submodule.c
index 8e611fe..c689070 100644
--- a/submodule.c
+++ b/submodule.c
@@ -165,6 +165,8 @@
die(_("staging updated .gitmodules failed"));
}
+static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
+
/* TODO: remove this function, use repo_submodule_init instead. */
int add_submodule_odb(const char *path)
{
@@ -178,12 +180,35 @@
ret = -1;
goto done;
}
- add_to_alternates_memory(objects_directory.buf);
+ string_list_insert(&added_submodule_odb_paths,
+ strbuf_detach(&objects_directory, NULL));
done:
strbuf_release(&objects_directory);
return ret;
}
+void add_submodule_odb_by_path(const char *path)
+{
+ string_list_insert(&added_submodule_odb_paths, xstrdup(path));
+}
+
+int register_all_submodule_odb_as_alternates(void)
+{
+ int i;
+ int ret = added_submodule_odb_paths.nr;
+
+ for (i = 0; i < added_submodule_odb_paths.nr; i++)
+ add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
+ if (ret) {
+ string_list_clear(&added_submodule_odb_paths, 0);
+ trace2_data_intmax("submodule", the_repository,
+ "register_all_submodule_odb_as_alternates/registered", ret);
+ if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
+ BUG("register_all_submodule_odb_as_alternates() called");
+ }
+ return ret;
+}
+
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path)
{
@@ -237,6 +262,11 @@
/*
* Determine if a submodule has been initialized at a given 'path'
*/
+/*
+ * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
+ * ie, the config looks like: "[submodule] active\n".
+ * Since that is an invalid pathspec, we should inform the user.
+ */
int is_submodule_active(struct repository *repo, const char *path)
{
int ret = 0;
@@ -497,9 +527,6 @@
/*
* Initialize a repository struct for a submodule based on the provided 'path'.
*
- * Unlike repo_submodule_init, this tolerates submodules not present
- * in .gitmodules. This function exists only to preserve historical behavior,
- *
* Returns the repository struct on success,
* NULL when the submodule is not present.
*/
@@ -697,8 +724,20 @@
strvec_push(&cp.args, oid_to_hex(new_oid));
prepare_submodule_repo_env(&cp.env_array);
- if (start_command(&cp))
+
+ if (!is_directory(path)) {
+ /* fall back to absorbed git dir, if any */
+ if (!sub)
+ goto done;
+ cp.dir = sub->gitdir;
+ strvec_push(&cp.env_array, GIT_DIR_ENVIRONMENT "=.");
+ strvec_push(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT "=.");
+ }
+
+ if (start_command(&cp)) {
diff_emit_submodule_error(o, "(diff failed)\n");
+ goto done;
+ }
while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
@@ -891,23 +930,33 @@
static int check_has_commit(const struct object_id *oid, void *data)
{
struct has_commit_data *cb = data;
+ struct repository subrepo;
+ enum object_type type;
- enum object_type type = oid_object_info(cb->repo, oid, NULL);
+ if (repo_submodule_init(&subrepo, cb->repo, cb->path, null_oid())) {
+ cb->result = 0;
+ goto cleanup;
+ }
+
+ type = oid_object_info(&subrepo, oid, NULL);
switch (type) {
case OBJ_COMMIT:
- return 0;
+ goto cleanup;
case OBJ_BAD:
/*
* Object is missing or invalid. If invalid, an error message
* has already been printed.
*/
cb->result = 0;
- return 0;
+ goto cleanup;
default:
die(_("submodule entry '%s' (%s) is a %s, not a commit"),
cb->path, oid_to_hex(oid), type_name(type));
}
+cleanup:
+ repo_clear(&subrepo);
+ return 0;
}
static int submodule_has_commits(struct repository *r,
@@ -1281,9 +1330,11 @@
struct strbuf submodules_with_errors;
};
-#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
- STRING_LIST_INIT_DUP, \
- NULL, 0, 0, STRBUF_INIT}
+#define SPF_INIT { \
+ .args = STRVEC_INIT, \
+ .changed_submodule_names = STRING_LIST_INIT_DUP, \
+ .submodules_with_errors = STRBUF_INIT, \
+}
static int get_fetch_recurse_config(const struct submodule *submodule,
struct submodule_parallel_fetch *spf)
@@ -1381,24 +1432,13 @@
}
static struct repository *get_submodule_repo_for(struct repository *r,
- const struct submodule *sub)
+ const char *path)
{
struct repository *ret = xmalloc(sizeof(*ret));
- if (repo_submodule_init(ret, r, sub)) {
- /*
- * No entry in .gitmodules? Technically not a submodule,
- * but historically we supported repositories that happen to be
- * in-place where a gitlink is. Keep supporting them.
- */
- struct strbuf gitdir = STRBUF_INIT;
- strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path);
- if (repo_init(ret, gitdir.buf, NULL)) {
- strbuf_release(&gitdir);
- free(ret);
- return NULL;
- }
- strbuf_release(&gitdir);
+ if (repo_submodule_init(ret, r, path, null_oid())) {
+ free(ret);
+ return NULL;
}
return ret;
@@ -1440,7 +1480,7 @@
continue;
}
- task->repo = get_submodule_repo_for(spf->r, task->sub);
+ task->repo = get_submodule_repo_for(spf->r, task->sub->path);
if (task->repo) {
struct strbuf submodule_prefix = STRBUF_INIT;
child_process_init(cp);
@@ -1819,14 +1859,16 @@
void submodule_unset_core_worktree(const struct submodule *sub)
{
- char *config_path = xstrfmt("%s/modules/%s/config",
- get_git_dir(), sub->name);
+ struct strbuf config_path = STRBUF_INIT;
- if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
+ submodule_name_to_gitdir(&config_path, the_repository, sub->name);
+ strbuf_addstr(&config_path, "/config");
+
+ if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
warning(_("Could not unset core.worktree setting in submodule '%s'"),
sub->path);
- free(config_path);
+ strbuf_release(&config_path);
}
static const char *get_super_prefix_or_empty(void)
@@ -1866,6 +1908,7 @@
strvec_pushf(&cp.args, "--super-prefix=%s%s/",
get_super_prefix_or_empty(), path);
+ /* TODO: determine if this might overwright untracked files */
strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
strvec_push(&cp.args, empty_tree_oid_hex());
@@ -1922,20 +1965,22 @@
absorb_git_dir_into_superproject(path,
ABSORB_GITDIR_RECURSE_SUBMODULES);
} else {
- char *gitdir = xstrfmt("%s/modules/%s",
- get_git_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir, 0);
- free(gitdir);
+ struct strbuf gitdir = STRBUF_INIT;
+ submodule_name_to_gitdir(&gitdir, the_repository,
+ sub->name);
+ connect_work_tree_and_git_dir(path, gitdir.buf, 0);
+ strbuf_release(&gitdir);
/* make sure the index is clean as well */
submodule_reset_index(path);
}
if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
- char *gitdir = xstrfmt("%s/modules/%s",
- get_git_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir, 1);
- free(gitdir);
+ struct strbuf gitdir = STRBUF_INIT;
+ submodule_name_to_gitdir(&gitdir, the_repository,
+ sub->name);
+ connect_work_tree_and_git_dir(path, gitdir.buf, 1);
+ strbuf_release(&gitdir);
}
}
@@ -2050,7 +2095,7 @@
static void relocate_single_git_dir_into_superproject(const char *path)
{
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
- char *new_git_dir;
+ struct strbuf new_gitdir = STRBUF_INIT;
const struct submodule *sub;
if (submodule_uses_worktrees(path))
@@ -2068,14 +2113,13 @@
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
- new_git_dir = git_pathdup("modules/%s", sub->name);
- if (validate_submodule_git_dir(new_git_dir, sub->name) < 0)
+ submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
+ if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
die(_("refusing to move '%s' into an existing git dir"),
real_old_git_dir);
- if (safe_create_leading_directories_const(new_git_dir) < 0)
- die(_("could not create directory '%s'"), new_git_dir);
- real_new_git_dir = real_pathdup(new_git_dir, 1);
- free(new_git_dir);
+ if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
+ die(_("could not create directory '%s'"), new_gitdir.buf);
+ real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
get_super_prefix_or_empty(), path,
@@ -2086,6 +2130,7 @@
free(old_git_dir);
free(real_old_git_dir);
free(real_new_git_dir);
+ strbuf_release(&new_gitdir);
}
/*
@@ -2105,6 +2150,7 @@
/* Not populated? */
if (!sub_git_dir) {
const struct submodule *sub;
+ struct strbuf sub_gitdir = STRBUF_INIT;
if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
/* unpopulated as expected */
@@ -2126,8 +2172,9 @@
sub = submodule_from_path(the_repository, null_oid(), path);
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
- connect_work_tree_and_git_dir(path,
- git_path("modules/%s", sub->name), 0);
+ submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
+ connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
+ strbuf_release(&sub_gitdir);
} else {
/* Is it already absorbed into the superprojects git dir? */
char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
@@ -2278,9 +2325,36 @@
goto cleanup;
}
strbuf_reset(buf);
- strbuf_git_path(buf, "%s/%s", "modules", sub->name);
+ submodule_name_to_gitdir(buf, the_repository, sub->name);
}
cleanup:
return ret;
}
+
+void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
+ const char *submodule_name)
+{
+ /*
+ * NEEDSWORK: The current way of mapping a submodule's name to
+ * its location in .git/modules/ has problems with some naming
+ * schemes. For example, if a submodule is named "foo" and
+ * another is named "foo/bar" (whether present in the same
+ * superproject commit or not - the problem will arise if both
+ * superproject commits have been checked out at any point in
+ * time), or if two submodule names only have different cases in
+ * a case-insensitive filesystem.
+ *
+ * There are several solutions, including encoding the path in
+ * some way, introducing a submodule.<name>.gitdir config in
+ * .git/config (not .gitmodules) that allows overriding what the
+ * gitdir of a submodule would be (and teach Git, upon noticing
+ * a clash, to automatically determine a non-clashing name and
+ * to write such a config), or introducing a
+ * submodule.<name>.gitdir config in .gitmodules that repo
+ * administrators can explicitly set. Nothing has been decided,
+ * so for now, just append the name at the end of the path.
+ */
+ strbuf_repo_git_path(buf, r, "modules/");
+ strbuf_addstr(buf, submodule_name);
+}
diff --git a/submodule.h b/submodule.h
index 84640c4..6bd2c99 100644
--- a/submodule.h
+++ b/submodule.h
@@ -37,7 +37,9 @@
enum submodule_update_type type;
const char *command;
};
-#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
+#define SUBMODULE_UPDATE_STRATEGY_INIT { \
+ .type = SM_UPDATE_UNSPECIFIED, \
+}
int is_gitmodules_unmerged(struct index_state *istate);
int is_writing_gitmodules_ok(void);
@@ -97,7 +99,15 @@
#define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2)
int bad_to_remove_submodule(const char *path, unsigned flags);
+/*
+ * Call add_submodule_odb() to add the submodule at the given path to a list.
+ * When register_all_submodule_odb_as_alternates() is called, the object stores
+ * of all submodules in that list will be added as alternates in
+ * the_repository.
+ */
int add_submodule_odb(const char *path);
+void add_submodule_odb_by_path(const char *path);
+int register_all_submodule_odb_as_alternates(void);
/*
* Checks if there are submodule changes in a..b. If a is the null OID,
@@ -125,6 +135,13 @@
int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
/*
+ * Given a submodule name, create a path to where the submodule's gitdir lives
+ * inside of the provided repository's 'modules' directory.
+ */
+void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
+ const char *submodule_name);
+
+/*
* Make sure that no submodule's git dir is nested in a sibling submodule's.
*/
int validate_submodule_git_dir(char *git_dir, const char *submodule_name);
diff --git a/t/.gitattributes b/t/.gitattributes
index dafa17c..9930e28 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,6 +1,5 @@
t[0-9][0-9][0-9][0-9]/* -whitespace
/chainlint/*.expect eol=lf
-/lib-diff/* eol=lf
/t0110/url-* binary
/t3206/* eol=lf
/t3900/*.txt eol=lf
diff --git a/t/README b/t/README
index 9e70122..29f7235 100644
--- a/t/README
+++ b/t/README
@@ -366,6 +366,13 @@
GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
test suite. Accept any boolean values that are accepted by git-config.
+GIT_TEST_PASSING_SANITIZE_LEAK=<boolean> when compiled with
+SANITIZE=leak will run only those tests that have whitelisted
+themselves as passing with no memory leaks. Tests can be whitelisted
+by setting "TEST_PASSES_SANITIZE_LEAK=true" before sourcing
+"test-lib.sh" itself at the top of the test script. This test mode is
+used by the "linux-leaks" CI target.
+
GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
default to n.
@@ -425,6 +432,10 @@
index to be written after every 'git repack' command, and overrides the
'core.multiPackIndex' setting to true.
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=<boolean>, when true, sets the
+'--bitmap' option on all invocations of 'git multi-pack-index write',
+and ignores pack-objects' '--write-bitmap-index'.
+
GIT_TEST_SIDEBAND_ALL=<boolean>, when true, overrides the
'uploadpack.allowSidebandAll' setting to true, and when false, forces
fetch-pack to not request sideband-all (even if the server advertises
@@ -448,6 +459,13 @@
to <n> and 'checkout.thresholdForParallelism' to 0, forcing the
execution of the parallel-checkout code.
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=<boolean>, when true, makes
+registering submodule ODBs as alternates a fatal action. Support for
+this environment variable can be removed once the migration to
+explicitly providing repositories when accessing submodule objects is
+complete or needs to be abandoned for whatever reason (in which case the
+migrated codepaths still retain their performance benefits).
+
Naming Tests
------------
@@ -753,7 +771,8 @@
--------------------
There are a handful helper functions defined in the test harness
-library for your script to use.
+library for your script to use. Some of them are listed below;
+see test-lib-functions.sh for the full list and their options.
- test_expect_success [<prereq>] <message> <script>
@@ -799,10 +818,12 @@
argument. This is primarily meant for use during the
development of a new test script.
- - debug <git-command>
+ - debug [options] <git-command>
Run a git command inside a debugger. This is primarily meant for
- use when debugging a failing test script.
+ use when debugging a failing test script. With '-t', use your
+ original TERM instead of test-lib.sh's "dumb", so that your
+ debugger interface has colors.
- test_done
@@ -989,7 +1010,7 @@
EOF
- - test_pause
+ - test_pause [options]
This command is useful for writing and debugging tests and must be
removed before submitting. It halts the execution of the test and
diff --git a/t/helper/test-bitmap.c b/t/helper/test-bitmap.c
index 134a1e9..ff35f59 100644
--- a/t/helper/test-bitmap.c
+++ b/t/helper/test-bitmap.c
@@ -7,6 +7,11 @@
return test_bitmap_commits(the_repository);
}
+static int bitmap_dump_hashes(void)
+{
+ return test_bitmap_hashes(the_repository);
+}
+
int cmd__bitmap(int argc, const char **argv)
{
setup_git_directory();
@@ -16,9 +21,12 @@
if (!strcmp(argv[1], "list-commits"))
return bitmap_list_commits();
+ if (!strcmp(argv[1], "dump-hashes"))
+ return bitmap_dump_hashes();
usage:
- usage("\ttest-tool bitmap list-commits");
+ usage("\ttest-tool bitmap list-commits\n"
+ "\ttest-tool bitmap dump-hashes");
return -1;
}
diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index cf0f2c7..9901061 100644
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -45,8 +45,10 @@
struct untracked_cache *uc;
struct strbuf base = STRBUF_INIT;
- /* Hack to avoid modifying the untracked cache when we read it */
- ignore_untracked_cache_config = 1;
+ /* Set core.untrackedCache=keep before setup_git_directory() */
+ xsetenv("GIT_CONFIG_COUNT", "1", 1);
+ xsetenv("GIT_CONFIG_KEY_0", "core.untrackedCache", 1);
+ xsetenv("GIT_CONFIG_VALUE_0", "keep", 1);
setup_git_directory();
if (read_cache() < 0)
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index c5cffaa..ebf68f7 100644
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -2,6 +2,12 @@
#include "cache.h"
#include "mergesort.h"
+static uint32_t minstd_rand(uint32_t *state)
+{
+ *state = (uint64_t)*state * 48271 % 2147483647;
+ return *state;
+}
+
struct line {
char *text;
struct line *next;
@@ -23,14 +29,12 @@
return strcmp(x->text, y->text);
}
-int cmd__mergesort(int argc, const char **argv)
+static int sort_stdin(void)
{
struct line *line, *p = NULL, *lines = NULL;
struct strbuf sb = STRBUF_INIT;
- for (;;) {
- if (strbuf_getwholeline(&sb, stdin, '\n'))
- break;
+ while (!strbuf_getline(&sb, stdin)) {
line = xmalloc(sizeof(struct line));
line->text = strbuf_detach(&sb, NULL);
if (p) {
@@ -46,8 +50,362 @@
lines = llist_mergesort(lines, get_next, set_next, compare_strings);
while (lines) {
- printf("%s", lines->text);
+ puts(lines->text);
lines = lines->next;
}
return 0;
}
+
+static void dist_sawtooth(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = i % m;
+}
+
+static void dist_rand(int *arr, int n, int m)
+{
+ int i;
+ uint32_t seed = 1;
+ for (i = 0; i < n; i++)
+ arr[i] = minstd_rand(&seed) % m;
+}
+
+static void dist_stagger(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = (i * m + i) % n;
+}
+
+static void dist_plateau(int *arr, int n, int m)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] = (i < m) ? i : m;
+}
+
+static void dist_shuffle(int *arr, int n, int m)
+{
+ int i, j, k;
+ uint32_t seed = 1;
+ for (i = j = 0, k = 1; i < n; i++)
+ arr[i] = minstd_rand(&seed) % m ? (j += 2) : (k += 2);
+}
+
+#define DIST(name) { #name, dist_##name }
+
+static struct dist {
+ const char *name;
+ void (*fn)(int *arr, int n, int m);
+} dist[] = {
+ DIST(sawtooth),
+ DIST(rand),
+ DIST(stagger),
+ DIST(plateau),
+ DIST(shuffle),
+};
+
+static const struct dist *get_dist_by_name(const char *name)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(dist); i++) {
+ if (!strcmp(dist[i].name, name))
+ return &dist[i];
+ }
+ return NULL;
+}
+
+static void mode_copy(int *arr, int n)
+{
+ /* nothing */
+}
+
+static void mode_reverse(int *arr, int n)
+{
+ int i, j;
+ for (i = 0, j = n - 1; i < j; i++, j--)
+ SWAP(arr[i], arr[j]);
+}
+
+static void mode_reverse_1st_half(int *arr, int n)
+{
+ mode_reverse(arr, n / 2);
+}
+
+static void mode_reverse_2nd_half(int *arr, int n)
+{
+ int half = n / 2;
+ mode_reverse(arr + half, n - half);
+}
+
+static int compare_ints(const void *av, const void *bv)
+{
+ const int *ap = av, *bp = bv;
+ int a = *ap, b = *bp;
+ return (a > b) - (a < b);
+}
+
+static void mode_sort(int *arr, int n)
+{
+ QSORT(arr, n, compare_ints);
+}
+
+static void mode_dither(int *arr, int n)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ arr[i] += i % 5;
+}
+
+static void unriffle(int *arr, int n, int *tmp)
+{
+ int i, j;
+ COPY_ARRAY(tmp, arr, n);
+ for (i = j = 0; i < n; i += 2)
+ arr[j++] = tmp[i];
+ for (i = 1; i < n; i += 2)
+ arr[j++] = tmp[i];
+}
+
+static void unriffle_recursively(int *arr, int n, int *tmp)
+{
+ if (n > 1) {
+ int half = n / 2;
+ unriffle(arr, n, tmp);
+ unriffle_recursively(arr, half, tmp);
+ unriffle_recursively(arr + half, n - half, tmp);
+ }
+}
+
+static void mode_unriffle(int *arr, int n)
+{
+ int *tmp;
+ ALLOC_ARRAY(tmp, n);
+ unriffle_recursively(arr, n, tmp);
+ free(tmp);
+}
+
+static unsigned int prev_pow2(unsigned int n)
+{
+ unsigned int pow2 = 1;
+ while (pow2 * 2 < n)
+ pow2 *= 2;
+ return pow2;
+}
+
+static void unriffle_recursively_skewed(int *arr, int n, int *tmp)
+{
+ if (n > 1) {
+ int pow2 = prev_pow2(n);
+ int rest = n - pow2;
+ unriffle(arr + pow2 - rest, rest * 2, tmp);
+ unriffle_recursively_skewed(arr, pow2, tmp);
+ unriffle_recursively_skewed(arr + pow2, rest, tmp);
+ }
+}
+
+static void mode_unriffle_skewed(int *arr, int n)
+{
+ int *tmp;
+ ALLOC_ARRAY(tmp, n);
+ unriffle_recursively_skewed(arr, n, tmp);
+ free(tmp);
+}
+
+#define MODE(name) { #name, mode_##name }
+
+static struct mode {
+ const char *name;
+ void (*fn)(int *arr, int n);
+} mode[] = {
+ MODE(copy),
+ MODE(reverse),
+ MODE(reverse_1st_half),
+ MODE(reverse_2nd_half),
+ MODE(sort),
+ MODE(dither),
+ MODE(unriffle),
+ MODE(unriffle_skewed),
+};
+
+static const struct mode *get_mode_by_name(const char *name)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(mode); i++) {
+ if (!strcmp(mode[i].name, name))
+ return &mode[i];
+ }
+ return NULL;
+}
+
+static int generate(int argc, const char **argv)
+{
+ const struct dist *dist = NULL;
+ const struct mode *mode = NULL;
+ int i, n, m, *arr;
+
+ if (argc != 4)
+ return 1;
+
+ dist = get_dist_by_name(argv[0]);
+ mode = get_mode_by_name(argv[1]);
+ n = strtol(argv[2], NULL, 10);
+ m = strtol(argv[3], NULL, 10);
+ if (!dist || !mode)
+ return 1;
+
+ ALLOC_ARRAY(arr, n);
+ dist->fn(arr, n, m);
+ mode->fn(arr, n);
+ for (i = 0; i < n; i++)
+ printf("%08x\n", arr[i]);
+ free(arr);
+ return 0;
+}
+
+static struct stats {
+ int get_next, set_next, compare;
+} stats;
+
+struct number {
+ int value, rank;
+ struct number *next;
+};
+
+static void *get_next_number(const void *a)
+{
+ stats.get_next++;
+ return ((const struct number *)a)->next;
+}
+
+static void set_next_number(void *a, void *b)
+{
+ stats.set_next++;
+ ((struct number *)a)->next = b;
+}
+
+static int compare_numbers(const void *av, const void *bv)
+{
+ const struct number *an = av, *bn = bv;
+ int a = an->value, b = bn->value;
+ stats.compare++;
+ return (a > b) - (a < b);
+}
+
+static void clear_numbers(struct number *list)
+{
+ while (list) {
+ struct number *next = list->next;
+ free(list);
+ list = next;
+ }
+}
+
+static int test(const struct dist *dist, const struct mode *mode, int n, int m)
+{
+ int *arr;
+ size_t i;
+ struct number *curr, *list, **tail;
+ int is_sorted = 1;
+ int is_stable = 1;
+ const char *verdict;
+ int result = -1;
+
+ ALLOC_ARRAY(arr, n);
+ dist->fn(arr, n, m);
+ mode->fn(arr, n);
+ for (i = 0, tail = &list; i < n; i++) {
+ curr = xmalloc(sizeof(*curr));
+ curr->value = arr[i];
+ curr->rank = i;
+ *tail = curr;
+ tail = &curr->next;
+ }
+ *tail = NULL;
+
+ stats.get_next = stats.set_next = stats.compare = 0;
+ list = llist_mergesort(list, get_next_number, set_next_number,
+ compare_numbers);
+
+ QSORT(arr, n, compare_ints);
+ for (i = 0, curr = list; i < n && curr; i++, curr = curr->next) {
+ if (arr[i] != curr->value)
+ is_sorted = 0;
+ if (curr->next && curr->value == curr->next->value &&
+ curr->rank >= curr->next->rank)
+ is_stable = 0;
+ }
+ if (i < n) {
+ verdict = "too short";
+ } else if (curr) {
+ verdict = "too long";
+ } else if (!is_sorted) {
+ verdict = "not sorted";
+ } else if (!is_stable) {
+ verdict = "unstable";
+ } else {
+ verdict = "OK";
+ result = 0;
+ }
+
+ printf("%-9s %-16s %8d %8d %8d %8d %8d %s\n",
+ dist->name, mode->name, n, m, stats.get_next, stats.set_next,
+ stats.compare, verdict);
+
+ clear_numbers(list);
+ free(arr);
+
+ return result;
+}
+
+/*
+ * A version of the qsort certification program from "Engineering a Sort
+ * Function" by Bentley and McIlroy, Software—Practice and Experience,
+ * Volume 23, Issue 11, 1249–1265 (November 1993).
+ */
+static int run_tests(int argc, const char **argv)
+{
+ const char *argv_default[] = { "100", "1023", "1024", "1025" };
+ if (!argc)
+ return run_tests(ARRAY_SIZE(argv_default), argv_default);
+ printf("%-9s %-16s %8s %8s %8s %8s %8s %s\n",
+ "distribut", "mode", "n", "m", "get_next", "set_next",
+ "compare", "verdict");
+ while (argc--) {
+ int i, j, m, n = strtol(*argv++, NULL, 10);
+ for (i = 0; i < ARRAY_SIZE(dist); i++) {
+ for (j = 0; j < ARRAY_SIZE(mode); j++) {
+ for (m = 1; m < 2 * n; m *= 2) {
+ if (test(&dist[i], &mode[j], n, m))
+ return 1;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+int cmd__mergesort(int argc, const char **argv)
+{
+ int i;
+ const char *sep;
+
+ if (argc == 6 && !strcmp(argv[1], "generate"))
+ return generate(argc - 2, argv + 2);
+ if (argc == 2 && !strcmp(argv[1], "sort"))
+ return sort_stdin();
+ if (argc > 1 && !strcmp(argv[1], "test"))
+ return run_tests(argc - 2, argv + 2);
+ fprintf(stderr, "usage: test-tool mergesort generate <distribution> <mode> <n> <m>\n");
+ fprintf(stderr, " or: test-tool mergesort sort\n");
+ fprintf(stderr, " or: test-tool mergesort test [<n>...]\n");
+ fprintf(stderr, "\n");
+ for (i = 0, sep = "distributions: "; i < ARRAY_SIZE(dist); i++, sep = ", ")
+ fprintf(stderr, "%s%s", sep, dist[i].name);
+ fprintf(stderr, "\n");
+ for (i = 0, sep = "modes: "; i < ARRAY_SIZE(mode); i++, sep = ", ")
+ fprintf(stderr, "%s%s", sep, mode[i].name);
+ fprintf(stderr, "\n");
+ return 129;
+}
diff --git a/t/helper/test-oid-array.c b/t/helper/test-oid-array.c
index b16cd0b..d1324d0 100644
--- a/t/helper/test-oid-array.c
+++ b/t/helper/test-oid-array.c
@@ -35,5 +35,9 @@
else
die("unknown command: %s", line.buf);
}
+
+ strbuf_release(&line);
+ oid_array_clear(&array);
+
return 0;
}
diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
index 180ee28..d48a409 100644
--- a/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@ -45,5 +45,8 @@
die("unknown command: %s", line.buf);
}
}
+
+ strbuf_release(&line);
+
return 0;
}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 2051ce5..48d3cf6 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -14,7 +14,6 @@
static char *string = NULL;
static char *file = NULL;
static int ambiguous;
-static struct string_list list = STRING_LIST_INIT_NODUP;
static struct {
int called;
@@ -107,6 +106,8 @@
NULL
};
struct string_list expect = STRING_LIST_INIT_NODUP;
+ struct string_list list = STRING_LIST_INIT_NODUP;
+
struct option options[] = {
OPT_BOOL(0, "yes", &boolean, "get a boolean"),
OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -134,7 +135,6 @@
OPT_NOOP_NOARG(0, "obsolete"),
OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
OPT_GROUP("Magic arguments"),
- OPT_ARGUMENT("quux", NULL, "means --quux"),
OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
number_callback),
{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
@@ -186,5 +186,9 @@
for (i = 0; i < argc; i++)
show(&expect, &ret, "arg %02d: %s", i, argv[i]);
+ expect.strdup_strings = 1;
+ string_list_clear(&expect, 0);
+ string_list_clear(&list, 0);
+
return ret;
}
diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c
index f402844..133b5e6 100644
--- a/t/helper/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
@@ -46,5 +46,7 @@
}
}
+ clear_prio_queue(&pq);
+
return 0;
}
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 7c2eb11..9d6fa7a 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -3,6 +3,7 @@
#include "midx.h"
#include "repository.h"
#include "object-store.h"
+#include "pack-bitmap.h"
static int read_midx_file(const char *object_dir, int show_objects)
{
@@ -60,12 +61,52 @@
return 0;
}
+static int read_midx_checksum(const char *object_dir)
+{
+ struct multi_pack_index *m;
+
+ setup_git_directory();
+ m = load_multi_pack_index(object_dir, 1);
+ if (!m)
+ return 1;
+ printf("%s\n", hash_to_hex(get_midx_checksum(m)));
+ return 0;
+}
+
+static int read_midx_preferred_pack(const char *object_dir)
+{
+ struct multi_pack_index *midx = NULL;
+ struct bitmap_index *bitmap = NULL;
+
+ setup_git_directory();
+
+ midx = load_multi_pack_index(object_dir, 1);
+ if (!midx)
+ return 1;
+
+ bitmap = prepare_bitmap_git(the_repository);
+ if (!bitmap)
+ return 1;
+ if (!bitmap_is_midx(bitmap)) {
+ free_bitmap_index(bitmap);
+ return 1;
+ }
+
+ printf("%s\n", midx->pack_names[midx_preferred_pack(bitmap)]);
+ free_bitmap_index(bitmap);
+ return 0;
+}
+
int cmd__read_midx(int argc, const char **argv)
{
if (!(argc == 2 || argc == 3))
- usage("read-midx [--show-objects] <object-dir>");
+ usage("read-midx [--show-objects|--checksum|--preferred-pack] <object-dir>");
if (!strcmp(argv[1], "--show-objects"))
return read_midx_file(argv[2], 1);
+ else if (!strcmp(argv[1], "--checksum"))
+ return read_midx_checksum(argv[2]);
+ else if (!strcmp(argv[1], "--preferred-pack"))
+ return read_midx_preferred_pack(argv[2]);
return read_midx_file(argv[1], 0);
}
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 7ae03dc..3c4fb86 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -60,8 +60,10 @@
int next;
int quiet, immediate, verbose, verbose_log, trace, write_junit_xml;
};
-#define TESTSUITE_INIT \
- { STRING_LIST_INIT_DUP, STRING_LIST_INIT_DUP, -1, 0, 0, 0, 0, 0, 0 }
+#define TESTSUITE_INIT { \
+ .tests = STRING_LIST_INIT_DUP, \
+ .failed = STRING_LIST_INIT_DUP, \
+}
static int next_test(struct child_process *cp, struct strbuf *err, void *cb,
void **task_cb)
@@ -142,9 +144,6 @@
OPT_END()
};
- memset(&suite, 0, sizeof(suite));
- suite.tests.strdup_strings = suite.failed.strdup_strings = 1;
-
argc = parse_options(argc, argv, NULL, options,
testsuite_usage, PARSE_OPT_STOP_AT_NON_OPTION);
diff --git a/t/helper/test-serve-v2.c b/t/helper/test-serve-v2.c
index aee35e5..28e905a 100644
--- a/t/helper/test-serve-v2.c
+++ b/t/helper/test-serve-v2.c
@@ -10,12 +10,12 @@
int cmd__serve_v2(int argc, const char **argv)
{
- struct serve_options opts = SERVE_OPTIONS_INIT;
-
+ int stateless_rpc = 0;
+ int advertise_capabilities = 0;
struct option options[] = {
- OPT_BOOL(0, "stateless-rpc", &opts.stateless_rpc,
+ OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
N_("quit after a single request/response exchange")),
- OPT_BOOL(0, "advertise-capabilities", &opts.advertise_capabilities,
+ OPT_BOOL(0, "advertise-capabilities", &advertise_capabilities,
N_("exit immediately after advertising capabilities")),
OPT_END()
};
@@ -25,7 +25,11 @@
argc = parse_options(argc, argv, prefix, options, serve_usage,
PARSE_OPT_KEEP_DASHDASH |
PARSE_OPT_KEEP_UNKNOWN);
- serve(&opts);
+
+ if (advertise_capabilities)
+ protocol_v2_advertise_capabilities();
+ else
+ protocol_v2_serve_loop(stateless_rpc);
return 0;
}
diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c
index 42040ef..28365ff 100644
--- a/t/helper/test-simple-ipc.c
+++ b/t/helper/test-simple-ipc.c
@@ -9,6 +9,7 @@
#include "parse-options.h"
#include "thread-utils.h"
#include "strvec.h"
+#include "run-command.h"
#ifndef SUPPORTS_SIMPLE_IPC
int cmd__simple_ipc(int argc, const char **argv)
@@ -112,7 +113,7 @@
/*
* The client sent a command followed by a (possibly very) large buffer.
*/
-static int app__sendbytes_command(const char *received,
+static int app__sendbytes_command(const char *received, size_t received_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data)
{
@@ -123,6 +124,13 @@
int errs = 0;
int ret;
+ /*
+ * The test is setup to send:
+ * "sendbytes" SP <n * char>
+ */
+ if (received_len < strlen("sendbytes "))
+ BUG("received_len is short in app__sendbytes_command");
+
if (skip_prefix(received, "sendbytes ", &p))
len_ballast = strlen(p);
@@ -160,7 +168,7 @@
* by this application.
*/
static int test_app_cb(void *application_data,
- const char *command,
+ const char *command, size_t command_len,
ipc_server_reply_cb *reply_cb,
struct ipc_server_reply_data *reply_data)
{
@@ -173,7 +181,7 @@
if (application_data != (void*)&my_app_data)
BUG("application_cb: application_data pointer wrong");
- if (!strcmp(command, "quit")) {
+ if (command_len == 4 && !strncmp(command, "quit", 4)) {
/*
* The client sent a "quit" command. This is an async
* request for the server to shutdown.
@@ -193,22 +201,23 @@
return SIMPLE_IPC_QUIT;
}
- if (!strcmp(command, "ping")) {
+ if (command_len == 4 && !strncmp(command, "ping", 4)) {
const char *answer = "pong";
return reply_cb(reply_data, answer, strlen(answer));
}
- if (!strcmp(command, "big"))
+ if (command_len == 3 && !strncmp(command, "big", 3))
return app__big_command(reply_cb, reply_data);
- if (!strcmp(command, "chunk"))
+ if (command_len == 5 && !strncmp(command, "chunk", 5))
return app__chunk_command(reply_cb, reply_data);
- if (!strcmp(command, "slow"))
+ if (command_len == 4 && !strncmp(command, "slow", 4))
return app__slow_command(reply_cb, reply_data);
- if (starts_with(command, "sendbytes "))
- return app__sendbytes_command(command, reply_cb, reply_data);
+ if (command_len >= 10 && starts_with(command, "sendbytes "))
+ return app__sendbytes_command(command, command_len,
+ reply_cb, reply_data);
return app__unhandled_command(command, reply_cb, reply_data);
}
@@ -259,183 +268,69 @@
*/
ret = ipc_server_run(cl_args.path, &opts, test_app_cb, (void*)&my_app_data);
if (ret == -2)
- error(_("socket/pipe already in use: '%s'"), cl_args.path);
+ error("socket/pipe already in use: '%s'", cl_args.path);
else if (ret == -1)
- error_errno(_("could not start server on: '%s'"), cl_args.path);
+ error_errno("could not start server on: '%s'", cl_args.path);
return ret;
}
-#ifndef GIT_WINDOWS_NATIVE
-/*
- * This is adapted from `daemonize()`. Use `fork()` to directly create and
- * run the daemon in a child process.
- */
-static int spawn_server(pid_t *pid)
+static start_bg_wait_cb bg_wait_cb;
+
+static int bg_wait_cb(const struct child_process *cp, void *cb_data)
{
- struct ipc_server_opts opts = {
- .nr_threads = cl_args.nr_threads,
- };
+ int s = ipc_get_active_state(cl_args.path);
- *pid = fork();
+ switch (s) {
+ case IPC_STATE__LISTENING:
+ /* child is "ready" */
+ return 0;
- switch (*pid) {
- case 0:
- if (setsid() == -1)
- error_errno(_("setsid failed"));
- close(0);
- close(1);
- close(2);
- sanitize_stdfds();
-
- return ipc_server_run(cl_args.path, &opts, test_app_cb,
- (void*)&my_app_data);
-
- case -1:
- return error_errno(_("could not spawn daemon in the background"));
+ case IPC_STATE__NOT_LISTENING:
+ case IPC_STATE__PATH_NOT_FOUND:
+ /* give child more time */
+ return 1;
default:
- return 0;
- }
-}
-#else
-/*
- * Conceptually like `daemonize()` but different because Windows does not
- * have `fork(2)`. Spawn a normal Windows child process but without the
- * limitations of `start_command()` and `finish_command()`.
- */
-static int spawn_server(pid_t *pid)
-{
- char test_tool_exe[MAX_PATH];
- struct strvec args = STRVEC_INIT;
- int in, out;
-
- GetModuleFileNameA(NULL, test_tool_exe, MAX_PATH);
-
- in = open("/dev/null", O_RDONLY);
- out = open("/dev/null", O_WRONLY);
-
- strvec_push(&args, test_tool_exe);
- strvec_push(&args, "simple-ipc");
- strvec_push(&args, "run-daemon");
- strvec_pushf(&args, "--name=%s", cl_args.path);
- strvec_pushf(&args, "--threads=%d", cl_args.nr_threads);
-
- *pid = mingw_spawnvpe(args.v[0], args.v, NULL, NULL, in, out, out);
- close(in);
- close(out);
-
- strvec_clear(&args);
-
- if (*pid < 0)
- return error(_("could not spawn daemon in the background"));
-
- return 0;
-}
-#endif
-
-/*
- * This is adapted from `wait_or_whine()`. Watch the child process and
- * let it get started and begin listening for requests on the socket
- * before reporting our success.
- */
-static int wait_for_server_startup(pid_t pid_child)
-{
- int status;
- pid_t pid_seen;
- enum ipc_active_state s;
- time_t time_limit, now;
-
- time(&time_limit);
- time_limit += cl_args.max_wait_sec;
-
- for (;;) {
- pid_seen = waitpid(pid_child, &status, WNOHANG);
-
- if (pid_seen == -1)
- return error_errno(_("waitpid failed"));
-
- else if (pid_seen == 0) {
- /*
- * The child is still running (this should be
- * the normal case). Try to connect to it on
- * the socket and see if it is ready for
- * business.
- *
- * If there is another daemon already running,
- * our child will fail to start (possibly
- * after a timeout on the lock), but we don't
- * care (who responds) if the socket is live.
- */
- s = ipc_get_active_state(cl_args.path);
- if (s == IPC_STATE__LISTENING)
- return 0;
-
- time(&now);
- if (now > time_limit)
- return error(_("daemon not online yet"));
-
- continue;
- }
-
- else if (pid_seen == pid_child) {
- /*
- * The new child daemon process shutdown while
- * it was starting up, so it is not listening
- * on the socket.
- *
- * Try to ping the socket in the odd chance
- * that another daemon started (or was already
- * running) while our child was starting.
- *
- * Again, we don't care who services the socket.
- */
- s = ipc_get_active_state(cl_args.path);
- if (s == IPC_STATE__LISTENING)
- return 0;
-
- /*
- * We don't care about the WEXITSTATUS() nor
- * any of the WIF*(status) values because
- * `cmd__simple_ipc()` does the `!!result`
- * trick on all function return values.
- *
- * So it is sufficient to just report the
- * early shutdown as an error.
- */
- return error(_("daemon failed to start"));
- }
-
- else
- return error(_("waitpid is confused"));
+ case IPC_STATE__INVALID_PATH:
+ case IPC_STATE__OTHER_ERROR:
+ /* all the time in world won't help */
+ return -1;
}
}
-/*
- * This process will start a simple-ipc server in a background process and
- * wait for it to become ready. This is like `daemonize()` but gives us
- * more control and better error reporting (and makes it easier to write
- * unit tests).
- */
static int daemon__start_server(void)
{
- pid_t pid_child;
- int ret;
+ struct child_process cp = CHILD_PROCESS_INIT;
+ enum start_bg_result sbgr;
- /*
- * Run the actual daemon in a background process.
- */
- ret = spawn_server(&pid_child);
- if (pid_child <= 0)
- return ret;
+ strvec_push(&cp.args, "test-tool");
+ strvec_push(&cp.args, "simple-ipc");
+ strvec_push(&cp.args, "run-daemon");
+ strvec_pushf(&cp.args, "--name=%s", cl_args.path);
+ strvec_pushf(&cp.args, "--threads=%d", cl_args.nr_threads);
- /*
- * Let the parent wait for the child process to get started
- * and begin listening for requests on the socket.
- */
- ret = wait_for_server_startup(pid_child);
+ cp.no_stdin = 1;
+ cp.no_stdout = 1;
+ cp.no_stderr = 1;
- return ret;
+ sbgr = start_bg_command(&cp, bg_wait_cb, NULL, cl_args.max_wait_sec);
+
+ switch (sbgr) {
+ case SBGR_READY:
+ return 0;
+
+ default:
+ case SBGR_ERROR:
+ case SBGR_CB_ERROR:
+ return error("daemon failed to start");
+
+ case SBGR_TIMEOUT:
+ return error("daemon not online yet");
+
+ case SBGR_DIED:
+ return error("daemon terminated");
+ }
}
/*
@@ -488,7 +383,9 @@
options.wait_if_busy = 1;
options.wait_if_not_found = 0;
- if (!ipc_client_send_command(cl_args.path, &options, command, &buf)) {
+ if (!ipc_client_send_command(cl_args.path, &options,
+ command, strlen(command),
+ &buf)) {
if (buf.len) {
printf("%s\n", buf.buf);
fflush(stdout);
@@ -538,7 +435,7 @@
time(&now);
if (now > time_limit)
- return error(_("daemon has not shutdown yet"));
+ return error("daemon has not shutdown yet");
}
}
@@ -556,7 +453,9 @@
strbuf_addstr(&buf_send, "sendbytes ");
strbuf_addchars(&buf_send, byte, bytecount);
- if (!ipc_client_send_command(path, options, buf_send.buf, &buf_resp)) {
+ if (!ipc_client_send_command(path, options,
+ buf_send.buf, buf_send.len,
+ &buf_resp)) {
strbuf_rtrim(&buf_resp);
printf("sent:%c%08d %s\n", byte, bytecount, buf_resp.buf);
fflush(stdout);
diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c
index e3f11ff..dc1c14b 100644
--- a/t/helper/test-submodule-nested-repo-config.c
+++ b/t/helper/test-submodule-nested-repo-config.c
@@ -11,15 +11,13 @@
int cmd__submodule_nested_repo_config(int argc, const char **argv)
{
struct repository subrepo;
- const struct submodule *sub;
if (argc < 3)
die_usage(argv, "Wrong number of arguments.");
setup_git_directory();
- sub = submodule_from_path(the_repository, null_oid(), argv[1]);
- if (repo_submodule_init(&subrepo, the_repository, sub)) {
+ if (repo_submodule_init(&subrepo, the_repository, argv[1], null_oid())) {
die_usage(argv, "Submodule not found.");
}
diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh
index fe3f98b..21d0392 100644
--- a/t/lib-bitmap.sh
+++ b/t/lib-bitmap.sh
@@ -1,3 +1,6 @@
+# Helpers for scripts testing bitmap functionality; see t5310 for
+# example usage.
+
# Compare a file containing rev-list bitmap traversal output to its non-bitmap
# counterpart. You can't just use test_cmp for this, because the two produce
# subtly different output:
@@ -24,3 +27,240 @@
test_cmp "$1.normalized" "$2.normalized" &&
rm -f "$1.normalized" "$2.normalized"
}
+
+# To ensure the logic for "maximal commits" is exercised, make
+# the repository a bit more complicated.
+#
+# other second
+# * *
+# (99 commits) (99 commits)
+# * *
+# |\ /|
+# | * octo-other octo-second * |
+# |/|\_________ ____________/|\|
+# | \ \/ __________/ |
+# | | ________/\ / |
+# * |/ * merge-right *
+# | _|__________/ \____________ |
+# |/ | \|
+# (l1) * * merge-left * (r1)
+# | / \________________________ |
+# |/ \|
+# (l2) * * (r2)
+# \___________________________ |
+# \|
+# * (base)
+#
+# We only push bits down the first-parent history, which
+# makes some of these commits unimportant!
+#
+# The important part for the maximal commit algorithm is how
+# the bitmasks are extended. Assuming starting bit positions
+# for second (bit 0) and other (bit 1), the bitmasks at the
+# end should be:
+#
+# second: 1 (maximal, selected)
+# other: 01 (maximal, selected)
+# (base): 11 (maximal)
+#
+# This complicated history was important for a previous
+# version of the walk that guarantees never walking a
+# commit multiple times. That goal might be important
+# again, so preserve this complicated case. For now, this
+# test will guarantee that the bitmaps are computed
+# correctly, even with the repeat calculations.
+setup_bitmap_history() {
+ test_expect_success 'setup repo with moderate-sized history' '
+ test_commit_bulk --id=file 10 &&
+ git branch -M second &&
+ git checkout -b other HEAD~5 &&
+ test_commit_bulk --id=side 10 &&
+
+ # add complicated history setup, including merges and
+ # ambiguous merge-bases
+
+ git checkout -b merge-left other~2 &&
+ git merge second~2 -m "merge-left" &&
+
+ git checkout -b merge-right second~1 &&
+ git merge other~1 -m "merge-right" &&
+
+ git checkout -b octo-second second &&
+ git merge merge-left merge-right -m "octopus-second" &&
+
+ git checkout -b octo-other other &&
+ git merge merge-left merge-right -m "octopus-other" &&
+
+ git checkout other &&
+ git merge octo-other -m "pull octopus" &&
+
+ git checkout second &&
+ git merge octo-second -m "pull octopus" &&
+
+ # Remove these branches so they are not selected
+ # as bitmap tips
+ git branch -D merge-left &&
+ git branch -D merge-right &&
+ git branch -D octo-other &&
+ git branch -D octo-second &&
+
+ # add padding to make these merges less interesting
+ # and avoid having them selected for bitmaps
+ test_commit_bulk --id=file 100 &&
+ git checkout other &&
+ test_commit_bulk --id=side 100 &&
+ git checkout second &&
+
+ bitmaptip=$(git rev-parse second) &&
+ blob=$(echo tagged-blob | git hash-object -w --stdin) &&
+ git tag tagged-blob $blob
+ '
+}
+
+rev_list_tests_head () {
+ test_expect_success "counting commits via bitmap ($state, $branch)" '
+ git rev-list --count $branch >expect &&
+ git rev-list --use-bitmap-index --count $branch >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "counting partial commits via bitmap ($state, $branch)" '
+ git rev-list --count $branch~5..$branch >expect &&
+ git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "counting commits with limit ($state, $branch)" '
+ git rev-list --count -n 1 $branch >expect &&
+ git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "counting non-linear history ($state, $branch)" '
+ git rev-list --count other...second >expect &&
+ git rev-list --use-bitmap-index --count other...second >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "counting commits with limiting ($state, $branch)" '
+ git rev-list --count $branch -- 1.t >expect &&
+ git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "counting objects via bitmap ($state, $branch)" '
+ git rev-list --count --objects $branch >expect &&
+ git rev-list --use-bitmap-index --count --objects $branch >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "enumerate commits ($state, $branch)" '
+ git rev-list --use-bitmap-index $branch >actual &&
+ git rev-list $branch >expect &&
+ test_bitmap_traversal --no-confirm-bitmaps expect actual
+ '
+
+ test_expect_success "enumerate --objects ($state, $branch)" '
+ git rev-list --objects --use-bitmap-index $branch >actual &&
+ git rev-list --objects $branch >expect &&
+ test_bitmap_traversal expect actual
+ '
+
+ test_expect_success "bitmap --objects handles non-commit objects ($state, $branch)" '
+ git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+ grep $blob actual
+ '
+}
+
+rev_list_tests () {
+ state=$1
+
+ for branch in "second" "other"
+ do
+ rev_list_tests_head
+ done
+}
+
+basic_bitmap_tests () {
+ tip="$1"
+ test_expect_success 'rev-list --test-bitmap verifies bitmaps' "
+ git rev-list --test-bitmap "${tip:-HEAD}"
+ "
+
+ rev_list_tests 'full bitmap'
+
+ test_expect_success 'clone from bitmapped repository' '
+ rm -fr clone.git &&
+ git clone --no-local --bare . clone.git &&
+ git rev-parse HEAD >expect &&
+ git --git-dir=clone.git rev-parse HEAD >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success 'partial clone from bitmapped repository' '
+ test_config uploadpack.allowfilter true &&
+ rm -fr partial-clone.git &&
+ git clone --no-local --bare --filter=blob:none . partial-clone.git &&
+ (
+ cd partial-clone.git &&
+ pack=$(echo objects/pack/*.pack) &&
+ git verify-pack -v "$pack" >have &&
+ awk "/blob/ { print \$1 }" <have >blobs &&
+ # we expect this single blob because of the direct ref
+ git rev-parse refs/tags/tagged-blob >expect &&
+ test_cmp expect blobs
+ )
+ '
+
+ test_expect_success 'setup further non-bitmapped commits' '
+ test_commit_bulk --id=further 10
+ '
+
+ rev_list_tests 'partial bitmap'
+
+ test_expect_success 'fetch (partial bitmap)' '
+ git --git-dir=clone.git fetch origin second:second &&
+ git rev-parse HEAD >expect &&
+ git --git-dir=clone.git rev-parse HEAD >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success 'enumerating progress counts pack-reused objects' '
+ count=$(git rev-list --objects --all --count) &&
+ git repack -adb &&
+
+ # check first with only reused objects; confirm that our
+ # progress showed the right number, and also that we did
+ # pack-reuse as expected. Check only the final "done"
+ # line of the meter (there may be an arbitrary number of
+ # intermediate lines ending with CR).
+ GIT_PROGRESS_DELAY=0 \
+ git pack-objects --all --stdout --progress \
+ </dev/null >/dev/null 2>stderr &&
+ grep "Enumerating objects: $count, done" stderr &&
+ grep "pack-reused $count" stderr &&
+
+ # now the same but with one non-reused object
+ git commit --allow-empty -m "an extra commit object" &&
+ GIT_PROGRESS_DELAY=0 \
+ git pack-objects --all --stdout --progress \
+ </dev/null >/dev/null 2>stderr &&
+ grep "Enumerating objects: $((count+1)), done" stderr &&
+ grep "pack-reused $count" stderr
+ '
+}
+
+# have_delta <obj> <expected_base>
+#
+# Note that because this relies on cat-file, it might find _any_ copy of an
+# object in the repository. The caller is responsible for making sure
+# there's only one (e.g., via "repack -ad", or having just fetched a copy).
+have_delta () {
+ echo $2 >expect &&
+ echo $1 | git cat-file --batch-check="%(deltabase)" >actual &&
+ test_cmp expect actual
+}
+
+midx_checksum () {
+ test-tool read-midx --checksum "$1"
+}
diff --git a/t/lib-diff-data.sh b/t/lib-diff-data.sh
new file mode 100644
index 0000000..c64ec18
--- /dev/null
+++ b/t/lib-diff-data.sh
@@ -0,0 +1,22 @@
+COPYING_test_data () {
+ cat <<\EOF
+
+ Note that the only valid version of the GPL as far as this project
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ a good idea, I also ask that people involved with the project make
+ their preferences known. In particular, if you trust me to make that
+ decision, you might note so in your copyright message, ie something
+ like
+
+ This file is licensed under the GPL v2, or a later version
+ at the discretion of Linus.
+
+ might avoid issues. But we can also just decide to synchronize and
+ contact all copyright holders on record if/when the occasion arises.
+
+ Linus Torvalds
+EOF
+}
diff --git a/t/lib-diff.sh b/t/lib-diff.sh
index 2de880f..c4606bd 100644
--- a/t/lib-diff.sh
+++ b/t/lib-diff.sh
@@ -1,3 +1,5 @@
+. "$TEST_DIRECTORY"/lib-diff-data.sh
+
:
sanitize_diff_raw='/^:/s/ '"\($OID_REGEX\)"' '"\($OID_REGEX\)"' \([A-Z]\)[0-9]* / \1 \2 \3# /'
diff --git a/t/lib-diff/COPYING b/t/lib-diff/COPYING
deleted file mode 100644
index 6ff87c4..0000000
--- a/t/lib-diff/COPYING
+++ /dev/null
@@ -1,361 +0,0 @@
-
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
-
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
-
- This file is licensed under the GPL v2, or a later version
- at the discretion of Linus.
-
- might avoid issues. But we can also just decide to synchronize and
- contact all copyright holders on record if/when the occasion arises.
-
- Linus Torvalds
-
-----------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/t/lib-diff/README b/t/lib-diff/README
deleted file mode 100644
index 548142c..0000000
--- a/t/lib-diff/README
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////
-
- GIT - the stupid content tracker
-
-////////////////////////////////////////////////////////////////
-
-"git" can mean anything, depending on your mood.
-
- - random three-letter combination that is pronounceable, and not
- actually used by any common UNIX command. The fact that it is a
- mispronunciation of "get" may or may not be relevant.
- - stupid. contemptible and despicable. simple. Take your pick from the
- dictionary of slang.
- - "global information tracker": you're in a good mood, and it actually
- works for you. Angels sing, and a light suddenly fills the room.
- - "goddamn idiotic truckload of sh*t": when it breaks
-
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-Git is an Open Source project covered by the GNU General Public License.
-It was originally written by Linus Torvalds with help of a group of
-hackers around the net. It is currently maintained by Junio C Hamano.
-
-Please read the file INSTALL for installation instructions.
-See Documentation/tutorial.txt to get started, then see
-Documentation/everyday.txt for a useful minimum set of commands,
-and "man git-commandname" for documentation of each command.
-CVS users may also want to read Documentation/cvs-migration.txt.
-
-Many Git online resources are accessible from http://git.or.cz/
-including full documentation and Git related tools.
-
-The user discussion and development of Git take place on the Git
-mailing list -- everyone is welcome to post bug reports, feature
-requests, comments and patches to git@vger.kernel.org. To subscribe
-to the list, send an email with just "subscribe git" in the body to
-majordomo@vger.kernel.org. The mailing list archives are available at
-http://marc.theaimsgroup.com/?l=git and other archival sites.
-
-The messages titled "A note from the maintainer", "What's in
-git.git (stable)" and "What's cooking in git.git (topics)" and
-the discussion following them on the mailing list give a good
-reference for project status, development direction and
-remaining tasks.
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 9fc5241..a3f285f 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -87,6 +87,41 @@
echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
'
+GPGSSH_KEY_PRIMARY="${GNUPGHOME}/ed25519_ssh_signing_key"
+GPGSSH_KEY_SECONDARY="${GNUPGHOME}/rsa_2048_ssh_signing_key"
+GPGSSH_KEY_UNTRUSTED="${GNUPGHOME}/untrusted_ssh_signing_key"
+GPGSSH_KEY_WITH_PASSPHRASE="${GNUPGHOME}/protected_ssh_signing_key"
+GPGSSH_KEY_PASSPHRASE="super_secret"
+GPGSSH_ALLOWED_SIGNERS="${GNUPGHOME}/ssh.all_valid.allowedSignersFile"
+
+GPGSSH_GOOD_SIGNATURE_TRUSTED='Good "git" signature for'
+GPGSSH_GOOD_SIGNATURE_UNTRUSTED='Good "git" signature with'
+GPGSSH_KEY_NOT_TRUSTED="No principal matched"
+GPGSSH_BAD_SIGNATURE="Signature verification failed"
+
+test_lazy_prereq GPGSSH '
+ ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
+ test $? != 127 || exit 1
+ echo $ssh_version | grep -q "find-principals:missing signature file"
+ test $? = 0 || exit 1;
+
+ # some broken versions of ssh-keygen segfault on find-principals;
+ # avoid testing with them.
+ ssh-keygen -Y find-principals -f /dev/null -s /dev/null
+ test $? = 139 && exit 1
+
+ mkdir -p "${GNUPGHOME}" &&
+ chmod 0700 "${GNUPGHOME}" &&
+ (setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
+ ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
+ echo "\"principal with number 1\" $(cat "${GPGSSH_KEY_PRIMARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
+ ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
+ echo "\"principal with number 2\" $(cat "${GPGSSH_KEY_SECONDARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
+ ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
+ echo "\"principal with number 3\" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
+ ssh-keygen -t ed25519 -N "" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null
+'
+
sanitize_pgp() {
perl -ne '
/^-----END PGP/ and $in_pgp = 0;
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index d2edfa4..7828919 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -131,6 +131,7 @@
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
install_script incomplete-length-upload-pack-v2-http.sh
install_script incomplete-body-upload-pack-v2-http.sh
+ install_script error-no-report.sh
install_script broken-smart-http.sh
install_script error-smart-http.sh
install_script error.sh
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index afa91e3..497b9b9 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -81,8 +81,6 @@
PassEnv GIT_CONFIG_NOSYSTEM
PassEnv GIT_TEST_SIDEBAND_ALL
-SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
-
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/
@@ -117,8 +115,14 @@
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
SetEnv GIT_HTTP_EXPORT_ALL
</LocationMatch>
+<LocationMatch /smart_v0/>
+ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+ SetEnv GIT_HTTP_EXPORT_ALL
+ SetEnv GIT_PROTOCOL
+</LocationMatch>
ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
+ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
@@ -134,6 +138,9 @@
<Files incomplete-body-upload-pack-v2-http.sh>
Options ExecCGI
</Files>
+<Files error-no-report.sh>
+ Options ExecCGI
+</Files>
<Files broken-smart-http.sh>
Options ExecCGI
</Files>
diff --git a/t/lib-httpd/error-no-report.sh b/t/lib-httpd/error-no-report.sh
new file mode 100644
index 0000000..39ff75b
--- /dev/null
+++ b/t/lib-httpd/error-no-report.sh
@@ -0,0 +1,6 @@
+echo "Content-Type: application/x-git-receive-pack-result"
+echo
+printf '0013\001000eunpack ok\n'
+printf '0015\002skipping report\n'
+printf '0009\0010000'
+printf '0000'
diff --git a/t/lib-midx.sh b/t/lib-midx.sh
new file mode 100644
index 0000000..1261994
--- /dev/null
+++ b/t/lib-midx.sh
@@ -0,0 +1,8 @@
+# test_midx_consistent <objdir>
+test_midx_consistent () {
+ ls $1/pack/pack-*.idx | xargs -n 1 basename | sort >expect &&
+ test-tool read-midx $1 | grep ^pack-.*\.idx$ | sort >actual &&
+
+ test_cmp expect actual &&
+ git multi-pack-index --object-dir=$1 verify
+}
diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
new file mode 100644
index 0000000..56ee927
--- /dev/null
+++ b/t/lib-subtest.sh
@@ -0,0 +1,95 @@
+write_sub_test_lib_test () {
+ name="$1" # stdin is the body of the test code
+ mkdir "$name" &&
+ write_script "$name/$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
+ test_description='A test of test-lib.sh itself'
+
+ # Point to the t/test-lib.sh, which isn't in ../ as usual
+ . "\$TEST_DIRECTORY"/test-lib.sh
+ EOF
+ cat >>"$name/$name.sh"
+}
+
+_run_sub_test_lib_test_common () {
+ cmp_op="$1" want_code="$2" name="$3" # stdin is the body of the test code
+ shift 3
+
+ # intercept pseudo-options at the front of the argument list that we
+ # will not pass to child script
+ skip=
+ while test $# -gt 0
+ do
+ case "$1" in
+ --skip=*)
+ skip=${1#--*=}
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ done
+
+ (
+ cd "$name" &&
+
+ # Pretend we're not running under a test harness, whether we
+ # are or not. The test-lib output depends on the setting of
+ # this variable, so we need a stable setting under which to run
+ # the sub-test.
+ sane_unset HARNESS_ACTIVE &&
+
+ export TEST_DIRECTORY &&
+ # The child test re-sources GIT-BUILD-OPTIONS and may thus
+ # override the test output directory. We thus pass it as an
+ # explicit override to the child.
+ TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
+ export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
+ GIT_SKIP_TESTS=$skip &&
+ export GIT_SKIP_TESTS &&
+ sane_unset GIT_TEST_FAIL_PREREQS &&
+ ./"$name.sh" "$@" >out 2>err;
+ ret=$? &&
+ test "$ret" "$cmp_op" "$want_code"
+ )
+}
+
+write_and_run_sub_test_lib_test () {
+ name="$1" descr="$2" # stdin is the body of the test code
+ write_sub_test_lib_test "$@" || return 1
+ _run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+write_and_run_sub_test_lib_test_err () {
+ name="$1" descr="$2" # stdin is the body of the test code
+ write_sub_test_lib_test "$@" || return 1
+ _run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+run_sub_test_lib_test () {
+ _run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+run_sub_test_lib_test_err () {
+ _run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+_check_sub_test_lib_test_common () {
+ name="$1" &&
+ sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
+ test_cmp "$name"/expect.out "$name"/out
+}
+
+check_sub_test_lib_test () {
+ name="$1" # stdin is the expected output from the test
+ _check_sub_test_lib_test_common "$name" &&
+ test_must_be_empty "$name"/err
+}
+
+check_sub_test_lib_test_err () {
+ name="$1" # stdin is the expected output from the test
+ _check_sub_test_lib_test_common "$name" &&
+ # expected error output is in descriptor 3
+ sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
+ test_cmp "$name"/expect.err "$name"/err
+}
diff --git a/t/oid-info/oid b/t/oid-info/oid
index a754970..7547d2c 100644
--- a/t/oid-info/oid
+++ b/t/oid-info/oid
@@ -27,3 +27,5 @@
numeric sha256:0123456789012345678901234567890123456789012345678901234567890123
deadbeef sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
deadbeef sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+deadbeef_short sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbee
+deadbeef_short sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbee
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 82c0df4..575d200 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -17,8 +17,8 @@
my $rt = ((defined $1 ? $1 : 0.0)*60+$2)*60+$3;
return ($rt, $4, $5);
# size
- } elsif ($line =~ /^\d+$/) {
- return $&;
+ } elsif ($line =~ /^\s*(\d+)$/) {
+ return $1;
} else {
die "bad input line: $line";
}
diff --git a/t/perf/config b/t/perf/config
new file mode 100644
index 0000000..b92768b
--- /dev/null
+++ b/t/perf/config
@@ -0,0 +1,2 @@
+[gc]
+ auto = 0
diff --git a/t/perf/lib-bitmap.sh b/t/perf/lib-bitmap.sh
new file mode 100644
index 0000000..63d3bc7
--- /dev/null
+++ b/t/perf/lib-bitmap.sh
@@ -0,0 +1,69 @@
+# Helper functions for testing bitmap performance; see p5310.
+
+test_full_bitmap () {
+ test_perf 'simulated clone' '
+ git pack-objects --stdout --all </dev/null >/dev/null
+ '
+
+ test_perf 'simulated fetch' '
+ have=$(git rev-list HEAD~100 -1) &&
+ {
+ echo HEAD &&
+ echo ^$have
+ } | git pack-objects --revs --stdout >/dev/null
+ '
+
+ test_perf 'pack to file (bitmap)' '
+ git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null
+ '
+
+ test_perf 'rev-list (commits)' '
+ git rev-list --all --use-bitmap-index >/dev/null
+ '
+
+ test_perf 'rev-list (objects)' '
+ git rev-list --all --use-bitmap-index --objects >/dev/null
+ '
+
+ test_perf 'rev-list with tag negated via --not --all (objects)' '
+ git rev-list perf-tag --not --all --use-bitmap-index --objects >/dev/null
+ '
+
+ test_perf 'rev-list with negative tag (objects)' '
+ git rev-list HEAD --not perf-tag --use-bitmap-index --objects >/dev/null
+ '
+
+ test_perf 'rev-list count with blob:none' '
+ git rev-list --use-bitmap-index --count --objects --all \
+ --filter=blob:none >/dev/null
+ '
+
+ test_perf 'rev-list count with blob:limit=1k' '
+ git rev-list --use-bitmap-index --count --objects --all \
+ --filter=blob:limit=1k >/dev/null
+ '
+
+ test_perf 'rev-list count with tree:0' '
+ git rev-list --use-bitmap-index --count --objects --all \
+ --filter=tree:0 >/dev/null
+ '
+
+ test_perf 'simulated partial clone' '
+ git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null
+ '
+}
+
+test_partial_bitmap () {
+ test_perf 'clone (partial bitmap)' '
+ git pack-objects --stdout --all </dev/null >/dev/null
+ '
+
+ test_perf 'pack to file (partial bitmap)' '
+ git pack-objects --use-bitmap-index --all pack2b </dev/null >/dev/null
+ '
+
+ test_perf 'rev-list with tree filter (partial bitmap)' '
+ git rev-list --use-bitmap-index --count --objects --all \
+ --filter=tree:0 >/dev/null
+ '
+}
diff --git a/t/perf/p0071-sort.sh b/t/perf/p0071-sort.sh
index 6e924f5..ed366e2 100755
--- a/t/perf/p0071-sort.sh
+++ b/t/perf/p0071-sort.sh
@@ -11,16 +11,42 @@
git cat-file --batch >unsorted
'
-test_perf 'sort(1)' '
- sort <unsorted >expect
+test_perf 'sort(1) unsorted' '
+ sort <unsorted >sorted
'
-test_perf 'string_list_sort()' '
- test-tool string-list sort <unsorted >actual
+test_expect_success 'reverse' '
+ sort -r <unsorted >reversed
'
-test_expect_success 'string_list_sort() sorts like sort(1)' '
- test_cmp_bin expect actual
-'
+for file in sorted reversed
+do
+ test_perf "sort(1) $file" "
+ sort <$file >actual
+ "
+done
+
+for file in unsorted sorted reversed
+do
+
+ test_perf "string_list_sort() $file" "
+ test-tool string-list sort <$file >actual
+ "
+
+ test_expect_success "string_list_sort() $file sorts like sort(1)" "
+ test_cmp_bin sorted actual
+ "
+done
+
+for file in unsorted sorted reversed
+do
+ test_perf "llist_mergesort() $file" "
+ test-tool mergesort sort <$file >actual
+ "
+
+ test_expect_success "llist_mergesort() $file sorts like sort(1)" "
+ test_cmp_bin sorted actual
+ "
+done
test_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index 7a0bb29..43d5a34 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -18,7 +18,7 @@
test_tick &&
git commit -m commit$i unrelated-file$i &&
echo change$i >unrelated-file$i &&
- test_seq 1000 | tac >>unrelated-file$i &&
+ test_seq 1000 | sort -nr >>unrelated-file$i &&
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i-reverse unrelated-file$i ||
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index 452be01..7ad4f23 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -2,6 +2,7 @@
test_description='Tests pack performance using bitmaps'
. ./perf-lib.sh
+. "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
test_perf_large_repo
@@ -25,56 +26,7 @@
git repack -ad
'
-test_perf 'simulated clone' '
- git pack-objects --stdout --all </dev/null >/dev/null
-'
-
-test_perf 'simulated fetch' '
- have=$(git rev-list HEAD~100 -1) &&
- {
- echo HEAD &&
- echo ^$have
- } | git pack-objects --revs --stdout >/dev/null
-'
-
-test_perf 'pack to file (bitmap)' '
- git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null
-'
-
-test_perf 'rev-list (commits)' '
- git rev-list --all --use-bitmap-index >/dev/null
-'
-
-test_perf 'rev-list (objects)' '
- git rev-list --all --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list with tag negated via --not --all (objects)' '
- git rev-list perf-tag --not --all --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list with negative tag (objects)' '
- git rev-list HEAD --not perf-tag --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list count with blob:none' '
- git rev-list --use-bitmap-index --count --objects --all \
- --filter=blob:none >/dev/null
-'
-
-test_perf 'rev-list count with blob:limit=1k' '
- git rev-list --use-bitmap-index --count --objects --all \
- --filter=blob:limit=1k >/dev/null
-'
-
-test_perf 'rev-list count with tree:0' '
- git rev-list --use-bitmap-index --count --objects --all \
- --filter=tree:0 >/dev/null
-'
-
-test_perf 'simulated partial clone' '
- git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null
-'
+test_full_bitmap
test_expect_success 'create partial bitmap state' '
# pick a commit to represent the repo tip in the past
@@ -97,17 +49,6 @@
git update-ref HEAD $orig_tip
'
-test_perf 'clone (partial bitmap)' '
- git pack-objects --stdout --all </dev/null >/dev/null
-'
-
-test_perf 'pack to file (partial bitmap)' '
- git pack-objects --use-bitmap-index --all pack2b </dev/null >/dev/null
-'
-
-test_perf 'rev-list with tree filter (partial bitmap)' '
- git rev-list --use-bitmap-index --count --objects --all \
- --filter=tree:0 >/dev/null
-'
+test_partial_bitmap
test_done
diff --git a/t/perf/p5326-multi-pack-bitmaps.sh b/t/perf/p5326-multi-pack-bitmaps.sh
new file mode 100755
index 0000000..f2fa228
--- /dev/null
+++ b/t/perf/p5326-multi-pack-bitmaps.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='Tests performance using midx bitmaps'
+. ./perf-lib.sh
+. "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
+
+test_perf_large_repo
+
+# we need to create the tag up front such that it is covered by the repack and
+# thus by generated bitmaps.
+test_expect_success 'create tags' '
+ git tag --message="tag pointing to HEAD" perf-tag HEAD
+'
+
+test_expect_success 'start with bitmapped pack' '
+ git repack -adb
+'
+
+test_perf 'setup multi-pack index' '
+ git multi-pack-index write --bitmap
+'
+
+test_expect_success 'drop pack bitmap' '
+ rm -f .git/objects/pack/pack-*.bitmap
+'
+
+test_full_bitmap
+
+test_expect_success 'create partial bitmap state' '
+ # pick a commit to represent the repo tip in the past
+ cutoff=$(git rev-list HEAD~100 -1) &&
+ orig_tip=$(git rev-parse HEAD) &&
+
+ # now pretend we have just one tip
+ rm -rf .git/logs .git/refs/* .git/packed-refs &&
+ git update-ref HEAD $cutoff &&
+
+ # and then repack, which will leave us with a nice
+ # big bitmap pack of the "old" history, and all of
+ # the new history will be loose, as if it had been pushed
+ # up incrementally and exploded via unpack-objects
+ git repack -Ad &&
+ git multi-pack-index write --bitmap &&
+
+ # and now restore our original tip, as if the pushes
+ # had happened
+ git update-ref HEAD $orig_tip
+'
+
+test_partial_bitmap
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index f5ed092..780a740 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -27,6 +27,10 @@
. ../test-lib.sh
+unset GIT_CONFIG_NOSYSTEM
+GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config"
+export GIT_CONFIG_SYSTEM
+
if test -n "$GIT_TEST_INSTALLED" -a -z "$PERF_SET_GIT_TEST_INSTALLED"
then
error "Do not use GIT_TEST_INSTALLED with the perf tests.
@@ -230,6 +234,7 @@
test_ok_ "$1"
fi
"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
+ rm test_time.*
}
test_perf () {
diff --git a/t/perf/run b/t/perf/run
index d19dec2..55219aa 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -74,7 +74,7 @@
mydir=$1
mydir_abs=$(cd $mydir && pwd)
- mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers"
+ mydir_abs_wrappers="$mydir_abs/bin-wrappers"
if test -d "$mydir_abs_wrappers"
then
GIT_TEST_INSTALLED=$mydir_abs_wrappers
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 5c342de..b007f0e 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -19,6 +19,7 @@
'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-subtest.sh
try_local_xy () {
local x="local" y="alsolocal" &&
@@ -66,95 +67,8 @@
:
'
-_run_sub_test_lib_test_common () {
- neg="$1" name="$2" descr="$3" # stdin is the body of the test code
- shift 3
-
- # intercept pseudo-options at the front of the argument list that we
- # will not pass to child script
- skip=
- while test $# -gt 0
- do
- case "$1" in
- --skip=*)
- skip=${1#--*=}
- shift
- ;;
- *)
- break
- ;;
- esac
- done
-
- mkdir "$name" &&
- (
- # Pretend we're not running under a test harness, whether we
- # are or not. The test-lib output depends on the setting of
- # this variable, so we need a stable setting under which to run
- # the sub-test.
- sane_unset HARNESS_ACTIVE &&
- cd "$name" &&
- write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
- test_description='$descr (run in sub test-lib)
-
- This is run in a sub test-lib so that we do not get incorrect
- passing metrics
- '
-
- # Point to the t/test-lib.sh, which isn't in ../ as usual
- . "\$TEST_DIRECTORY"/test-lib.sh
- EOF
- cat >>"$name.sh" &&
- export TEST_DIRECTORY &&
- # The child test re-sources GIT-BUILD-OPTIONS and may thus
- # override the test output directory. We thus pass it as an
- # explicit override to the child.
- TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
- export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
- GIT_SKIP_TESTS=$skip &&
- export GIT_SKIP_TESTS &&
- sane_unset GIT_TEST_FAIL_PREREQS &&
- if test -z "$neg"
- then
- ./"$name.sh" "$@" >out 2>err
- else
- ! ./"$name.sh" "$@" >out 2>err
- fi
- )
-}
-
-run_sub_test_lib_test () {
- _run_sub_test_lib_test_common '' "$@"
-}
-
-run_sub_test_lib_test_err () {
- _run_sub_test_lib_test_common '!' "$@"
-}
-
-check_sub_test_lib_test () {
- name="$1" # stdin is the expected output from the test
- (
- cd "$name" &&
- test_must_be_empty err &&
- sed -e 's/^> //' -e 's/Z$//' >expect &&
- test_cmp expect out
- )
-}
-
-check_sub_test_lib_test_err () {
- name="$1" # stdin is the expected output from the test
- # expected error output is in descriptor 3
- (
- cd "$name" &&
- sed -e 's/^> //' -e 's/Z$//' >expect.out &&
- test_cmp expect.out out &&
- sed -e 's/^> //' -e 's/Z$//' <&3 >expect.err &&
- test_cmp expect.err err
- )
-}
-
-test_expect_success 'pretend we have a fully passing test suite' '
- run_sub_test_lib_test full-pass "3 passing tests" <<-\EOF &&
+test_expect_success 'subtest: 3 passing tests' '
+ write_and_run_sub_test_lib_test full-pass <<-\EOF &&
for i in 1 2 3
do
test_expect_success "passing test #$i" "true"
@@ -170,9 +84,8 @@
EOF
'
-test_expect_success 'pretend we have a partially passing test suite' '
- run_sub_test_lib_test_err \
- partial-pass "2/3 tests passing" <<-\EOF &&
+test_expect_success 'subtest: 2/3 tests passing' '
+ write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
test_expect_success "passing test #1" "true"
test_expect_success "failing test #2" "false"
test_expect_success "passing test #3" "true"
@@ -188,8 +101,8 @@
EOF
'
-test_expect_success 'pretend we have a known breakage' '
- run_sub_test_lib_test failing-todo "A failing TODO test" <<-\EOF &&
+test_expect_success 'subtest: a failing TODO test' '
+ write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_failure "pretend we have a known breakage" "false"
test_done
@@ -203,8 +116,8 @@
EOF
'
-test_expect_success 'pretend we have fixed a known breakage' '
- run_sub_test_lib_test passing-todo "A passing TODO test" <<-\EOF &&
+test_expect_success 'subtest: a passing TODO test' '
+ write_and_run_sub_test_lib_test passing-todo <<-\EOF &&
test_expect_failure "pretend we have fixed a known breakage" "true"
test_done
EOF
@@ -215,9 +128,8 @@
EOF
'
-test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' '
- run_sub_test_lib_test partially-passing-todos \
- "2 TODO tests, one passing" <<-\EOF &&
+test_expect_success 'subtest: 2 TODO tests, one passin' '
+ write_and_run_sub_test_lib_test partially-passing-todos <<-\EOF &&
test_expect_failure "pretend we have a known breakage" "false"
test_expect_success "pretend we have a passing test" "true"
test_expect_failure "pretend we have fixed another known breakage" "true"
@@ -234,9 +146,8 @@
EOF
'
-test_expect_success 'pretend we have a pass, fail, and known breakage' '
- run_sub_test_lib_test_err \
- mixed-results1 "mixed results #1" <<-\EOF &&
+test_expect_success 'subtest: mixed results: pass, failure and a TODO test' '
+ write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_success "failing test" "false"
test_expect_failure "pretend we have a known breakage" "false"
@@ -253,9 +164,8 @@
EOF
'
-test_expect_success 'pretend we have a mix of all possible results' '
- run_sub_test_lib_test_err \
- mixed-results2 "mixed results #2" <<-\EOF &&
+test_expect_success 'subtest: mixed results: a mixture of all possible results' '
+ write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
test_expect_success "passing test" "true"
test_expect_success "passing test" "true"
test_expect_success "passing test" "true"
@@ -289,9 +199,8 @@
EOF
'
-test_expect_success 'test --verbose' '
- run_sub_test_lib_test_err \
- t1234-verbose "test verbose" --verbose <<-\EOF &&
+test_expect_success 'subtest: --verbose option' '
+ write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
@@ -316,19 +225,14 @@
EOF
'
-test_expect_success 'test --verbose-only' '
+test_expect_success 'subtest: --verbose-only option' '
run_sub_test_lib_test_err \
- t2345-verbose-only-2 "test verbose-only=2" \
- --verbose-only=2 <<-\EOF &&
- test_expect_success "passing test" true
- test_expect_success "test with output" "echo foo"
- test_expect_success "failing test" false
- test_done
- EOF
- check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
+ t1234-verbose \
+ --verbose-only=2 &&
+ check_sub_test_lib_test t1234-verbose <<-\EOF
> ok 1 - passing test
> Z
- > expecting success of 2345.2 '\''test with output'\'': echo foo
+ > expecting success of 1234.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
@@ -339,18 +243,11 @@
EOF
'
-test_expect_success 'GIT_SKIP_TESTS' '
+test_expect_success 'subtest: skip one with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-basic \
- "GIT_SKIP_TESTS" \
- --skip="git.2" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-basic <<-\EOF
+ run_sub_test_lib_test full-pass \
+ --skip="full.2" &&
+ check_sub_test_lib_test full-pass <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 - passing test #3
@@ -360,10 +257,9 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS several tests' '
+test_expect_success 'subtest: skip several with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-several \
- "GIT_SKIP_TESTS several tests" \
+ write_and_run_sub_test_lib_test git-skip-tests-several \
--skip="git.2 git.5" <<-\EOF &&
for i in 1 2 3 4 5 6
do
@@ -384,18 +280,11 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS sh pattern' '
+test_expect_success 'subtest: sh pattern skipping with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-sh-pattern \
- "GIT_SKIP_TESTS sh pattern" \
- --skip="git.[2-5]" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-sh-pattern <<-\EOF
+ run_sub_test_lib_test git-skip-tests-several \
+ --skip="git.[2-5]" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
@@ -408,35 +297,23 @@
)
'
-test_expect_success 'GIT_SKIP_TESTS entire suite' '
+test_expect_success 'subtest: skip entire test suite with GIT_SKIP_TESTS' '
(
- run_sub_test_lib_test git-skip-tests-entire-suite \
- "GIT_SKIP_TESTS entire suite" \
- --skip="git" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-entire-suite <<-\EOF
+ GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
+ run_sub_test_lib_test git-skip-tests-several \
+ --skip="git" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> 1..0 # SKIP skip all tests in git
EOF
)
'
-test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' '
+test_expect_success 'subtest: GIT_SKIP_TESTS does not skip unmatched suite' '
(
- run_sub_test_lib_test git-skip-tests-unmatched-suite \
- "GIT_SKIP_TESTS does not skip unmatched suite" \
- --skip="notgit" <<-\EOF &&
- for i in 1 2 3
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\EOF
+ GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
+ run_sub_test_lib_test full-pass \
+ --skip="notfull" &&
+ check_sub_test_lib_test full-pass <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -446,16 +323,9 @@
)
'
-test_expect_success '--run basic' '
- run_sub_test_lib_test run-basic \
- "--run basic" --run="1,3,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-basic <<-\EOF
+test_expect_success 'subtest: --run basic' '
+ run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -467,16 +337,10 @@
EOF
'
-test_expect_success '--run with a range' '
- run_sub_test_lib_test run-range \
- "--run with a range" --run="1-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range <<-\EOF
+test_expect_success 'subtest: --run with a range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -488,16 +352,10 @@
EOF
'
-test_expect_success '--run with two ranges' '
- run_sub_test_lib_test run-two-ranges \
- "--run with two ranges" --run="1-2,5-6" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-two-ranges <<-\EOF
+test_expect_success 'subtest: --run with two ranges' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-2,5-6" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -509,16 +367,10 @@
EOF
'
-test_expect_success '--run with a left open range' '
- run_sub_test_lib_test run-left-open-range \
- "--run with a left open range" --run="-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-left-open-range <<-\EOF
+test_expect_success 'subtest: --run with a left open range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -530,16 +382,10 @@
EOF
'
-test_expect_success '--run with a right open range' '
- run_sub_test_lib_test run-right-open-range \
- "--run with a right open range" --run="4-" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-right-open-range <<-\EOF
+test_expect_success 'subtest: --run with a right open range' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="4-" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -551,16 +397,10 @@
EOF
'
-test_expect_success '--run with basic negation' '
- run_sub_test_lib_test run-basic-neg \
- "--run with basic negation" --run="!3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-basic-neg <<-\EOF
+test_expect_success 'subtest: --run with basic negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -572,16 +412,10 @@
EOF
'
-test_expect_success '--run with two negations' '
- run_sub_test_lib_test run-two-neg \
- "--run with two negations" --run="!3,!6" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-two-neg <<-\EOF
+test_expect_success 'subtest: --run with two negations' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3,!6" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -593,16 +427,10 @@
EOF
'
-test_expect_success '--run a range and negation' '
- run_sub_test_lib_test run-range-and-neg \
- "--run a range and negation" --run="-4,!2" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range-and-neg <<-\EOF
+test_expect_success 'subtest: --run a range and negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="-4,!2" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -614,16 +442,10 @@
EOF
'
-test_expect_success '--run range negation' '
- run_sub_test_lib_test run-range-neg \
- "--run range negation" --run="!1-3" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-range-neg <<-\EOF
+test_expect_success 'subtest: --run range negation' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!1-3" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -635,17 +457,10 @@
EOF
'
-test_expect_success '--run include, exclude and include' '
- run_sub_test_lib_test run-inc-neg-inc \
- "--run include, exclude and include" \
- --run="1-5,!1-3,2" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-inc-neg-inc <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1-5,!1-3,2" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -657,17 +472,10 @@
EOF
'
-test_expect_success '--run include, exclude and include, comma separated' '
- run_sub_test_lib_test run-inc-neg-inc-comma \
- "--run include, exclude and include, comma separated" \
- --run=1-5,!1-3,2 <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-inc-neg-inc-comma <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include, comma separated' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run=1-5,!1-3,2 &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -679,17 +487,10 @@
EOF
'
-test_expect_success '--run exclude and include' '
- run_sub_test_lib_test run-neg-inc \
- "--run exclude and include" \
- --run="!3-,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-neg-inc <<-\EOF
+test_expect_success 'subtest: --run exclude and include' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="!3-,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -701,17 +502,10 @@
EOF
'
-test_expect_success '--run empty selectors' '
- run_sub_test_lib_test run-empty-sel \
- "--run empty selectors" \
- --run="1,,3,,,5" <<-\EOF &&
- for i in 1 2 3 4 5 6
- do
- test_expect_success "passing test #$i" "true"
- done
- test_done
- EOF
- check_sub_test_lib_test run-empty-sel <<-\EOF
+test_expect_success 'subtest: --run empty selectors' '
+ run_sub_test_lib_test git-skip-tests-several \
+ --run="1,,3,,,5" &&
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -723,9 +517,8 @@
EOF
'
-test_expect_success '--run substring selector' '
- run_sub_test_lib_test run-substring-selector \
- "--run empty selectors" \
+test_expect_success 'subtest: --run substring selector' '
+ write_and_run_sub_test_lib_test run-substring-selector \
--run="relevant" <<-\EOF &&
test_expect_success "relevant test" "true"
for i in 1 2 3 4 5 6
@@ -747,9 +540,8 @@
EOF
'
-test_expect_success '--run keyword selection' '
- run_sub_test_lib_test_err run-inv-range-start \
- "--run invalid range start" \
+test_expect_success 'subtest: --run keyword selection' '
+ write_and_run_sub_test_lib_test_err run-inv-range-start \
--run="a-5" <<-\EOF &&
test_expect_success "passing test #1" "true"
test_done
@@ -762,14 +554,10 @@
EOF_ERR
'
-test_expect_success '--run invalid range end' '
- run_sub_test_lib_test_err run-inv-range-end \
- "--run invalid range end" \
- --run="1-z" <<-\EOF &&
- test_expect_success "passing test #1" "true"
- test_done
- EOF
- check_sub_test_lib_test_err run-inv-range-end \
+test_expect_success 'subtest: --run invalid range end' '
+ run_sub_test_lib_test_err run-inv-range-start \
+ --run="1-z" &&
+ check_sub_test_lib_test_err run-inv-range-start \
<<-\EOF_OUT 3<<-EOF_ERR
> FATAL: Unexpected exit with code 1
EOF_OUT
@@ -777,8 +565,8 @@
EOF_ERR
'
-test_expect_success 'tests respect prerequisites' '
- run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect prerequisites' '
+ write_and_run_sub_test_lib_test prereqs <<-\EOF &&
test_set_prereq HAVEIT
test_expect_success HAVEIT "prereq is satisfied" "true"
@@ -807,8 +595,8 @@
EOF
'
-test_expect_success 'tests respect lazy prerequisites' '
- run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect lazy prerequisites' '
+ write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF &&
test_lazy_prereq LAZY_TRUE true
test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true"
@@ -831,8 +619,8 @@
EOF
'
-test_expect_success 'nested lazy prerequisites' '
- run_sub_test_lib_test nested-lazy "nested lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: nested lazy prerequisites' '
+ write_and_run_sub_test_lib_test nested-lazy <<-\EOF &&
test_lazy_prereq NESTED_INNER "
>inner &&
@@ -857,9 +645,9 @@
EOF
'
-test_expect_success 'lazy prereqs do not turn off tracing' '
- run_sub_test_lib_test lazy-prereq-and-tracing \
- "lazy prereqs and -x" -v -x <<-\EOF &&
+test_expect_success 'subtest: lazy prereqs do not turn off tracing' '
+ write_and_run_sub_test_lib_test lazy-prereq-and-tracing \
+ -v -x <<-\EOF &&
test_lazy_prereq LAZY true
test_expect_success lazy "test_have_prereq LAZY && echo trace"
@@ -870,8 +658,8 @@
grep "echo trace" lazy-prereq-and-tracing/err
'
-test_expect_success 'tests clean up after themselves' '
- run_sub_test_lib_test cleanup "test with cleanup" <<-\EOF &&
+test_expect_success 'subtest: tests clean up after themselves' '
+ write_and_run_sub_test_lib_test cleanup <<-\EOF &&
clean=no
test_expect_success "do cleanup" "
test_when_finished clean=yes
@@ -890,9 +678,9 @@
EOF
'
-test_expect_success 'tests clean up even on failures' '
- run_sub_test_lib_test_err \
- failing-cleanup "Failing tests with cleanup commands" <<-\EOF &&
+test_expect_success 'subtest: tests clean up even on failures' '
+ write_and_run_sub_test_lib_test_err \
+ failing-cleanup <<-\EOF &&
test_expect_success "tests clean up even after a failure" "
touch clean-after-failure &&
test_when_finished rm clean-after-failure &&
@@ -919,9 +707,9 @@
EOF
'
-test_expect_success 'test_atexit is run' '
- run_sub_test_lib_test_err \
- atexit-cleanup "Run atexit commands" -i <<-\EOF &&
+test_expect_success 'subtest: test_atexit is run' '
+ write_and_run_sub_test_lib_test_err \
+ atexit-cleanup -i <<-\EOF &&
test_expect_success "tests clean up even after a failure" "
> ../../clean-atexit &&
test_atexit rm ../../clean-atexit &&
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index df544bb..7603ad2 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -2,6 +2,7 @@
test_description='git init'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
check_config () {
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 8440e6a..76052cb 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -7,6 +7,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
objpath() {
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 1e4c672..b9ed612 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -2,6 +2,7 @@
test_description=gitattributes
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
attr_check_basic () {
diff --git a/t/t0004-unwritable.sh b/t/t0004-unwritable.sh
index e3137d6..2e9d652 100755
--- a/t/t0004-unwritable.sh
+++ b/t/t0004-unwritable.sh
@@ -2,6 +2,7 @@
test_description='detect unwritable repository and fail correctly'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -18,27 +19,66 @@
test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git write-tree
+ test_must_fail git write-tree 2>out.write-tree
'
-test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' '
+test_lazy_prereq WRITE_TREE_OUT 'test -e "$TRASH_DIRECTORY"/out.write-tree'
+test_expect_success WRITE_TREE_OUT 'write-tree output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ fatal: git-write-tree: error building trees
+ EOF
+ test_cmp expect out.write-tree
+'
+
+test_expect_success POSIXPERM,SANITY,!SANITIZE_LEAK 'commit should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git commit -m second
+ test_must_fail git commit -m second 2>out.commit
+'
+
+test_lazy_prereq COMMIT_OUT 'test -e "$TRASH_DIRECTORY"/out.commit'
+test_expect_success COMMIT_OUT 'commit output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: Error building trees
+ EOF
+ test_cmp expect out.commit
'
test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo 6O >file &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git update-index file
+ test_must_fail git update-index file 2>out.update-index
+'
+
+test_lazy_prereq UPDATE_INDEX_OUT 'test -e "$TRASH_DIRECTORY"/out.update-index'
+test_expect_success UPDATE_INDEX_OUT 'update-index output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: file: failed to insert into database
+ fatal: Unable to process path file
+ EOF
+ test_cmp expect out.update-index
'
test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
echo b >file &&
chmod a-w .git/objects .git/objects/?? &&
- test_must_fail git add file
+ test_must_fail git add file 2>out.add
+'
+
+test_lazy_prereq ADD_OUT 'test -e "$TRASH_DIRECTORY"/out.add'
+test_expect_success ADD_OUT 'add output on unwritable repository' '
+ cat >expect <<-\EOF &&
+ error: insufficient permission for adding an object to repository database .git/objects
+ error: file: failed to insert into database
+ error: unable to index file '\''file'\''
+ fatal: updating files failed
+ EOF
+ test_cmp expect out.add
'
test_done
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index 4c214bd..a5ec6a0 100755
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='signals work as we expect'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<EOF
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 88b9ae8..53af92d 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic sanity checks for git var'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'get GIT_AUTHOR_IDENT' '
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index a594b4a..42d2314 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -2,6 +2,7 @@
test_description=check-ignore
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
init_vars () {
@@ -802,6 +803,49 @@
grep top-level-dir actual
'
+test_expect_success 'exact prefix matching (with root)' '
+ test_when_finished rm -r a &&
+ mkdir -p a/git a/git-foo &&
+ touch a/git/foo a/git-foo/bar &&
+ echo /git/ >a/.gitignore &&
+ git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+ cat >expect <<-\EOF &&
+ a/git
+ a/git/foo
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'exact prefix matching (without root)' '
+ test_when_finished rm -r a &&
+ mkdir -p a/git a/git-foo &&
+ touch a/git/foo a/git-foo/bar &&
+ echo git/ >a/.gitignore &&
+ git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+ cat >expect <<-\EOF &&
+ a/git
+ a/git/foo
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'directories and ** matches' '
+ cat >.gitignore <<-\EOF &&
+ data/**
+ !data/**/
+ !data/**/*.txt
+ EOF
+ git check-ignore file \
+ data/file data/data1/file1 data/data1/file1.txt \
+ data/data2/file2 data/data2/file2.txt >actual &&
+ cat >expect <<-\EOF &&
+ data/file
+ data/data1/file1
+ data/data2/file2
+ EOF
+ test_cmp expect actual
+'
+
############################################################################
#
# test whitespace handling
diff --git a/t/t0009-prio-queue.sh b/t/t0009-prio-queue.sh
index 3941ad2..eea9910 100755
--- a/t/t0009-prio-queue.sh
+++ b/t/t0009-prio-queue.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic tests for priority queue implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<'EOF'
diff --git a/t/t0010-racy-git.sh b/t/t0010-racy-git.sh
index 5657c5a..837c8b7 100755
--- a/t/t0010-racy-git.sh
+++ b/t/t0010-racy-git.sh
@@ -2,6 +2,7 @@
test_description='racy GIT'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# This test can give false success if your machine is sufficiently
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh
index 5343ffd..e094975 100755
--- a/t/t0011-hashmap.sh
+++ b/t/t0011-hashmap.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test hashmap and string hash functions'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_hashmap() {
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 5679e29..91b68c7 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -34,6 +34,18 @@
git help -a >/dev/null
'
+test_expect_success 'invalid usage' '
+ test_expect_code 129 git help -g add &&
+ test_expect_code 129 git help -a -c &&
+
+ test_expect_code 129 git help -g add &&
+ test_expect_code 129 git help -a -g &&
+
+ test_expect_code 129 git help -g -c &&
+ test_expect_code 129 git help --config-for-completion add &&
+ test_expect_code 129 git help --config-sections-for-completion add
+'
+
test_expect_success "works for commands and guides by default" '
configure_help &&
git help status &&
@@ -73,6 +85,59 @@
test_i18ngrep "^ tutorial " help.output
'
+test_expect_success 'git help fails for non-existing html pages' '
+ configure_help &&
+ mkdir html-empty &&
+ test_must_fail git -c help.htmlpath=html-empty help status &&
+ test_must_be_empty test-browser.log
+'
+
+test_expect_success 'git help succeeds without git.html' '
+ configure_help &&
+ mkdir html-with-docs &&
+ touch html-with-docs/git-status.html &&
+ git -c help.htmlpath=html-with-docs help status &&
+ echo "html-with-docs/git-status.html" >expect &&
+ test_cmp expect test-browser.log
+'
+
+test_expect_success 'git help -c' '
+ git help -c >help.output &&
+ cat >expect <<-\EOF &&
+
+ '\''git help config'\'' for more information
+ EOF
+ grep -v -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" \
+ help.output >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git help --config-for-completion' '
+ git help -c >human &&
+ grep -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" human |
+ sed -e "s/\*.*//" -e "s/<.*//" |
+ sort -u >human.munged &&
+
+ git help --config-for-completion >vars &&
+ test_cmp human.munged vars
+'
+
+test_expect_success 'git help --config-sections-for-completion' '
+ git help -c >human &&
+ grep -E \
+ -e "^[^.]+\.[^.]+$" \
+ -e "^[^.]+\.[^.]+\.[^.]+$" human |
+ sed -e "s/\..*//" |
+ sort -u >human.munged &&
+
+ git help --config-sections-for-completion >sections &&
+ test_cmp human.munged sections
+'
+
test_expect_success 'generate builtin list' '
git --list-cmds=builtins >builtins
'
diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh
index 419f31a..9ad7608 100755
--- a/t/t0013-sha1dc.sh
+++ b/t/t0013-sha1dc.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test sha1 collision detection'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
TEST_DATA="$TEST_DIRECTORY/t0013"
diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh
index 31f8276..0faef1f 100755
--- a/t/t0016-oidmap.sh
+++ b/t/t0016-oidmap.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test oidmap'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# This purposefully is very similar to t0011-hashmap.sh
diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh
index 4a159f9..2e42fba 100755
--- a/t/t0017-env-helper.sh
+++ b/t/t0017-env-helper.sh
@@ -2,6 +2,7 @@
test_description='test env--helper'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
index 39e5e4b..c13057a 100755
--- a/t/t0018-advice.sh
+++ b/t/t0018-advice.sh
@@ -2,6 +2,7 @@
test_description='Test advise_if_enabled functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'advice should be printed when config variable is unset' '
diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index 7af3fbc..c1a331e 100755
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -2,6 +2,7 @@
test_description='ignore CR in CRLF sequence while computing similiarity'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 4e9fa3c..a34de56 100755
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -2,6 +2,7 @@
test_description='respect crlf in git archive'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh
index e13363a..8144797 100755
--- a/t/t0025-crlf-renormalize.sh
+++ b/t/t0025-crlf-renormalize.sh
@@ -2,6 +2,7 @@
test_description='CRLF renormalization'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index c5203e2..cdcafcd 100755
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -2,6 +2,7 @@
test_description='CRLF conversion'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
has_cr() {
diff --git a/t/t0029-core-unsetenvvars.sh b/t/t0029-core-unsetenvvars.sh
index 24ce46a..b138e1d 100755
--- a/t/t0029-core-unsetenvvars.sh
+++ b/t/t0029-core-unsetenvvars.sh
@@ -2,6 +2,7 @@
test_description='test the Windows-only core.unsetenvvars setting'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if ! test_have_prereq MINGW
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index 0c24a0f..ae1ca38 100755
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -5,6 +5,7 @@
test_description='git stripspace'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
t40='A quick brown fox jumps over the lazy do'
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index ad4746d..ed2fb62 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -5,6 +5,7 @@
test_description='our own option parser'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expect <<\EOF
@@ -37,7 +38,6 @@
--list <str> add str to list
Magic arguments
- --quux means --quux
-NUM set integer to NUM
+ same as -b
--ambiguous positive ambiguity
@@ -169,9 +169,45 @@
'
test_expect_success 'missing required value' '
- test_expect_code 129 test-tool parse-options -s &&
- test_expect_code 129 test-tool parse-options --string &&
- test_expect_code 129 test-tool parse-options --file
+ cat >expect <<-\EOF &&
+ error: switch `s'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options -s 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `string'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options --string 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `file'\'' requires a value
+ EOF
+ test_expect_code 129 test-tool parse-options --file 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: boolean' '
+ cat >expect <<-\EOF &&
+ error: option `yes'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ error: option `no-yes'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: cmdmode' '
+ cat >expect <<-\EOF &&
+ error: option `mode1'\'' takes no value
+ EOF
+ test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -263,10 +299,6 @@
test_cmp typo.err output.err
'
-test_expect_success 'keep some options as arguments' '
- test-tool parse-options --expect="arg 00: --quux" --quux
-'
-
cat >expect <<\EOF
Callback: "four", 0
boolean: 5
diff --git a/t/t0052-simple-ipc.sh b/t/t0052-simple-ipc.sh
index ff98be3..1a36a53 100755
--- a/t/t0052-simple-ipc.sh
+++ b/t/t0052-simple-ipc.sh
@@ -2,6 +2,7 @@
test_description='simple command server'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test-tool simple-ipc SUPPORTS_SIMPLE_IPC || {
diff --git a/t/t0055-beyond-symlinks.sh b/t/t0055-beyond-symlinks.sh
index 0c6ff56..6bada37 100755
--- a/t/t0055-beyond-symlinks.sh
+++ b/t/t0055-beyond-symlinks.sh
@@ -2,6 +2,7 @@
test_description='update-index and add refuse to add beyond symlinks'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success SYMLINKS setup '
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 9e2219f..96f0123 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -533,4 +533,30 @@
"PRN./abc"
'
+test_lazy_prereq RUNTIME_PREFIX '
+ test true = "$RUNTIME_PREFIX"
+'
+
+test_lazy_prereq CAN_EXEC_IN_PWD '
+ cp "$GIT_EXEC_PATH"/git$X ./ &&
+ ./git rev-parse
+'
+
+test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
+ mkdir -p pretend/bin pretend/libexec/git-core &&
+ echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
+ cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
+ GIT_EXEC_PATH= ./pretend/bin/git here >actual &&
+ echo HERE >expect &&
+ test_cmp expect actual'
+
+test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' '
+ mkdir -p pretend/bin &&
+ cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
+ git config yes.path "%(prefix)/yes" &&
+ GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual &&
+ echo "$(pwd)/pretend/yes" >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 7d59967..ee28190 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -5,6 +5,7 @@
test_description='Test run command'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >hello-script <<-EOF
diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
index c6ee9f6..46d4839 100755
--- a/t/t0063-string-list.sh
+++ b/t/t0063-string-list.sh
@@ -5,6 +5,7 @@
test_description='Test string list functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_split () {
diff --git a/t/t0064-oid-array.sh b/t/t0064-oid-array.sh
index 2e5438c..88c89e8 100755
--- a/t/t0064-oid-array.sh
+++ b/t/t0064-oid-array.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='basic tests for the oid array implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
echoid () {
diff --git a/t/t0065-strcmp-offset.sh b/t/t0065-strcmp-offset.sh
index 91fa639..94e34c8 100755
--- a/t/t0065-strcmp-offset.sh
+++ b/t/t0065-strcmp-offset.sh
@@ -2,6 +2,7 @@
test_description='Test strcmp_offset functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
while read s1 s2 expect
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
index 92910e4..63a1a45 100755
--- a/t/t0066-dir-iterator.sh
+++ b/t/t0066-dir-iterator.sh
@@ -2,6 +2,7 @@
test_description='Test the dir-iterator functionality'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t0067-parse_pathspec_file.sh b/t/t0067-parse_pathspec_file.sh
index 7bab49f..0188d04 100755
--- a/t/t0067-parse_pathspec_file.sh
+++ b/t/t0067-parse_pathspec_file.sh
@@ -2,6 +2,7 @@
test_description='Test parse_pathspec_file()'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'one item from stdin' '
diff --git a/t/t0069-oidtree.sh b/t/t0069-oidtree.sh
index bfb1397..74cc59b 100755
--- a/t/t0069-oidtree.sh
+++ b/t/t0069-oidtree.sh
@@ -1,6 +1,7 @@
#!/bin/sh
test_description='basic tests for the oidtree implementation'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
maxhexsz=$(test_oid hexsz)
diff --git a/t/t0071-sort.sh b/t/t0071-sort.sh
new file mode 100755
index 0000000..a8ab174
--- /dev/null
+++ b/t/t0071-sort.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+test_description='verify sort functions'
+
+. ./test-lib.sh
+
+test_expect_success 'llist_mergesort()' '
+ test-tool mergesort test
+'
+
+test_done
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 9bf66c9..9067572 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -195,6 +195,7 @@
test_expect_success 'reset --hard without index gives cache-tree' '
rm -f .git/index &&
+ git clean -fd &&
git reset --hard &&
test_cache_tree
'
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
index 526304f..eeedbfa 100755
--- a/t/t0091-bugreport.sh
+++ b/t/t0091-bugreport.sh
@@ -2,6 +2,7 @@
test_description='git bugreport'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Headers "[System Info]" will be followed by a non-empty line if we put some
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index 0cf3a63..37c359b 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility (normal target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0210/scrub_normal.perl b/t/t0210/scrub_normal.perl
index c65d1a8..7cc4de3 100644
--- a/t/t0210/scrub_normal.perl
+++ b/t/t0210/scrub_normal.perl
@@ -42,6 +42,12 @@
# so just omit it for testing purposes.
# print "cmd_path _EXE_\n";
}
+ elsif ($line =~ m/^cmd_ancestry/) {
+ # 'cmd_ancestry' is not implemented everywhere, so for portability's
+ # sake, skip it when parsing normal.
+ #
+ # print "$line";
+ }
else {
print "$line";
}
diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh
index 6ee8ee3..22d0845 100755
--- a/t/t0211-trace2-perf.sh
+++ b/t/t0211-trace2-perf.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility (perf target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0211/scrub_perf.perl b/t/t0211/scrub_perf.perl
index 351af78..d164b750 100644
--- a/t/t0211/scrub_perf.perl
+++ b/t/t0211/scrub_perf.perl
@@ -44,6 +44,11 @@
# $tokens[$col_rest] = "_EXE_";
goto SKIP_LINE;
}
+ elsif ($tokens[$col_event] =~ m/cmd_ancestry/) {
+ # 'cmd_ancestry' is platform-specific and not implemented everywhere,
+ # so skip it.
+ goto SKIP_LINE;
+ }
elsif ($tokens[$col_event] =~ m/child_exit/) {
$tokens[$col_rest] =~ s/ pid:\d* / pid:_PID_ /;
}
diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh
index 1529155..6d3374f 100755
--- a/t/t0212-trace2-event.sh
+++ b/t/t0212-trace2-event.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test trace2 facility'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Turn off any inherited trace2 settings for this test.
diff --git a/t/t0212/parse_events.perl b/t/t0212/parse_events.perl
index 6584bb5..b640856 100644
--- a/t/t0212/parse_events.perl
+++ b/t/t0212/parse_events.perl
@@ -132,7 +132,10 @@
# just omit it for testing purposes.
# $processes->{$sid}->{'path'} = "_EXE_";
}
-
+ elsif ($event eq 'cmd_ancestry') {
+ # 'cmd_ancestry' is platform-specific and not implemented everywhere, so
+ # just skip it for testing purposes.
+ }
elsif ($event eq 'cmd_name') {
$processes->{$sid}->{'name'} = $line->{'name'};
$processes->{$sid}->{'hierarchy'} = $line->{'hierarchy'};
diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
index ebd5fa5..698b715 100755
--- a/t/t0301-credential-cache.sh
+++ b/t/t0301-credential-cache.sh
@@ -9,6 +9,21 @@
test_done
}
+uname_s=$(uname -s)
+case $uname_s in
+*MINGW*)
+ test_path_is_socket () {
+ # `test -S` cannot detect Win10's Unix sockets
+ test_path_exists "$1"
+ }
+ ;;
+*)
+ test_path_is_socket () {
+ test -S "$1"
+ }
+ ;;
+esac
+
# don't leave a stale daemon running
test_atexit 'git credential-cache exit'
@@ -21,7 +36,7 @@
rmdir -p .cache/git/credential/
" &&
test_path_is_missing "$HOME/.git-credential-cache" &&
- test -S "$HOME/.cache/git/credential/socket"
+ test_path_is_socket "$HOME/.cache/git/credential/socket"
'
XDG_CACHE_HOME="$HOME/xdg"
@@ -31,7 +46,7 @@
test_expect_success "use custom XDG_CACHE_HOME if set and default sockets are not created" '
test_when_finished "git credential-cache exit" &&
- test -S "$XDG_CACHE_HOME/git/credential/socket" &&
+ test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket" &&
test_path_is_missing "$HOME/.git-credential-cache/socket" &&
test_path_is_missing "$HOME/.cache/git/credential/socket"
'
@@ -48,7 +63,7 @@
username=store-user
password=store-pass
EOF
- test -S "$HOME/dir/socket"
+ test_path_is_socket "$HOME/dir/socket"
'
test_expect_success "use custom XDG_CACHE_HOME even if xdg socket exists" '
@@ -62,7 +77,7 @@
username=store-user
password=store-pass
EOF
- test -S "$HOME/.cache/git/credential/socket" &&
+ test_path_is_socket "$HOME/.cache/git/credential/socket" &&
XDG_CACHE_HOME="$HOME/xdg" &&
export XDG_CACHE_HOME &&
check approve cache <<-\EOF &&
@@ -71,7 +86,7 @@
username=store-user
password=store-pass
EOF
- test -S "$XDG_CACHE_HOME/git/credential/socket"
+ test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
'
test_expect_success 'use user socket if user directory exists' '
@@ -79,14 +94,15 @@
git credential-cache exit &&
rmdir \"\$HOME/.git-credential-cache/\"
" &&
- mkdir -p -m 700 "$HOME/.git-credential-cache/" &&
+ mkdir -p "$HOME/.git-credential-cache/" &&
+ chmod 700 "$HOME/.git-credential-cache/" &&
check approve cache <<-\EOF &&
protocol=https
host=example.com
username=store-user
password=store-pass
EOF
- test -S "$HOME/.git-credential-cache/socket"
+ test_path_is_socket "$HOME/.git-credential-cache/socket"
'
test_expect_success SYMLINKS 'use user socket if user directory is a symlink to a directory' '
@@ -103,7 +119,7 @@
username=store-user
password=store-pass
EOF
- test -S "$HOME/.git-credential-cache/socket"
+ test_path_is_socket "$HOME/.git-credential-cache/socket"
'
helper_test_timeout cache --timeout=1
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index a211a66..c76485b 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -4,6 +4,13 @@
. ./test-lib.sh
+# missing promisor objects cause repacks which write bitmaps to fail
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+# When enabled, some commands will write commit-graphs. This causes fsck
+# to fail when delete_object() is called because fsck will attempt to
+# verify the out-of-sync commit graph.
+GIT_TEST_COMMIT_GRAPH=0
+
delete_object () {
rm $1/.git/objects/$(echo $2 | sed -e 's|^..|&/|')
}
@@ -319,7 +326,7 @@
git -C repo config core.repositoryformatversion 1 &&
git -C repo config extensions.partialclone "arbitrary string" &&
- GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
+ git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
grep $(git -C repo rev-parse bar) out &&
! grep $FOO out
'
@@ -536,7 +543,13 @@
repack_and_check () {
rm -rf repo2 &&
cp -r repo repo2 &&
- git -C repo2 repack $1 -d &&
+ if test x"$1" = "x--must-fail"
+ then
+ shift
+ test_must_fail git -C repo2 repack $1 -d
+ else
+ git -C repo2 repack $1 -d
+ fi &&
git -C repo2 fsck &&
git -C repo2 cat-file -e $2 &&
@@ -561,6 +574,7 @@
printf "$THREE\n" | pack_as_from_promisor &&
delete_object repo "$ONE" &&
+ repack_and_check --must-fail -ab "$TWO" "$THREE" &&
repack_and_check -a "$TWO" "$THREE" &&
repack_and_check -A "$TWO" "$THREE" &&
repack_and_check -l "$TWO" "$THREE"
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index 013c5a7..0e8c0df 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -71,6 +71,8 @@
DF: a special case, where A makes a directory and B makes a file.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 1057a96..d111552 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -20,6 +20,8 @@
rezrov - in H, deleted in M
yomin - not in H or M
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
diff --git a/t/t1003-read-tree-prefix.sh b/t/t1003-read-tree-prefix.sh
index b6111cd..e0db206 100755
--- a/t/t1003-read-tree-prefix.sh
+++ b/t/t1003-read-tree-prefix.sh
@@ -6,6 +6,7 @@
test_description='git read-tree --prefix test.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 18b3779..6586283 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -315,39 +315,238 @@
}
'
-bogus_type="bogus"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+test_expect_success 'setup bogus data' '
+ bogus_short_type="bogus" &&
+ bogus_short_content="bogus" &&
+ bogus_short_size=$(strlen "$bogus_short_content") &&
+ bogus_short_sha1=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
+
+ bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
+ bogus_long_content="bogus" &&
+ bogus_long_size=$(strlen "$bogus_long_content") &&
+ bogus_long_sha1=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
+'
+
+for arg1 in '' --allow-unknown-type
+do
+ for arg2 in -s -t -p
+ do
+ if test "$arg1" = "--allow-unknown-type" && test "$arg2" = "-p"
+ then
+ continue
+ fi
+
+
+ test_expect_success "cat-file $arg1 $arg2 error on bogus short OID" '
+ cat >expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+
+ if test "$arg1" = "--allow-unknown-type"
+ then
+ git cat-file $arg1 $arg2 $bogus_short_sha1
+ else
+ test_must_fail git cat-file $arg1 $arg2 $bogus_short_sha1 >out 2>actual &&
+ test_must_be_empty out &&
+ test_cmp expect actual
+ fi
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on bogus full OID" '
+ if test "$arg2" = "-p"
+ then
+ cat >expect <<-EOF
+ error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+ fatal: Not a valid object name $bogus_long_sha1
+ EOF
+ else
+ cat >expect <<-EOF
+ error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+ fatal: git cat-file: could not get object info
+ EOF
+ fi &&
+
+ if test "$arg1" = "--allow-unknown-type"
+ then
+ git cat-file $arg1 $arg2 $bogus_short_sha1
+ else
+ test_must_fail git cat-file $arg1 $arg2 $bogus_long_sha1 >out 2>actual &&
+ test_must_be_empty out &&
+ test_cmp expect actual
+ fi
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on missing short OID" '
+ cat >expect.err <<-EOF &&
+ fatal: Not a valid object name $(test_oid deadbeef_short)
+ EOF
+ test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+ test_must_be_empty out
+ '
+
+ test_expect_success "cat-file $arg1 $arg2 error on missing full OID" '
+ if test "$arg2" = "-p"
+ then
+ cat >expect.err <<-EOF
+ fatal: Not a valid object name $(test_oid deadbeef)
+ EOF
+ else
+ cat >expect.err <<-\EOF
+ fatal: git cat-file: could not get object info
+ EOF
+ fi &&
+ test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+ test_must_be_empty out &&
+ test_cmp expect.err err.actual
+ '
+ done
+done
+
+test_expect_success '-e is OK with a broken object without --allow-unknown-type' '
+ git cat-file -e $bogus_short_sha1
+'
+
+test_expect_success '-e can not be combined with --allow-unknown-type' '
+ test_expect_code 128 git cat-file -e --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '-p cannot print a broken object even with --allow-unknown-type' '
+ test_must_fail git cat-file -p $bogus_short_sha1 &&
+ test_expect_code 128 git cat-file -p --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '<type> <hash> does not work with objects of broken types' '
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type "bogus"
+ EOF
+ test_must_fail git cat-file $bogus_short_type $bogus_short_sha1 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
+test_expect_success 'broken types combined with --batch and --batch-check' '
+ echo $bogus_short_sha1 >bogus-oid &&
+
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+
+ test_must_fail git cat-file --batch <bogus-oid 2>err.actual &&
+ test_cmp err.expect err.actual &&
+
+ test_must_fail git cat-file --batch-check <bogus-oid 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
+test_expect_success 'the --batch and --batch-check options do not combine with --allow-unknown-type' '
+ test_expect_code 128 git cat-file --batch --allow-unknown-type <bogus-oid &&
+ test_expect_code 128 git cat-file --batch-check --allow-unknown-type <bogus-oid
+'
+
+test_expect_success 'the --allow-unknown-type option does not consider replacement refs' '
+ cat >expect <<-EOF &&
+ $bogus_short_type
+ EOF
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+ test_cmp expect actual &&
+
+ # Create it manually, as "git replace" will die on bogus
+ # types.
+ head=$(git rev-parse --verify HEAD) &&
+ test_when_finished "rm -rf .git/refs/replace" &&
+ mkdir -p .git/refs/replace &&
+ echo $head >.git/refs/replace/$bogus_short_sha1 &&
+
+ cat >expect <<-EOF &&
+ commit
+ EOF
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+ test_cmp expect actual
+'
test_expect_success "Type of broken object is correct" '
- echo $bogus_type >expect &&
- git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_short_type >expect &&
+ git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
test_cmp expect actual
'
test_expect_success "Size of broken object is correct" '
- echo $bogus_size >expect &&
- git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_short_size >expect &&
+ git cat-file -s --allow-unknown-type $bogus_short_sha1 >actual &&
test_cmp expect actual
'
-bogus_type="abcdefghijklmnopqrstuvwxyz1234679"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+
+test_expect_success 'clean up broken object' '
+ rm .git/objects/$(test_oid_to_path $bogus_short_sha1)
+'
test_expect_success "Type of broken object is correct when type is large" '
- echo $bogus_type >expect &&
- git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_long_type >expect &&
+ git cat-file -t --allow-unknown-type $bogus_long_sha1 >actual &&
test_cmp expect actual
'
test_expect_success "Size of large broken object is correct when type is large" '
- echo $bogus_size >expect &&
- git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+ echo $bogus_long_size >expect &&
+ git cat-file -s --allow-unknown-type $bogus_long_sha1 >actual &&
test_cmp expect actual
'
+test_expect_success 'clean up broken object' '
+ rm .git/objects/$(test_oid_to_path $bogus_long_sha1)
+'
+
+test_expect_success 'cat-file -t and -s on corrupt loose object' '
+ git init --bare corrupt-loose.git &&
+ (
+ cd corrupt-loose.git &&
+
+ # Setup and create the empty blob and its path
+ empty_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$EMPTY_BLOB")) &&
+ git hash-object -w --stdin </dev/null &&
+
+ # Create another blob and its path
+ echo other >other.blob &&
+ other_blob=$(git hash-object -w --stdin <other.blob) &&
+ other_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$other_blob")) &&
+
+ # Before the swap the size is 0
+ cat >out.expect <<-EOF &&
+ 0
+ EOF
+ git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # Swap the two to corrupt the repository
+ mv -f "$other_path" "$empty_path" &&
+ test_must_fail git fsck 2>err.fsck &&
+ grep "hash-path mismatch" err.fsck &&
+
+ # confirm that cat-file is reading the new swapped-in
+ # blob...
+ cat >out.expect <<-EOF &&
+ blob
+ EOF
+ git cat-file -t "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # ... since it has a different size now.
+ cat >out.expect <<-EOF &&
+ 6
+ EOF
+ git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+ test_must_be_empty err.actual &&
+ test_cmp out.expect out.actual &&
+
+ # So far "cat-file" has been happy to spew the found
+ # content out as-is. Try to make it zlib-invalid.
+ mv -f other.blob "$empty_path" &&
+ test_must_fail git fsck 2>err.fsck &&
+ grep "^error: inflate: data stream error (" err.fsck
+ )
+'
+
# Tests for git cat-file --follow-symlinks
test_expect_success 'prep for symlink tests' '
echo_without_newline "$hello_content" >morx &&
@@ -608,4 +807,70 @@
cmp expect actual
'
+test_expect_success 'set up replacement object' '
+ orig=$(git rev-parse HEAD) &&
+ git cat-file commit $orig >orig &&
+ {
+ cat orig &&
+ echo extra
+ } >fake &&
+ fake=$(git hash-object -t commit -w fake) &&
+ orig_size=$(git cat-file -s $orig) &&
+ fake_size=$(git cat-file -s $fake) &&
+ git replace $orig $fake
+'
+
+test_expect_success 'cat-file --batch respects replace objects' '
+ git cat-file --batch >actual <<-EOF &&
+ $orig
+ EOF
+ {
+ echo "$orig commit $fake_size" &&
+ cat fake &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-check respects replace objects' '
+ git cat-file --batch-check >actual <<-EOF &&
+ $orig
+ EOF
+ echo "$orig commit $fake_size" >expect &&
+ test_cmp expect actual
+'
+
+# Pull the entry for object with oid "$1" out of the output of
+# "cat-file --batch", including its object content (which requires
+# parsing and reading a set amount of bytes, hence perl).
+extract_batch_output () {
+ perl -ne '
+ BEGIN { $oid = shift }
+ if (/^$oid \S+ (\d+)$/) {
+ print;
+ read STDIN, my $buf, $1;
+ print $buf;
+ print "\n";
+ }
+ ' "$@"
+}
+
+test_expect_success 'cat-file --batch-all-objects --batch ignores replace' '
+ git cat-file --batch-all-objects --batch >actual.raw &&
+ extract_batch_output $orig <actual.raw >actual &&
+ {
+ echo "$orig commit $orig_size" &&
+ cat orig &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-all-objects --batch-check ignores replace' '
+ git cat-file --batch-all-objects --batch-check >actual.raw &&
+ grep ^$orig actual.raw >actual &&
+ echo "$orig commit $orig_size" >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh
index 2935f68..fc179ac 100755
--- a/t/t1009-read-tree-new-index.sh
+++ b/t/t1009-read-tree-new-index.sh
@@ -5,6 +5,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index b946f87..48bfad0 100755
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -2,6 +2,7 @@
test_description='git mktree'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh
index 57f0770..cde93d2 100755
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
@@ -2,6 +2,7 @@
test_description='read-tree D/F conflict corner cases'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
index b6df744..bfc90d4 100755
--- a/t/t1013-read-tree-submodule.sh
+++ b/t/t1013-read-tree-submodule.sh
@@ -6,7 +6,6 @@
. "$TEST_DIRECTORY"/lib-submodule-update.sh
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
test_submodule_switch_recursing_with_args "read-tree -u -m"
diff --git a/t/t1014-read-tree-confusing.sh b/t/t1014-read-tree-confusing.sh
index da3376b..8ea8d36 100755
--- a/t/t1014-read-tree-confusing.sh
+++ b/t/t1014-read-tree-confusing.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='check that read-tree rejects confusing paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create base tree' '
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 4bab6a5..6bc1d76 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -17,6 +17,14 @@
export GIT_ALLOC_LIMIT
'
+test_expect_success 'enter "large" codepath, with small core.bigFileThreshold' '
+ test_when_finished "rm -rf repo" &&
+
+ git init --bare repo &&
+ echo large | git -C repo hash-object -w --stdin &&
+ git -C repo -c core.bigfilethreshold=4 fsck
+'
+
# add a large file with different settings
while read expect config
do
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 38fc834..272ba1b 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -206,16 +206,21 @@
'
test_expect_success 'sparse-index enabled and disabled' '
- git -C repo sparse-checkout init --cone --sparse-index &&
- test_cmp_config -C repo true index.sparse &&
- test-tool -C repo read-cache --table >cache &&
- grep " tree " cache &&
+ (
+ sane_unset GIT_TEST_SPLIT_INDEX &&
+ git -C repo update-index --no-split-index &&
- git -C repo sparse-checkout disable &&
- test-tool -C repo read-cache --table >cache &&
- ! grep " tree " cache &&
- git -C repo config --list >config &&
- ! grep index.sparse config
+ git -C repo sparse-checkout init --cone --sparse-index &&
+ test_cmp_config -C repo true index.sparse &&
+ test-tool -C repo read-cache --table >cache &&
+ grep " tree " cache &&
+
+ git -C repo sparse-checkout disable &&
+ test-tool -C repo read-cache --table >cache &&
+ ! grep " tree " cache &&
+ git -C repo config --list >config &&
+ ! grep index.sparse config
+ )
'
test_expect_success 'cone mode: init and set' '
@@ -406,7 +411,7 @@
git -C unmerged sparse-checkout disable
'
-test_expect_success 'sparse-checkout reapply' '
+test_expect_failure 'sparse-checkout reapply' '
git clone repo tweak &&
echo dirty >tweak/deep/deeper2/a &&
@@ -438,6 +443,8 @@
test_i18ngrep "warning.*The following paths are unmerged" err &&
test_path_is_file tweak/folder1/a &&
+ # NEEDSWORK: We are asking to update a file outside of the
+ # sparse-checkout cone, but this is no longer allowed.
git -C tweak add folder1/a &&
git -C tweak sparse-checkout reapply 2>err &&
test_must_be_empty err &&
@@ -642,4 +649,63 @@
check_files repo/deep a deeper1
'
+test_expect_success 'cone mode clears ignored subdirectories' '
+ rm repo/.git/info/sparse-checkout &&
+
+ git -C repo sparse-checkout init --cone &&
+ git -C repo sparse-checkout set deep/deeper1 &&
+
+ cat >repo/.gitignore <<-\EOF &&
+ obj/
+ *.o
+ EOF
+
+ git -C repo add .gitignore &&
+ git -C repo commit -m ".gitignore" &&
+
+ mkdir -p repo/obj repo/folder1/obj repo/deep/deeper2/obj &&
+ for file in folder1/obj/a obj/a folder1/file.o folder1.o \
+ deep/deeper2/obj/a deep/deeper2/file.o file.o
+ do
+ echo ignored >repo/$file || return 1
+ done &&
+
+ git -C repo status --porcelain=v2 >out &&
+ test_must_be_empty out &&
+
+ git -C repo sparse-checkout reapply &&
+ test_path_is_missing repo/folder1 &&
+ test_path_is_missing repo/deep/deeper2 &&
+ test_path_is_dir repo/obj &&
+ test_path_is_file repo/file.o &&
+
+ git -C repo status --porcelain=v2 >out &&
+ test_must_be_empty out &&
+
+ git -C repo sparse-checkout set deep/deeper2 &&
+ test_path_is_missing repo/deep/deeper1 &&
+ test_path_is_dir repo/deep/deeper2 &&
+ test_path_is_dir repo/obj &&
+ test_path_is_file repo/file.o &&
+
+ >repo/deep/deeper2/ignored.o &&
+ >repo/deep/deeper2/untracked &&
+
+ # When an untracked file is in the way, all untracked files
+ # (even ignored files) are preserved.
+ git -C repo sparse-checkout set folder1 2>err &&
+ grep "contains untracked files" err &&
+ test_path_is_file repo/deep/deeper2/ignored.o &&
+ test_path_is_file repo/deep/deeper2/untracked &&
+
+ # The rest of the cone matches expectation
+ test_path_is_missing repo/deep/deeper1 &&
+ test_path_is_dir repo/obj &&
+ test_path_is_file repo/file.o &&
+
+ git -C repo status --porcelain=v2 >out &&
+ echo "? deep/deeper2/untracked" >expect &&
+ test_cmp expect out
+'
+
test_done
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 91e30d6..16fbd2c 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -47,7 +47,7 @@
git checkout -b base &&
for dir in folder1 folder2 deep
do
- git checkout -b update-$dir &&
+ git checkout -b update-$dir base &&
echo "updated $dir" >$dir/a &&
git commit -a -m "update $dir" || return 1
done &&
@@ -114,6 +114,16 @@
git add . &&
git commit -m "file to dir" &&
+ for side in left right
+ do
+ git checkout -b merge-$side base &&
+ echo $side >>deep/deeper2/a &&
+ echo $side >>folder1/a &&
+ echo $side >>folder2/a &&
+ git add . &&
+ git commit -m "$side" || return 1
+ done &&
+
git checkout -b deepest base &&
echo "updated deepest" >deep/deeper1/deepest/a &&
git commit -a -m "update deepest" &&
@@ -177,6 +187,16 @@
test_cmp sparse-checkout-err sparse-index-err
}
+test_sparse_unstaged () {
+ file=$1 &&
+ for repo in sparse-checkout sparse-index
+ do
+ # Skip "unmerged" paths
+ git -C $repo diff --staged --diff-filter=u -- "$file" >diff &&
+ test_must_be_empty diff || return 1
+ done
+}
+
test_expect_success 'sparse-index contents' '
init_repos &&
@@ -281,6 +301,20 @@
test_all_match git checkout -
'
+test_expect_success 'add outside sparse cone' '
+ init_repos &&
+
+ run_on_sparse mkdir folder1 &&
+ run_on_sparse ../edit-contents folder1/a &&
+ run_on_sparse ../edit-contents folder1/newfile &&
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_sparse_match test_must_fail git add folder1/newfile &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/newfile
+'
+
test_expect_success 'commit including unstaged changes' '
init_repos &&
@@ -312,9 +346,6 @@
test_expect_success 'status/add: outside sparse cone' '
init_repos &&
- # adding a "missing" file outside the cone should fail
- test_sparse_match test_must_fail git add folder1/a &&
-
# folder1 is at HEAD, but outside the sparse cone
run_on_sparse mkdir folder1 &&
cp initial-repo/folder1/a sparse-checkout/folder1/a &&
@@ -330,21 +361,29 @@
test_sparse_match git status --porcelain=v2 &&
- # This "git add folder1/a" fails with a warning
- # in the sparse repos, differing from the full
- # repo. This is intentional.
+ # Adding the path outside of the sparse-checkout cone should fail.
test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
test_sparse_match test_must_fail git add --refresh folder1/a &&
- test_all_match git status --porcelain=v2 &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_sparse_match test_must_fail git add folder1/new &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/new &&
+ test_sparse_match git add --sparse folder1/a &&
+ test_sparse_match git add --sparse folder1/new &&
- test_all_match git add . &&
+ test_all_match git add --sparse . &&
test_all_match git status --porcelain=v2 &&
test_all_match git commit -m folder1/new &&
+ test_all_match git rev-parse HEAD^{tree} &&
run_on_all ../edit-contents folder1/newer &&
- test_all_match git add folder1/ &&
+ test_all_match git add --sparse folder1/ &&
test_all_match git status --porcelain=v2 &&
- test_all_match git commit -m folder1/newer
+ test_all_match git commit -m folder1/newer &&
+ test_all_match git rev-parse HEAD^{tree}
'
test_expect_success 'checkout and reset --hard' '
@@ -472,16 +511,97 @@
test_sparse_match git reset update-folder2
'
-test_expect_success 'merge' '
+test_expect_success 'merge, cherry-pick, and rebase' '
init_repos &&
- test_all_match git checkout -b merge update-deep &&
- test_all_match git merge -m "folder1" update-folder1 &&
- test_all_match git rev-parse HEAD^{tree} &&
- test_all_match git merge -m "folder2" update-folder2 &&
+ for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
+ do
+ test_all_match git checkout -B temp update-deep &&
+ test_all_match git $OPERATION update-folder1 &&
+ test_all_match git rev-parse HEAD^{tree} &&
+ test_all_match git $OPERATION update-folder2 &&
+ test_all_match git rev-parse HEAD^{tree} || return 1
+ done
+'
+
+test_expect_success 'merge with conflict outside cone' '
+ init_repos &&
+
+ test_all_match git checkout -b merge-tip merge-left &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match test_must_fail git merge -m merge merge-right &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Resolve the conflict in different ways:
+ # 1. Revert to the base
+ test_all_match git checkout base -- deep/deeper2/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # 2. Add the file with conflict markers
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_all_match git add --sparse folder1/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # 3. Rename the file to another sparse filename and
+ # accept conflict markers as resolved content.
+ run_on_all mv folder2/a folder2/z &&
+ test_sparse_match test_must_fail git add folder2 &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder2/z &&
+ test_all_match git add --sparse folder2 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git merge --continue &&
+ test_all_match git status --porcelain=v2 &&
test_all_match git rev-parse HEAD^{tree}
'
+test_expect_success 'cherry-pick/rebase with conflict outside cone' '
+ init_repos &&
+
+ for OPERATION in cherry-pick rebase
+ do
+ test_all_match git checkout -B tip &&
+ test_all_match git reset --hard merge-left &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match test_must_fail git $OPERATION merge-right &&
+ test_all_match git status --porcelain=v2 &&
+
+ # Resolve the conflict in different ways:
+ # 1. Revert to the base
+ test_all_match git checkout base -- deep/deeper2/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # 2. Add the file with conflict markers
+ # NEEDSWORK: Even though the merge conflict removed the
+ # SKIP_WORKTREE bit from the index entry for folder1/a, we should
+ # warn that this is a problematic add.
+ test_sparse_match test_must_fail git add folder1/a &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder1/a &&
+ test_all_match git add --sparse folder1/a &&
+ test_all_match git status --porcelain=v2 &&
+
+ # 3. Rename the file to another sparse filename and
+ # accept conflict markers as resolved content.
+ # NEEDSWORK: This mode now fails, because folder2/z is
+ # outside of the sparse-checkout cone and does not match an
+ # existing index entry with the SKIP_WORKTREE bit cleared.
+ run_on_all mv folder2/a folder2/z &&
+ test_sparse_match test_must_fail git add folder2 &&
+ grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+ test_sparse_unstaged folder2/z &&
+ test_all_match git add --sparse folder2 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git $OPERATION --continue &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git rev-parse HEAD^{tree} || return 1
+ done
+'
+
test_expect_success 'merge with outside renames' '
init_repos &&
@@ -549,6 +669,7 @@
test_expect_success 'submodule handling' '
init_repos &&
+ test_sparse_match git sparse-checkout add modules &&
test_all_match mkdir modules &&
test_all_match touch modules/a &&
test_all_match git add modules &&
@@ -558,6 +679,7 @@
test_all_match git commit -m "add submodule" &&
# having a submodule prevents "modules" from collapse
+ test_sparse_match git sparse-checkout set deep/deeper1 &&
test-tool -C sparse-index read-cache --table >cache &&
grep "100644 blob .* modules/a" cache &&
grep "160000 commit $(git -C initial-repo rev-parse HEAD) modules/sub" cache
@@ -575,8 +697,17 @@
ensure_not_expanded () {
rm -f trace2.txt &&
echo >>sparse-index/untracked.txt &&
- GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
- git -C sparse-index "$@" &&
+
+ if test "$1" = "!"
+ then
+ shift &&
+ test_must_fail env \
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index "$@" || return 1
+ else
+ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ git -C sparse-index "$@" || return 1
+ fi &&
test_region ! index ensure_full_index trace2.txt
}
@@ -598,7 +729,42 @@
git -C sparse-index reset --hard &&
ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
git -C sparse-index reset --hard &&
- ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1
+ ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
+
+ echo >>sparse-index/README.md &&
+ ensure_not_expanded add -A &&
+ echo >>sparse-index/extra.txt &&
+ ensure_not_expanded add extra.txt &&
+ echo >>sparse-index/untracked.txt &&
+ ensure_not_expanded add . &&
+
+ ensure_not_expanded checkout -f update-deep &&
+ test_config -C sparse-index pull.twohead ort &&
+ (
+ sane_unset GIT_TEST_MERGE_ALGORITHM &&
+ for OPERATION in "merge -m merge" cherry-pick rebase
+ do
+ ensure_not_expanded merge -m merge update-folder1 &&
+ ensure_not_expanded merge -m merge update-folder2 || return 1
+ done
+ )
+'
+
+test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
+ init_repos &&
+
+ for side in right left
+ do
+ git -C sparse-index checkout -b expand-$side base &&
+ echo $side >sparse-index/deep/a &&
+ git -C sparse-index commit -a -m "$side" || return 1
+ done &&
+
+ (
+ sane_unset GIT_TEST_MERGE_ALGORITHM &&
+ git -C sparse-index config pull.twohead ort &&
+ ensure_not_expanded ! merge -m merged expand-right
+ )
'
# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index ae66ba5..0f37a43 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -12,6 +12,7 @@
"flags first and then non flag arguments" command line.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
cat >expected <<EOF
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index ccbb116..5cde79e 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -1,6 +1,7 @@
#!/bin/sh
test_description='test config file include directives'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Force setup_explicit_git_dir() to run until the end. This is needed
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index a237d98..49718b7 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -9,12 +9,18 @@
RUN="test-tool ref-store main"
-test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
- test_commit one &&
+
+test_expect_success 'setup' '
+ test_commit one
+'
+
+test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
N=`find .git/refs -type f | wc -l` &&
test "$N" != 0 &&
- $RUN pack-refs 3 &&
- N=`find .git/refs -type f | wc -l`
+ ALL_OR_PRUNE_FLAG=3 &&
+ $RUN pack-refs ${ALL_OR_PRUNE_FLAG} &&
+ N=`find .git/refs -type f` &&
+ test -z "$N"
'
test_expect_success 'create_symref(FOO, refs/heads/main)' '
@@ -98,12 +104,12 @@
test_expect_success 'delete_reflog(HEAD)' '
$RUN delete-reflog HEAD &&
- ! test -f .git/logs/HEAD
+ test_must_fail git reflog exists HEAD
'
test_expect_success 'create-reflog(HEAD)' '
$RUN create-reflog HEAD 1 &&
- test -f .git/logs/HEAD
+ git reflog exists HEAD
'
test_expect_success 'delete_ref(refs/heads/foo)' '
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 27b9080..d42f067 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -374,7 +374,9 @@
test_line_count = 3 actual
'
-test_expect_success 'reflog expire operates on symref not referrent' '
+# This test takes a lock on an individual ref; this is not supported in
+# reftable.
+test_expect_success REFFILES 'reflog expire operates on symref not referrent' '
git branch --create-reflog the_symref &&
git branch --create-reflog referrent &&
git update-ref referrent HEAD &&
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index b1839e0..4c77cf8 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
@@ -170,7 +171,7 @@
! grep -e "badname" output &&
! grep -e "broken\.\.\.symref" output &&
test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
- test_i18ngrep "ignoring broken ref refs/heads/badname" error &&
+ test_i18ngrep ! "ignoring broken ref refs/heads/badname" error &&
test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
'
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 5071ac6..6337236 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -48,24 +48,70 @@
rm "$(sha1_file "$1")"
}
-test_expect_success 'object with bad sha1' '
- sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(test_oid_to_path "$sha") &&
- new=$(dirname $old)/$(test_oid ff_2) &&
- sha="$(dirname $new)$(basename $new)" &&
- mv .git/objects/$old .git/objects/$new &&
- test_when_finished "remove_object $sha" &&
- git update-index --add --cacheinfo 100644 $sha foo &&
- test_when_finished "git read-tree -u --reset HEAD" &&
- tree=$(git write-tree) &&
- test_when_finished "remove_object $tree" &&
- cmt=$(echo bogus | git commit-tree $tree) &&
- test_when_finished "remove_object $cmt" &&
- git update-ref refs/heads/bogus $cmt &&
- test_when_finished "git update-ref -d refs/heads/bogus" &&
+test_expect_success 'object with hash mismatch' '
+ git init --bare hash-mismatch &&
+ (
+ cd hash-mismatch &&
- test_must_fail git fsck 2>out &&
- test_i18ngrep "$sha.*corrupt" out
+ oid=$(echo blob | git hash-object -w --stdin) &&
+ oldoid=$oid &&
+ old=$(test_oid_to_path "$oid") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
+ oid="$(dirname $new)$(basename $new)" &&
+
+ mv objects/$old objects/$new &&
+ git update-index --add --cacheinfo 100644 $oid foo &&
+ tree=$(git write-tree) &&
+ cmt=$(echo bogus | git commit-tree $tree) &&
+ git update-ref refs/heads/bogus $cmt &&
+
+ test_must_fail git fsck 2>out &&
+ grep "$oldoid: hash-path mismatch, found at: .*$new" out
+ )
+'
+
+test_expect_success 'object with hash and type mismatch' '
+ git init --bare hash-type-mismatch &&
+ (
+ cd hash-type-mismatch &&
+
+ oid=$(echo blob | git hash-object -w --stdin -t garbage --literally) &&
+ oldoid=$oid &&
+ old=$(test_oid_to_path "$oid") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
+ oid="$(dirname $new)$(basename $new)" &&
+
+ mv objects/$old objects/$new &&
+ git update-index --add --cacheinfo 100644 $oid foo &&
+ tree=$(git write-tree) &&
+ cmt=$(echo bogus | git commit-tree $tree) &&
+ git update-ref refs/heads/bogus $cmt &&
+
+
+ test_must_fail git fsck 2>out &&
+ grep "^error: $oldoid: hash-path mismatch, found at: .*$new" out &&
+ grep "^error: $oldoid: object is of unknown type '"'"'garbage'"'"'" out
+ )
+'
+
+test_expect_success POSIXPERM 'zlib corrupt loose object output ' '
+ git init --bare corrupt-loose-output &&
+ (
+ cd corrupt-loose-output &&
+ oid=$(git hash-object -w --stdin --literally </dev/null) &&
+ oidf=objects/$(test_oid_to_path "$oid") &&
+ chmod 755 $oidf &&
+ echo extra garbage >>$oidf &&
+
+ cat >expect.error <<-EOF &&
+ error: garbage at end of loose object '\''$oid'\''
+ error: unable to unpack contents of ./$oidf
+ error: $oid: object corrupt or missing: ./$oidf
+ EOF
+ test_must_fail git fsck 2>actual &&
+ grep ^error: actual >error &&
+ test_cmp expect.error error
+ )
'
test_expect_success 'branch pointing to non-commit' '
@@ -865,4 +911,21 @@
test_i18ngrep "bad index file" errors
'
+test_expect_success 'fsck error and recovery on invalid object type' '
+ git init --bare garbage-type &&
+ (
+ cd garbage-type &&
+
+ garbage_blob=$(git hash-object --stdin -w -t garbage --literally </dev/null) &&
+
+ cat >err.expect <<-\EOF &&
+ fatal: invalid object type
+ EOF
+ test_must_fail git fsck >out 2>err &&
+ grep -e "^error" -e "^fatal" err >errors &&
+ test_line_count = 1 errors &&
+ grep "$garbage_blob: object is of unknown type '"'"'garbage'"'"':" err
+ )
+'
+
test_done
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index b29563f..284fe18 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -282,4 +282,58 @@
test_cmp expect output
'
+test_expect_success 'test --parseopt help output: "wrapped" options normal "or:" lines' '
+ sed -e "s/^|//" >spec <<-\EOF &&
+ |cmd [--some-option]
+ | [--another-option]
+ |cmd [--yet-another-option]
+ |--
+ |h,help show the help
+ EOF
+
+ sed -e "s/^|//" >expect <<-\END_EXPECT &&
+ |cat <<\EOF
+ |usage: cmd [--some-option]
+ | or: [--another-option]
+ | or: cmd [--yet-another-option]
+ |
+ | -h, --help show the help
+ |
+ |EOF
+ END_EXPECT
+
+ test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'test --parseopt help output: multi-line blurb after empty line' '
+ sed -e "s/^|//" >spec <<-\EOF &&
+ |cmd [--some-option]
+ | [--another-option]
+ |
+ |multi
+ |line
+ |blurb
+ |--
+ |h,help show the help
+ EOF
+
+ sed -e "s/^|//" >expect <<-\END_EXPECT &&
+ |cat <<\EOF
+ |usage: cmd [--some-option]
+ | or: [--another-option]
+ |
+ | multi
+ | line
+ | blurb
+ |
+ | -h, --help show the help
+ |
+ |EOF
+ END_EXPECT
+
+ test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index bf08102..4095861 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -142,7 +142,7 @@
test_must_fail git rev-parse --verify main@{$Np1}
'
-test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
+test_expect_success SYMLINKS,REFFILES 'ref resolution not confused by broken symlinks' '
ln -s does-not-exist .git/refs/heads/broken &&
test_must_fail git rev-parse --verify broken
'
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh
index 3d51615..0fafcf9 100755
--- a/t/t1504-ceiling-dirs.sh
+++ b/t/t1504-ceiling-dirs.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='test GIT_CEILING_DIRECTORIES'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_prefix() {
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index bbfe05b..591505a 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -43,6 +43,7 @@
# This test heavily relies on the standard error of nested function calls.
test_untraceable=UnfortunatelyYes
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
here=$(pwd)
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index c9b9e71..46329c4 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -4,6 +4,8 @@
. ./test-lib.sh
+sane_unset GIT_TEST_SPLIT_INDEX
+
test_expect_success 'setup' '
echo 1 >a
'
@@ -13,7 +15,8 @@
rm -f .git/index &&
GIT_INDEX_VERSION=2bogus &&
export GIT_INDEX_VERSION &&
- git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+ git add a 2>err &&
+ sed "s/[0-9]//" err >actual.err &&
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
@@ -27,7 +30,8 @@
rm -f .git/index &&
GIT_INDEX_VERSION=1 &&
export GIT_INDEX_VERSION &&
- git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+ git add a 2>err &&
+ sed "s/[0-9]//" err >actual.err &&
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
@@ -50,7 +54,8 @@
sane_unset GIT_INDEX_VERSION &&
rm -f .git/index &&
git config --add index.version 1 &&
- git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+ git add a 2>err &&
+ sed "s/[0-9]//" err >actual.err &&
sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
warning: index.version set, but the value is invalid.
Using version Z
@@ -79,7 +84,7 @@
else
unset GIT_INDEX_VERSION
fi &&
- git add a 2>&1 &&
+ git add a &&
echo $EXPECTED_OUTPUT_VERSION >expect &&
test-tool index-version <.git/index >actual &&
test_cmp expect actual
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 986baa6..decd252 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -510,4 +510,38 @@
)
'
+test_expect_success 'reading split index at alternate location' '
+ git init reading-alternate-location &&
+ (
+ cd reading-alternate-location &&
+ >file-in-alternate &&
+ git update-index --split-index --add file-in-alternate
+ ) &&
+ echo file-in-alternate >expect &&
+
+ # Should be able to find the shared index both right next to
+ # the specified split index file ...
+ GIT_INDEX_FILE=./reading-alternate-location/.git/index \
+ git ls-files --cached >actual &&
+ test_cmp expect actual &&
+
+ # ... and, for backwards compatibility, in the current GIT_DIR
+ # as well.
+ mv -v ./reading-alternate-location/.git/sharedindex.* .git &&
+ GIT_INDEX_FILE=./reading-alternate-location/.git/index \
+ git ls-files --cached >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'GIT_TEST_SPLIT_INDEX works' '
+ git init git-test-split-index &&
+ (
+ cd git-test-split-index &&
+ >file &&
+ GIT_TEST_SPLIT_INDEX=1 git update-index --add file &&
+ ls -l .git/sharedindex.* >actual &&
+ test_line_count = 1 actual
+ )
+'
+
test_done
diff --git a/t/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh
index 70361c8..fc95cf9 100755
--- a/t/t2002-checkout-cache-u.sh
+++ b/t/t2002-checkout-cache-u.sh
@@ -8,6 +8,7 @@
With -u flag, git checkout-index internally runs the equivalent of
git update-index --refresh on the checked out entry.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh
index ff163cf..f0fd441 100755
--- a/t/t2003-checkout-cache-mkdir.sh
+++ b/t/t2003-checkout-cache-mkdir.sh
@@ -10,6 +10,7 @@
the GIT controlled paths.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index a9352b0..9bb503a 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -8,6 +8,7 @@
With --temp flag, git checkout-index writes to temporary merge files
rather than the tracked path.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t2005-checkout-index-symlinks.sh b/t/t2005-checkout-index-symlinks.sh
index 9fa5610..112682a 100755
--- a/t/t2005-checkout-index-symlinks.sh
+++ b/t/t2005-checkout-index-symlinks.sh
@@ -8,6 +8,7 @@
This tests that git checkout-index creates a symbolic link as a plain
file if core.symlinks is false.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
index 70d6926..660132f 100755
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -48,6 +48,7 @@
test_expect_success SYMLINKS 'the symlink remained' '
+ test_when_finished "rm a/b" &&
test -h a/b
'
diff --git a/t/t2050-git-dir-relative.sh b/t/t2050-git-dir-relative.sh
index 21f4659..1f193cd 100755
--- a/t/t2050-git-dir-relative.sh
+++ b/t/t2050-git-dir-relative.sh
@@ -12,6 +12,7 @@
and tries commits from the top and the subdir, checking
that the commit-hook still gets called.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
COMMIT_FILE="$(pwd)/output"
diff --git a/t/t2081-parallel-checkout-collisions.sh b/t/t2081-parallel-checkout-collisions.sh
index f6fcfc0..6acdb89 100755
--- a/t/t2081-parallel-checkout-collisions.sh
+++ b/t/t2081-parallel-checkout-collisions.sh
@@ -11,6 +11,7 @@
both these mechanics.
"
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 45ca35d..94c4cb0 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -129,12 +129,15 @@
echo "remove '\''top'\''"
) >expect &&
before=$(git ls-files -s check top) &&
+ git count-objects -v >objects_before &&
echo changed >>check &&
rm -f top &&
git add -n -u >actual &&
after=$(git ls-files -s check top) &&
+ git count-objects -v >objects_after &&
test "$before" = "$after" &&
+ test_cmp objects_before objects_after &&
test_cmp expect actual
'
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index c8de6d8..b40eeb2 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -2,6 +2,7 @@
test_description='cd_to_toplevel'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
EXEC_PATH="$(git --exec-path)"
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index fedcefe..4012bd6 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -230,7 +230,7 @@
EOF
cd linked &&
echo "worktree $(pwd)" >expected &&
- echo "ref: .broken" >../.git/HEAD &&
+ (cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
git worktree list --porcelain >out &&
head -n 3 out >actual &&
test_cmp ../expected actual &&
diff --git a/t/t2500-untracked-overwriting.sh b/t/t2500-untracked-overwriting.sh
new file mode 100755
index 0000000..5c0bf4d
--- /dev/null
+++ b/t/t2500-untracked-overwriting.sh
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+test_description='Test handling of overwriting untracked files'
+
+. ./test-lib.sh
+
+test_setup_reset () {
+ git init reset_$1 &&
+ (
+ cd reset_$1 &&
+ test_commit init &&
+
+ git branch stable &&
+ git branch work &&
+
+ git checkout work &&
+ test_commit foo &&
+
+ git checkout stable
+ )
+}
+
+test_expect_success 'reset --hard will nuke untracked files/dirs' '
+ test_setup_reset hard &&
+ (
+ cd reset_hard &&
+ git ls-tree -r stable &&
+ git log --all --name-status --oneline &&
+ git ls-tree -r work &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ echo foo >expect &&
+
+ git reset --hard work &&
+
+ # check that untracked directory foo.t/ was nuked
+ test_path_is_file foo.t &&
+ test_cmp expect foo.t
+ )
+'
+
+test_expect_success 'reset --merge will preserve untracked files/dirs' '
+ test_setup_reset merge &&
+ (
+ cd reset_merge &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ cp foo.t/file expect &&
+
+ test_must_fail git reset --merge work 2>error &&
+ test_cmp expect foo.t/file &&
+ grep "Updating .foo.t. would lose untracked files" error
+ )
+'
+
+test_expect_success 'reset --keep will preserve untracked files/dirs' '
+ test_setup_reset keep &&
+ (
+ cd reset_keep &&
+
+ mkdir foo.t &&
+ echo precious >foo.t/file &&
+ cp foo.t/file expect &&
+
+ test_must_fail git reset --merge work 2>error &&
+ test_cmp expect foo.t/file &&
+ grep "Updating.*foo.t.*would lose untracked files" error
+ )
+'
+
+test_setup_checkout_m () {
+ git init checkout &&
+ (
+ cd checkout &&
+ test_commit init &&
+
+ test_write_lines file has some >filler &&
+ git add filler &&
+ git commit -m filler &&
+
+ git branch stable &&
+
+ git switch -c work &&
+ echo stuff >notes.txt &&
+ test_write_lines file has some words >filler &&
+ git add notes.txt filler &&
+ git commit -m filler &&
+
+ git checkout stable
+ )
+}
+
+test_expect_success 'checkout -m does not nuke untracked file' '
+ test_setup_checkout_m &&
+ (
+ cd checkout &&
+
+ # Tweak filler
+ test_write_lines this file has some >filler &&
+ # Make an untracked file, save its contents in "expect"
+ echo precious >notes.txt &&
+ cp notes.txt expect &&
+
+ test_must_fail git checkout -m work &&
+ test_cmp expect notes.txt
+ )
+'
+
+test_setup_sequencing () {
+ git init sequencing_$1 &&
+ (
+ cd sequencing_$1 &&
+ test_commit init &&
+
+ test_write_lines this file has some words >filler &&
+ git add filler &&
+ git commit -m filler &&
+
+ mkdir -p foo/bar &&
+ test_commit foo/bar/baz &&
+
+ git branch simple &&
+ git branch fooey &&
+
+ git checkout fooey &&
+ git rm foo/bar/baz.t &&
+ echo stuff >>filler &&
+ git add -u &&
+ git commit -m "changes" &&
+
+ git checkout simple &&
+ echo items >>filler &&
+ echo newstuff >>newfile &&
+ git add filler newfile &&
+ git commit -m another
+ )
+}
+
+test_expect_success 'git rebase --abort and untracked files' '
+ test_setup_sequencing rebase_abort_and_untracked &&
+ (
+ cd sequencing_rebase_abort_and_untracked &&
+ git checkout fooey &&
+ test_must_fail git rebase simple &&
+
+ cat init.t &&
+ git rm init.t &&
+ echo precious >init.t &&
+ cp init.t expect &&
+ git status --porcelain &&
+ test_must_fail git rebase --abort &&
+ test_cmp expect init.t
+ )
+'
+
+test_expect_success 'git rebase fast forwarding and untracked files' '
+ test_setup_sequencing rebase_fast_forward_and_untracked &&
+ (
+ cd sequencing_rebase_fast_forward_and_untracked &&
+ git checkout init &&
+ echo precious >filler &&
+ cp filler expect &&
+ test_must_fail git rebase init simple &&
+ test_cmp expect filler
+ )
+'
+
+test_expect_failure 'git rebase --autostash and untracked files' '
+ test_setup_sequencing rebase_autostash_and_untracked &&
+ (
+ cd sequencing_rebase_autostash_and_untracked &&
+ git checkout simple &&
+ git rm filler &&
+ mkdir filler &&
+ echo precious >filler/file &&
+ cp filler/file expect &&
+ git rebase --autostash init &&
+ test_path_is_file filler/file
+ )
+'
+
+test_expect_failure 'git stash and untracked files' '
+ test_setup_sequencing stash_and_untracked_files &&
+ (
+ cd sequencing_stash_and_untracked_files &&
+ git checkout simple &&
+ git rm filler &&
+ mkdir filler &&
+ echo precious >filler/file &&
+ cp filler/file expect &&
+ git status --porcelain &&
+ git stash push &&
+ git status --porcelain &&
+ test_path_is_file filler/file
+ )
+'
+
+test_expect_success 'git am --abort and untracked dir vs. unmerged file' '
+ test_setup_sequencing am_abort_and_untracked &&
+ (
+ cd sequencing_am_abort_and_untracked &&
+ git format-patch -1 --stdout fooey >changes.mbox &&
+ test_must_fail git am --3way changes.mbox &&
+
+ # Delete the conflicted file; we will stage and commit it later
+ rm filler &&
+
+ # Put an unrelated untracked directory there
+ mkdir filler &&
+ echo foo >filler/file1 &&
+ echo bar >filler/file2 &&
+
+ test_must_fail git am --abort 2>errors &&
+ test_path_is_dir filler &&
+ grep "Updating .filler. would lose untracked files in it" errors
+ )
+'
+
+test_expect_success 'git am --skip and untracked dir vs deleted file' '
+ test_setup_sequencing am_skip_and_untracked &&
+ (
+ cd sequencing_am_skip_and_untracked &&
+ git checkout fooey &&
+ git format-patch -1 --stdout simple >changes.mbox &&
+ test_must_fail git am --3way changes.mbox &&
+
+ # Delete newfile
+ rm newfile &&
+
+ # Put an unrelated untracked directory there
+ mkdir newfile &&
+ echo foo >newfile/file1 &&
+ echo bar >newfile/file2 &&
+
+ # Change our mind about resolutions, just skip this patch
+ test_must_fail git am --skip 2>errors &&
+ test_path_is_dir newfile &&
+ grep "Updating .newfile. would lose untracked files in it" errors
+ )
+'
+
+test_done
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 740ce56..11af455 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -15,6 +15,8 @@
path3/file3 - a file in a directory
path4 - an empty directory
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup ' '
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 516c95e..48cec4e 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -8,6 +8,7 @@
This test runs git ls-files --others and tests --exclude patterns.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
rm -fr one three
@@ -102,7 +103,7 @@
>output &&
test_cmp expect output'
-test_expect_success 'restore gitignore' '
+test_expect_success !SANITIZE_LEAK 'restore gitignore' '
git checkout --ignore-skip-worktree-bits $allignores &&
rm .git/index
'
@@ -125,7 +126,7 @@
# three/
EOF
-test_expect_success 'git status honors core.excludesfile' \
+test_expect_success !SANITIZE_LEAK 'git status honors core.excludesfile' \
'test_cmp expect output'
test_expect_success 'trailing slash in exclude allows directory match(1)' '
diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh
index 8704b04..54d22a4 100755
--- a/t/t3002-ls-files-dashpath.sh
+++ b/t/t3002-ls-files-dashpath.sh
@@ -12,6 +12,8 @@
-foo - a file with a funny name.
-- - another file with a funny name.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t3003-ls-files-exclude.sh b/t/t3003-ls-files-exclude.sh
index c41c4f0..7933dff 100755
--- a/t/t3003-ls-files-exclude.sh
+++ b/t/t3003-ls-files-exclude.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='ls-files --exclude does not affect index files'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create repo with file' '
diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh
index 9fd5a1f..a16e25c 100755
--- a/t/t3004-ls-files-basic.sh
+++ b/t/t3004-ls-files-basic.sh
@@ -6,6 +6,7 @@
command-line arguments.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'ls-files in empty repository' '
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 727e9ae..6ba8b58 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -5,6 +5,7 @@
This test runs git ls-files with various relative path arguments.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'prepare' '
diff --git a/t/t3006-ls-files-long.sh b/t/t3006-ls-files-long.sh
index e109c3f..2aaf91e 100755
--- a/t/t3006-ls-files-long.sh
+++ b/t/t3006-ls-files-long.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='overly long paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 85f3704..51d3dff 100755
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -2,6 +2,7 @@
test_description='Test the lazy init name hash with various folder structures'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if test 1 -eq $(test-tool online-cpus)
diff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh
index 124e73b..2cbcbc0 100755
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@ -9,6 +9,8 @@
returns an error when a non-existent path is provided on the command
line.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 56ea4bd..72d5b01 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -2,6 +2,7 @@
test_description='wildmatch tests'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Disable expensive chain-lint tests; all of the tests in this script
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index 18baf49..436de44 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -16,6 +16,8 @@
The new path restriction code should do the right thing for path2 and
path2/baz. Also path0/ should snow nothing.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success \
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 12bf310..05fde64 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -19,6 +19,8 @@
Test the handling of multiple directories which have matching file
entries. Also test odd filename and missing entries handling.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index 1e16c6b..3942db2 100755
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -2,6 +2,7 @@
test_description='ls-tree with(out) globs'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh
index 1452091..d18ba1b 100755
--- a/t/t3103-ls-tree-misc.sh
+++ b/t/t3103-ls-tree-misc.sh
@@ -7,6 +7,7 @@
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 5325b9f..6e94c6d 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -340,6 +340,10 @@
test_cmp expect actual
'
+test_expect_success 'git branch with --format=%(rest) must fail' '
+ test_must_fail git branch --format="%(rest)" >actual
+'
+
test_expect_success 'worktree colors correct' '
cat >expect <<-EOF &&
* <GREEN>(HEAD detached from fromtag)<RESET>
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 08bd906..6a521c1 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'set up some sample branches' '
diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index 37b9d26..9cbc34f 100755
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'create annotated tag in refs/tags' '
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index f5bf16a..d3ac826 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -9,6 +9,7 @@
tree, index, and tree objects.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
HT=' '
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 052516e..6b2d507 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -46,8 +46,9 @@
test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z &&
- echo "ref: refs/notes/y" >expect &&
- test_cmp expect .git/NOTES_MERGE_REF
+ echo "refs/notes/y" >expect &&
+ git symbolic-ref NOTES_MERGE_REF >actual &&
+ test_cmp expect actual
'
test_expect_success 'merge z into y while mid-merge in another workdir fails' '
@@ -57,7 +58,7 @@
test_must_fail git notes merge z 2>err &&
test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
) &&
- test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
+ test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
'
test_expect_success 'merge z into x while mid-merge on y succeeds' '
@@ -68,8 +69,9 @@
test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
- echo "ref: refs/notes/x" >expect &&
- test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
+ echo "refs/notes/x" >expect &&
+ git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
+ test_cmp expect actual
'
test_done
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index d877872..12eb226 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -297,6 +297,7 @@
output &&
test_i18ngrep "file1" output &&
test_path_is_missing .git/rebase-merge &&
+ rm file1 &&
git reset --hard HEAD^
'
@@ -351,82 +352,6 @@
git show HEAD | grep "^Author: Twerp Snog"
'
-test_expect_success REBASE_P '-p handles "no changes" gracefully' '
- HEAD=$(git rev-parse HEAD) &&
- git rebase -i -p HEAD^ &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached HEAD -- &&
- test $HEAD = $(git rev-parse HEAD)
-'
-
-test_expect_failure REBASE_P 'exchange two commits with -p' '
- git checkout H &&
- (
- set_fake_editor &&
- FAKE_LINES="2 1" git rebase -i -p HEAD~2
- ) &&
- test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
- test G = $(git cat-file commit HEAD | sed -ne \$p)
-'
-
-test_expect_success REBASE_P 'preserve merges with -p' '
- git checkout -b to-be-preserved primary^ &&
- : > unrelated-file &&
- git add unrelated-file &&
- test_tick &&
- git commit -m "unrelated" &&
- git checkout -b another-branch primary &&
- echo B > file1 &&
- test_tick &&
- git commit -m J file1 &&
- test_tick &&
- git merge to-be-preserved &&
- echo C > file1 &&
- test_tick &&
- git commit -m K file1 &&
- echo D > file1 &&
- test_tick &&
- git commit -m L1 file1 &&
- git checkout HEAD^ &&
- echo 1 > unrelated-file &&
- test_tick &&
- git commit -m L2 unrelated-file &&
- test_tick &&
- git merge another-branch &&
- echo E > file1 &&
- test_tick &&
- git commit -m M file1 &&
- git checkout -b to-be-rebased &&
- test_tick &&
- git rebase -i -p --onto branch1 primary &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached HEAD -- &&
- test_cmp_rev HEAD~6 branch1 &&
- test_cmp_rev HEAD~4^2 to-be-preserved &&
- test_cmp_rev HEAD^^2^ HEAD^^^ &&
- test $(git show HEAD~5:file1) = B &&
- test $(git show HEAD~3:file1) = C &&
- test $(git show HEAD:file1) = E &&
- test $(git show HEAD:unrelated-file) = 1
-'
-
-test_expect_success REBASE_P 'edit ancestor with -p' '
- (
- set_fake_editor &&
- FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
- ) &&
- echo 2 > unrelated-file &&
- test_tick &&
- git commit -m L2-modified --amend unrelated-file &&
- git rebase --continue &&
- git update-index --refresh &&
- git diff-files --quiet &&
- git diff-index --quiet --cached HEAD -- &&
- test $(git show HEAD:unrelated-file) = 2
-'
-
test_expect_success '--continue tries to commit' '
git reset --hard D &&
test_tick &&
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 7c381fb..ebbaed1 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -7,77 +7,77 @@
. ./test-lib.sh
-### Test that we handle space characters properly
-work_dir="$(pwd)/test dir"
-
test_expect_success setup '
- mkdir -p "$work_dir" &&
- cd "$work_dir" &&
- git init &&
- echo a > a &&
- git add a &&
- git commit -m a &&
+ test_commit a a a &&
git branch to-rebase &&
- echo b > a &&
- git commit -a -m b &&
- echo c > a &&
- git commit -a -m c &&
+ test_commit --annotate b a b &&
+ test_commit --annotate c a c &&
git checkout to-rebase &&
- echo d > a &&
- git commit -a -m "merge should fail on this" &&
- echo e > a &&
- git commit -a -m "merge should fail on this, too" &&
- git branch pre-rebase
+ test_commit "merge should fail on this" a d d &&
+ test_commit --annotate "merge should fail on this, too" a e pre-rebase
'
+# Check that HEAD is equal to "pre-rebase" and the current branch is
+# "to-rebase"
+check_head() {
+ test_cmp_rev HEAD pre-rebase^{commit} &&
+ test "$(git symbolic-ref HEAD)" = refs/heads/to-rebase
+}
+
testrebase() {
type=$1
- dotest=$2
+ state_dir=$2
test_expect_success "rebase$type --abort" '
- cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
test_must_fail git rebase$type main &&
- test_path_is_dir "$dotest" &&
+ test_path_is_dir "$state_dir" &&
git rebase --abort &&
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
- test ! -d "$dotest"
+ check_head &&
+ test_path_is_missing "$state_dir"
'
test_expect_success "rebase$type --abort after --skip" '
- cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
test_must_fail git rebase$type main &&
- test_path_is_dir "$dotest" &&
+ test_path_is_dir "$state_dir" &&
test_must_fail git rebase --skip &&
- test $(git rev-parse HEAD) = $(git rev-parse main) &&
+ test_cmp_rev HEAD main &&
git rebase --abort &&
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
- test ! -d "$dotest"
+ check_head &&
+ test_path_is_missing "$state_dir"
'
test_expect_success "rebase$type --abort after --continue" '
- cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
test_must_fail git rebase$type main &&
- test_path_is_dir "$dotest" &&
+ test_path_is_dir "$state_dir" &&
echo c > a &&
echo d >> a &&
git add a &&
test_must_fail git rebase --continue &&
- test $(git rev-parse HEAD) != $(git rev-parse main) &&
+ test_cmp_rev ! HEAD main &&
git rebase --abort &&
- test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
- test ! -d "$dotest"
+ check_head &&
+ test_path_is_missing "$state_dir"
+ '
+
+ test_expect_success "rebase$type --abort when checking out a tag" '
+ test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+ git reset --hard a -- &&
+ test_must_fail git rebase$type --onto b c pre-rebase &&
+ test_cmp_rev HEAD b^{commit} &&
+ git rebase --abort &&
+ test_cmp_rev HEAD pre-rebase^{commit} &&
+ ! git symbolic-ref HEAD
'
test_expect_success "rebase$type --abort does not update reflog" '
- cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
git reflog show to-rebase > reflog_before &&
@@ -89,7 +89,6 @@
'
test_expect_success 'rebase --abort can not be used with other options' '
- cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
test_must_fail git rebase$type main &&
@@ -97,33 +96,21 @@
test_must_fail git rebase --abort -v &&
git rebase --abort
'
+
+ test_expect_success "rebase$type --quit" '
+ test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+ # Clean up the state from the previous one
+ git reset --hard pre-rebase &&
+ test_must_fail git rebase$type main &&
+ test_path_is_dir $state_dir &&
+ head_before=$(git rev-parse HEAD) &&
+ git rebase --quit &&
+ test_cmp_rev HEAD $head_before &&
+ test_path_is_missing .git/rebase-apply
+ '
}
testrebase " --apply" .git/rebase-apply
testrebase " --merge" .git/rebase-merge
-test_expect_success 'rebase --apply --quit' '
- cd "$work_dir" &&
- # Clean up the state from the previous one
- git reset --hard pre-rebase &&
- test_must_fail git rebase --apply main &&
- test_path_is_dir .git/rebase-apply &&
- head_before=$(git rev-parse HEAD) &&
- git rebase --quit &&
- test $(git rev-parse HEAD) = $head_before &&
- test ! -d .git/rebase-apply
-'
-
-test_expect_success 'rebase --merge --quit' '
- cd "$work_dir" &&
- # Clean up the state from the previous one
- git reset --hard pre-rebase &&
- test_must_fail git rebase --merge main &&
- test_path_is_dir .git/rebase-merge &&
- head_before=$(git rev-parse HEAD) &&
- git rebase --quit &&
- test $(git rev-parse HEAD) = $head_before &&
- test ! -d .git/rebase-merge
-'
-
test_done
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index ab0960e..cde3562 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -55,14 +55,4 @@
test_cmp expect actual
'
-test_expect_success REBASE_P rebasep '
-
- git checkout side-merge &&
- git rebase -p side &&
- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
- git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
- test_cmp expect actual
-
-'
-
test_done
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
deleted file mode 100755
index ec8062a..0000000
--- a/t/t3409-rebase-preserve-merges.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#
-# Copyright(C) 2008 Stephen Habermann & Andreas Ericsson
-#
-test_description='git rebase -p should preserve merges
-
-Run "git rebase -p" and check that merges are properly carried along
-'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-GIT_AUTHOR_EMAIL=bogus_email_address
-export GIT_AUTHOR_EMAIL
-
-# Clone 2 (conflicting merge):
-#
-# A1--A2--B3 <-- origin/main
-# \ \
-# B1------M <-- topic
-# \
-# B2 <-- origin/topic
-#
-# Clone 3 (no-ff merge):
-#
-# A1--A2--B3 <-- origin/main
-# \
-# B1------M <-- topic
-# \ /
-# \--A3 <-- topic2
-# \
-# B2 <-- origin/topic
-#
-# Clone 4 (same as Clone 3)
-
-test_expect_success 'setup for merge-preserving rebase' \
- 'echo First > A &&
- git add A &&
- git commit -m "Add A1" &&
- git checkout -b topic &&
- echo Second > B &&
- git add B &&
- git commit -m "Add B1" &&
- git checkout -f main &&
- echo Third >> A &&
- git commit -a -m "Modify A2" &&
- echo Fifth > B &&
- git add B &&
- git commit -m "Add different B" &&
-
- git clone ./. clone2 &&
- (
- cd clone2 &&
- git checkout -b topic origin/topic &&
- test_must_fail git merge origin/main &&
- echo Resolved >B &&
- git add B &&
- git commit -m "Merge origin/main into topic"
- ) &&
-
- git clone ./. clone3 &&
- (
- cd clone3 &&
- git checkout -b topic2 origin/topic &&
- echo Sixth > A &&
- git commit -a -m "Modify A3" &&
- git checkout -b topic origin/topic &&
- git merge --no-ff topic2
- ) &&
-
- git clone ./. clone4 &&
- (
- cd clone4 &&
- git checkout -b topic2 origin/topic &&
- echo Sixth > A &&
- git commit -a -m "Modify A3" &&
- git checkout -b topic origin/topic &&
- git merge --no-ff topic2
- ) &&
-
- git checkout topic &&
- echo Fourth >> B &&
- git commit -a -m "Modify B2"
-'
-
-test_expect_success '--continue works after a conflict' '
- (
- cd clone2 &&
- git fetch &&
- test_must_fail git rebase -p origin/topic &&
- test 2 = $(git ls-files B | wc -l) &&
- echo Resolved again > B &&
- test_must_fail git rebase --continue &&
- grep "^@@@ " .git/rebase-merge/patch &&
- git add B &&
- git rebase --continue &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
- )
-'
-
-test_expect_success 'rebase -p preserves no-ff merges' '
- (
- cd clone3 &&
- git fetch &&
- git rebase -p origin/topic &&
- test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
- test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
- )
-'
-
-test_expect_success 'rebase -p ignores merge.log config' '
- (
- cd clone4 &&
- git fetch &&
- git -c merge.log=1 rebase -p origin/topic &&
- echo >expected &&
- git log --format="%b" -1 >current &&
- test_cmp expected current
- )
-'
-
-test_done
diff --git a/t/t3410-rebase-preserve-dropped-merges.sh b/t/t3410-rebase-preserve-dropped-merges.sh
deleted file mode 100755
index 2e29866..0000000
--- a/t/t3410-rebase-preserve-dropped-merges.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with preserve merges and ensures commits
-dropped by the --cherry-pick flag have their childrens parents
-rewritten.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-# set up two branches like this:
-#
-# A - B - C - D - E
-# \
-# F - G - H
-# \
-# I
-#
-# where B, D and G touch the same file.
-
-test_expect_success 'setup' '
- test_commit A file1 &&
- test_commit B file1 1 &&
- test_commit C file2 &&
- test_commit D file1 2 &&
- test_commit E file3 &&
- git checkout A &&
- test_commit F file4 &&
- test_commit G file1 3 &&
- test_commit H file5 &&
- git checkout F &&
- test_commit I file6
-'
-
-# A - B - C - D - E
-# \ \ \
-# F - G - H -- L \ --> L
-# \ | \
-# I -- G2 -- J -- K I -- K
-# G2 = same changes as G
-test_expect_success 'skip same-resolution merges with -p' '
- git checkout H &&
- test_must_fail git merge E &&
- test_commit L file1 23 &&
- git checkout I &&
- test_commit G2 file1 3 &&
- test_must_fail git merge E &&
- test_commit J file1 23 &&
- test_commit K file7 file7 &&
- git rebase -i -p L &&
- test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
- test "23" = "$(cat file1)" &&
- test "I" = "$(cat file6)" &&
- test "file7" = "$(cat file7)"
-'
-
-# A - B - C - D - E
-# \ \ \
-# F - G - H -- L2 \ --> L2
-# \ | \
-# I -- G3 --- J2 -- K2 I -- G3 -- K2
-# G2 = different changes as G
-test_expect_success 'keep different-resolution merges with -p' '
- git checkout H &&
- test_must_fail git merge E &&
- test_commit L2 file1 23 &&
- git checkout I &&
- test_commit G3 file1 4 &&
- test_must_fail git merge E &&
- test_commit J2 file1 24 &&
- test_commit K2 file7 file7 &&
- test_must_fail git rebase -i -p L2 &&
- echo 234 > file1 &&
- git add file1 &&
- git rebase --continue &&
- test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
- test "234" = "$(cat file1)" &&
- test "I" = "$(cat file6)" &&
- test "file7" = "$(cat file7)"
-'
-
-test_done
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
deleted file mode 100755
index fb45e7b..0000000
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with -p and tries to squash a commit from after
-a merge to before the merge.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-set_fake_editor
-
-# set up two branches like this:
-#
-# A1 - B1 - D1 - E1 - F1
-# \ /
-# -- C1 --
-
-test_expect_success 'setup' '
- test_commit A1 &&
- test_commit B1 &&
- test_commit C1 &&
- git reset --hard B1 &&
- test_commit D1 &&
- test_merge E1 C1 &&
- test_commit F1
-'
-
-# Should result in:
-#
-# A1 - B1 - D2 - E2
-# \ /
-# -- C1 --
-#
-test_expect_success 'squash F1 into D1' '
- FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
- test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
- test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
- git tag E2
-'
-
-# Start with:
-#
-# A1 - B1 - D2 - E2
-# \
-# G1 ---- L1 ---- M1
-# \ /
-# H1 -- J1 -- K1
-# \ /
-# -- I1 --
-#
-# And rebase G1..M1 onto E2
-
-test_expect_success 'rebase two levels of merge' '
- git checkout A1 &&
- test_commit G1 &&
- test_commit H1 &&
- test_commit I1 &&
- git checkout -b branch3 H1 &&
- test_commit J1 &&
- test_merge K1 I1 &&
- git checkout -b branch2 G1 &&
- test_commit L1 &&
- test_merge M1 K1 &&
- GIT_EDITOR=: git rebase -i -p E2 &&
- test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
- test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
- test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
-'
-
-test_done
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index fda62c6..19c6f4a 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -89,17 +89,6 @@
test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
'
-test_expect_success REBASE_P 'rebase -i -p with linear history' '
- git checkout -b work5 other &&
- git rebase -i -p --root --onto main &&
- git log --pretty=tformat:"%s" > rebased5 &&
- test_cmp expect rebased5
-'
-
-test_expect_success REBASE_P 'pre-rebase got correct input (5)' '
- test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-'
-
test_expect_success 'set up merge history' '
git checkout other^ &&
git checkout -b side &&
@@ -123,13 +112,6 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p with merge' '
- git checkout -b work6 other &&
- git rebase -i -p --root --onto main &&
- log_with_names work6 > rebased6 &&
- test_cmp expect-side rebased6
-'
-
test_expect_success 'set up second root and merge' '
git symbolic-ref HEAD refs/heads/third &&
rm .git/index &&
@@ -158,13 +140,6 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p with two roots' '
- git checkout -b work7 other &&
- git rebase -i -p --root --onto main &&
- log_with_names work7 > rebased7 &&
- test_cmp expect-third rebased7
-'
-
test_expect_success 'setup pre-rebase hook that fails' '
mkdir -p .git/hooks &&
cat >.git/hooks/pre-rebase <<EOF &&
@@ -264,21 +239,9 @@
1
EOF
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' '
- git checkout -b conflict3 other &&
- test_must_fail git rebase -i -p --root --onto main &&
- git ls-files -u | grep "B$"
-'
-
test_expect_success 'fix the conflict' '
echo 3 > B &&
git add B
'
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (second part)' '
- git rebase --continue &&
- log_with_names conflict3 >out &&
- test_cmp expect-conflict-p out
-'
-
test_done
diff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh
deleted file mode 100755
index 72e04b5..0000000
--- a/t/t3414-rebase-preserve-onto.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 Greg Price
-#
-
-test_description='git rebase -p should respect --onto
-
-In a rebase with --onto, we should rewrite all the commits that
-aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-# Set up branches like this:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# H1
-
-test_expect_success 'setup' '
- test_commit A1 &&
- test_commit B1 &&
- test_commit C1 &&
- test_commit D1 &&
- git reset --hard B1 &&
- test_commit E1 &&
- test_commit F1 &&
- test_merge G1 D1 &&
- git reset --hard A1 &&
- test_commit H1
-'
-
-# Now rebase merge G1 from both branches' base B1, both should move:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# \
-# H1---E2---F2---G2
-# \ /
-# \--C2---D2--/
-
-test_expect_success 'rebase from B1 onto H1' '
- git checkout G1 &&
- git rebase -p --onto H1 B1 &&
- test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
-'
-
-# On the other hand if rebase from E1 which is within one branch,
-# then the other branch stays:
-# A1---B1---E1---F1---G1
-# \ \ /
-# \ \--C1---D1--/
-# \ \
-# H1-----F3-----G3
-
-test_expect_success 'rebase from E1 onto H1' '
- git checkout G1 &&
- git rebase -p --onto H1 E1 &&
- test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
-'
-
-# And the same if we rebase from a commit in the second-parent branch.
-# A1---B1---E1---F1----G1
-# \ \ \ /
-# \ \--C1---D1-\-/
-# \ \
-# H1------D3------G4
-
-test_expect_success 'rebase from C1 onto H1' '
- git checkout G1 &&
- git rev-list --first-parent --pretty=oneline C1..G1 &&
- git rebase -p --onto H1 C1 &&
- test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
- test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
-'
-
-test_done
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 738fbae..22eca73 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -119,20 +119,6 @@
test -f funny.was.run
'
-test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
- rm -fr .git/rebase-* &&
- git reset --hard commit-new-file-F3-on-topic-branch &&
- test_commit theirs-to-merge &&
- git reset --hard HEAD^ &&
- test_commit some-commit &&
- test_tick &&
- git merge --no-ff theirs-to-merge &&
- FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \
- -s recursive --strategy-option=theirs HEAD~2 &&
- test_commit force-change &&
- git rebase --continue
-'
-
test_expect_success 'rebase -r passes merge strategy options correctly' '
rm -fr .git/rebase-* &&
git reset --hard commit-new-file-F3-on-topic-branch &&
@@ -268,7 +254,6 @@
test_rerere_autoupdate -m
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
test_rerere_autoupdate -i
-test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
unset GIT_SEQUENCE_EDITOR
test_expect_success 'the todo command "break" works' '
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 4a9204b..62d86d5 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -29,7 +29,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_expect_success 'setup branches and remote tracking' '
git tag -l >tags &&
@@ -53,7 +52,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -70,7 +68,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -87,7 +84,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -102,7 +98,6 @@
test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
# f
# /
@@ -142,7 +137,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -157,7 +151,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -172,7 +165,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -187,7 +179,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
# a---b---c---j!
# \
@@ -215,7 +206,6 @@
test_run_rebase failure --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -229,7 +219,6 @@
}
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -243,7 +232,6 @@
}
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase success --rebase-merges
# m
@@ -283,7 +271,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -298,7 +285,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -313,7 +299,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_run_rebase () {
result=$1
@@ -329,7 +314,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -344,7 +328,6 @@
test_run_rebase success --apply
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -358,7 +341,6 @@
test_run_rebase success ''
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
test_run_rebase () {
result=$1
@@ -373,6 +355,5 @@
test_run_rebase success ''
test_run_rebase success -m
test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
test_done
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index c823406..eb0a3d9 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -63,15 +63,4 @@
test_rebase_am_only --whitespace=fix
test_rebase_am_only -C4
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
- git checkout B^0 &&
- test_must_fail git rebase --preserve-merges --signoff A
-'
-
-test_expect_success REBASE_P \
- '--preserve-merges incompatible with --rebase-merges' '
- git checkout B^0 &&
- test_must_fail git rebase --preserve-merges --rebase-merges A
-'
-
test_done
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh
index e42faa4..63acc1e 100755
--- a/t/t3425-rebase-topology-merges.sh
+++ b/t/t3425-rebase-topology-merges.sh
@@ -106,155 +106,4 @@
test_run_rebase success 'd n o e' -m
test_run_rebase success 'd n o e' -i
-if ! test_have_prereq REBASE_P; then
- skip_all='skipping git rebase -p tests, as asked for'
- test_done
-fi
-
-test_expect_success "rebase -p is no-op in non-linear history" "
- reset_rebase &&
- git rebase -p d w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p is no-op when base inside second parent" "
- reset_rebase &&
- git rebase -p e w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_failure "rebase -p --root on non-linear history is a no-op" "
- reset_rebase &&
- git rebase -p --root w &&
- test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p re-creates merge from side branch" "
- reset_rebase &&
- git rebase -p z w &&
- test_cmp_rev z HEAD^ &&
- test_cmp_rev w^2 HEAD^2
-"
-
-test_expect_success "rebase -p re-creates internal merge" "
- reset_rebase &&
- git rebase -p c w &&
- test_cmp_rev c HEAD~4 &&
- test_cmp_rev HEAD^2^ HEAD~3 &&
- test_revision_subjects 'd n e o w' HEAD~3 HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p can re-create two branches on onto" "
- reset_rebase &&
- git rebase -p --onto c d w &&
- test_cmp_rev c HEAD~3 &&
- test_cmp_rev c HEAD^2^ &&
- test_revision_subjects 'n e o w' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-# f
-# /
-# a---b---c---g---h
-# \
-# d---gp--i
-# \ \
-# e-------u
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for patch-equivalence tests' '
- git checkout e &&
- test_merge u i
-'
-
-test_expect_success "rebase -p re-creates history around dropped commit matching upstream" "
- reset_rebase &&
- git rebase -p h u &&
- test_cmp_rev h HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history drops patches in upstream" "
- reset_rebase &&
- git rebase -p --onto f h u &&
- test_cmp_rev f HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history does not drop patches in onto" "
- reset_rebase &&
- git rebase -p --onto h f u &&
- test_cmp_rev h HEAD~3 &&
- test_cmp_rev HEAD^2~2 HEAD~2 &&
- test_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD
-"
-
-# a---b---c---g---h
-# \
-# d---gp--s
-# \ \ /
-# \ X
-# \ / \
-# e---t
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for dropping whole side' '
- git checkout gp &&
- test_merge s e &&
- git checkout e &&
- test_merge t gp
-'
-
-test_expect_failure "rebase -p drops merge commit when entire first-parent side is dropped" "
- reset_rebase &&
- git rebase -p h s &&
- test_cmp_rev h HEAD~2 &&
- test_linear_range 'd e' h..
-"
-
-test_expect_success "rebase -p drops merge commit when entire second-parent side is dropped" "
- reset_rebase &&
- git rebase -p h t &&
- test_cmp_rev h HEAD~2 &&
- test_linear_range 'd e' h..
-"
-
-# a---b---c
-# \
-# d---e
-# \ \
-# n---r
-# \
-# o
-#
-# r = tree-same with n
-test_expect_success 'setup of non-linear-history for empty commits' '
- git checkout n &&
- git merge --no-commit e &&
- git reset n . &&
- git commit -m r &&
- git reset --hard &&
- git clean -f &&
- git tag r
-'
-
-test_expect_success "rebase -p re-creates empty internal merge commit" "
- reset_rebase &&
- git rebase -p c r &&
- test_cmp_rev c HEAD~3 &&
- test_cmp_rev HEAD^2^ HEAD~2 &&
- test_revision_subjects 'd e n r' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p re-creates empty merge commit" "
- reset_rebase &&
- git rebase -p o r &&
- test_cmp_rev e HEAD^2 &&
- test_cmp_rev o HEAD^ &&
- test_revision_subjects 'r' HEAD
-"
-
test_done
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index e78c7e3..48b76f8 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -36,11 +36,10 @@
# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
#
# This commit history is then rebased onto `topic_3` with the
-# `-Xsubtree=files_subtree` option in three different ways:
+# `-Xsubtree=files_subtree` option in two different ways:
#
-# 1. using `--preserve-merges`
-# 2. using `--preserve-merges` and --keep-empty
-# 3. without specifying a rebase backend
+# 1. without specifying a rebase backend
+# 2. using the `--rebase-merges` backend
test_expect_success 'setup' '
test_commit README &&
@@ -69,25 +68,6 @@
git commit -m "Empty commit" --allow-empty
'
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
- reset_rebase &&
- git checkout -b rebase-preserve-merges to-rebase &&
- git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main &&
- verbose test "$(commit_message HEAD~)" = "topic_4" &&
- verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
-'
-
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
- reset_rebase &&
- git checkout -b rebase-keep-empty to-rebase &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main &&
- verbose test "$(commit_message HEAD~2)" = "topic_4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
- verbose test "$(commit_message HEAD)" = "Empty commit"
-'
-
test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
reset_rebase &&
git checkout -b rebase-onto to-rebase &&
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index ec10766..5f8ba2c 100755
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -65,6 +65,7 @@
test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign
test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
+ test_when_finished "git clean -f" &&
git reset --hard merged &&
git config commit.gpgsign true &&
git rebase -p --no-gpg-sign --onto=one fork-point main &&
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 9d100cd..4b5b607 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -158,4 +158,20 @@
grep -q "^modified$" renamed
'
+test_expect_success 'advice from failed revert' '
+ test_commit --no-tag "add dream" dream dream &&
+ dream_oid=$(git rev-parse --short HEAD) &&
+ cat <<-EOF >expected &&
+ error: could not revert $dream_oid... add dream
+ hint: After resolving the conflicts, mark them with
+ hint: "git add/rm <pathspec>", then run
+ hint: "git revert --continue".
+ hint: You can instead skip this commit with "git revert --skip".
+ hint: To abort and get back to the state before "git revert",
+ hint: run "git revert --abort".
+ EOF
+ test_commit --append --no-tag "double-add dream" dream dream &&
+ test_must_fail git revert HEAD^ 2>actual &&
+ test_cmp expected actual
+'
test_done
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 014001b..979e843 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -47,20 +47,23 @@
test "$head" = "$newhead"
'
-test_expect_success 'advice from failed cherry-pick' "
+test_expect_success 'advice from failed cherry-pick' '
pristine_detach initial &&
- picked=\$(git rev-parse --short picked) &&
+ picked=$(git rev-parse --short picked) &&
cat <<-EOF >expected &&
- error: could not apply \$picked... picked
- hint: after resolving the conflicts, mark the corrected paths
- hint: with 'git add <paths>' or 'git rm <paths>'
- hint: and commit the result with 'git commit'
+ error: could not apply $picked... picked
+ hint: After resolving the conflicts, mark them with
+ hint: "git add/rm <pathspec>", then run
+ hint: "git cherry-pick --continue".
+ hint: You can instead skip this commit with "git cherry-pick --skip".
+ hint: To abort and get back to the state before "git cherry-pick",
+ hint: run "git cherry-pick --abort".
EOF
test_must_fail git cherry-pick picked 2>actual &&
test_cmp expected actual
-"
+'
test_expect_success 'advice from failed cherry-pick --no-commit' "
pristine_detach initial &&
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 49010aa..3b0fa66 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -238,6 +238,7 @@
'
test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
+ test_when_finished "rm unrelated" &&
pristine_detach initial &&
git rm --cached unrelated &&
git commit -m "untrack unrelated" &&
diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh
index 7de21f8..b2a8db6 100755
--- a/t/t3601-rm-pathspec-file.sh
+++ b/t/t3601-rm-pathspec-file.sh
@@ -2,6 +2,7 @@
test_description='rm --pathspec-from-file'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_tick
diff --git a/t/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh
index e9e9a15..034ec01 100755
--- a/t/t3602-rm-sparse-checkout.sh
+++ b/t/t3602-rm-sparse-checkout.sh
@@ -11,12 +11,15 @@
git commit -m files &&
cat >sparse_error_header <<-EOF &&
- The following pathspecs didn't match any eligible path, but they do match index
- entries outside the current sparse checkout:
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
EOF
cat >sparse_hint <<-EOF &&
- hint: Disable or modify the sparsity rules if you intend to update such entries.
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
@@ -39,7 +42,29 @@
git sparse-checkout set sub/dir &&
git rm -r sub &&
git status --porcelain -uno >actual &&
- echo "D sub/dir/e" >expected &&
+ cat >expected <<-\EOF &&
+ D sub/dir/e
+ EOF
+ test_cmp expected actual &&
+
+ git rm --sparse -r sub &&
+ git status --porcelain -uno >actual2 &&
+ cat >expected2 <<-\EOF &&
+ D sub/d
+ D sub/dir/e
+ EOF
+ test_cmp expected2 actual2
+'
+
+test_expect_success 'recursive rm --sparse removes sparse entries' '
+ git reset --hard &&
+ git sparse-checkout set "sub/dir" &&
+ git rm --sparse -r sub &&
+ git status --porcelain -uno >actual &&
+ cat >expected <<-\EOF &&
+ D sub/d
+ D sub/dir/e
+ EOF
test_cmp expected actual
'
@@ -75,4 +100,40 @@
git ls-files --error-unmatch b
'
+test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone' '
+ git reset --hard &&
+ git sparse-checkout set a &&
+ git update-index --no-skip-worktree b &&
+ test_must_fail git rm b 2>stderr &&
+ test_cmp b_error_and_hint stderr &&
+ git rm --sparse b 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b
+'
+
+test_expect_success 'can remove files from non-sparse dir' '
+ git reset --hard &&
+ git sparse-checkout disable &&
+ mkdir -p w x/y &&
+ test_commit w/f &&
+ test_commit x/y/f &&
+
+ git sparse-checkout set w !/x y/ &&
+ git rm w/f.t x/y/f.t 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to remove non-skip-worktree file from sparse dir' '
+ git reset --hard &&
+ git sparse-checkout disable &&
+ mkdir -p x/y/z &&
+ test_commit x/y/z/f &&
+ git sparse-checkout set !/x y/ !x/y/z &&
+
+ git update-index --no-skip-worktree x/y/z/f.t &&
+ test_must_fail git rm x/y/z/f.t 2>stderr &&
+ echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 4086e1e..283a669 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -5,6 +5,7 @@
test_description='Test of git add, including the -- option.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Test the file mode "$1" of the file "$2" in the index.
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 2b1fd0d..f3143c9 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -19,6 +19,7 @@
fi &&
git add sparse_entry &&
git update-index --skip-worktree sparse_entry &&
+ git commit --allow-empty -m "ensure sparse_entry exists at HEAD" &&
SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
}
@@ -36,14 +37,22 @@
EOF
}
+test_sparse_entry_unstaged () {
+ git diff --staged -- sparse_entry >diff &&
+ test_must_be_empty diff
+}
+
test_expect_success 'setup' "
cat >sparse_error_header <<-EOF &&
- The following pathspecs didn't match any eligible path, but they do match index
- entries outside the current sparse checkout:
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
EOF
cat >sparse_hint <<-EOF &&
- hint: Disable or modify the sparsity rules if you intend to update such entries.
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
@@ -55,6 +64,7 @@
setup_sparse_entry &&
rm sparse_entry &&
test_must_fail git add sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -73,6 +83,7 @@
rm sparse_entry &&
setup_gitignore &&
test_must_fail git add . 2>stderr &&
+ test_sparse_entry_unstaged &&
cat sparse_error_header >expect &&
echo . >>expect &&
@@ -88,6 +99,7 @@
setup_sparse_entry &&
echo modified >sparse_entry &&
test_must_fail git add $opt sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -98,6 +110,7 @@
git ls-files --debug sparse_entry | grep mtime >before &&
test-tool chmtime -60 sparse_entry &&
test_must_fail git add --refresh sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
git ls-files --debug sparse_entry | grep mtime >after &&
test_cmp before after
@@ -106,6 +119,7 @@
test_expect_success 'git add --chmod does not update sparse entries' '
setup_sparse_entry &&
test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged &&
! test -x sparse_entry
@@ -116,6 +130,7 @@
setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
echo "sparse_entry text=auto" >.gitattributes &&
test_must_fail git add --renormalize sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -124,6 +139,7 @@
setup_sparse_entry &&
rm sparse_entry &&
test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp error_and_hint stderr &&
test_sparse_entry_unchanged
'
@@ -145,11 +161,74 @@
git ls-files --error-unmatch dense_entry
'
+test_expect_success 'git add fails outside of sparse-checkout definition' '
+ test_when_finished git sparse-checkout disable &&
+ test_commit a &&
+ git sparse-checkout init &&
+ git sparse-checkout set a &&
+ echo >>sparse_entry &&
+
+ git update-index --no-skip-worktree sparse_entry &&
+ test_must_fail git add sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ test_must_fail git add --chmod=+x sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ test_must_fail git add --renormalize sparse_entry &&
+ test_sparse_entry_unstaged &&
+
+ # Avoid munging CRLFs to avoid an error message
+ git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
+ test_must_be_empty stderr &&
+ test-tool read-cache --table >actual &&
+ grep "^100644 blob.*sparse_entry\$" actual &&
+
+ git add --sparse --chmod=+x sparse_entry 2>stderr &&
+ test_must_be_empty stderr &&
+ test-tool read-cache --table >actual &&
+ grep "^100755 blob.*sparse_entry\$" actual &&
+
+ git reset &&
+
+ # This will print a message over stderr on Windows.
+ git add --sparse --renormalize sparse_entry &&
+ git status --porcelain >actual &&
+ grep "^M sparse_entry\$" actual
+'
+
test_expect_success 'add obeys advice.updateSparsePath' '
setup_sparse_entry &&
test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+ test_sparse_entry_unstaged &&
test_cmp sparse_entry_error stderr
'
+test_expect_success 'add allows sparse entries with --sparse' '
+ git sparse-checkout set a &&
+ echo modified >sparse_entry &&
+ test_must_fail git add sparse_entry &&
+ test_sparse_entry_unchanged &&
+ git add --sparse sparse_entry 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'can add files from non-sparse dir' '
+ git sparse-checkout set w !/x y/ &&
+ mkdir -p w x/y &&
+ touch w/f x/y/f &&
+ git add w/f x/y/f 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
+ git sparse-checkout set !/x y/ !x/y/z &&
+ mkdir -p x/y/z &&
+ touch x/y/z/f &&
+ test_must_fail git add x/y/z/f 2>stderr &&
+ echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
test_done
diff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh
index f528008..72a5a56 100755
--- a/t/t3902-quoted.sh
+++ b/t/t3902-quoted.sh
@@ -5,6 +5,7 @@
test_description='quoted output'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
FN='濱野'
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index dd2cdcc..5390eec 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -422,4 +422,10 @@
test_must_be_empty actual
'
+test_expect_success 'stash -u ignores sub-repository' '
+ test_when_finished "rm -rf sub-repo" &&
+ git init sub-repo &&
+ git stash -u
+'
+
test_done
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 6a9f010..ea52e5b 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -6,6 +6,8 @@
test_description='Test diff raw-output.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index db07ff3..f4485a8 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -11,7 +11,7 @@
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
@@ -99,7 +99,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1'
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 8647906..6f1b323 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -9,7 +9,7 @@
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success 'setup reference tree' '
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
@@ -64,7 +64,7 @@
# nows how to say Copy.
test_expect_success 'validate output from rename/copy detection (#3)' '
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1 &&
cat <<-EOF >expected &&
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index cbb9c62..c634653 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -11,13 +11,12 @@
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git update-index --add path0/COPYING &&
tree=$(git write-tree) &&
- echo $tree
+ blob=$(git rev-parse :path0/COPYING)
'
-blob=$(git hash-object "$TEST_DIRECTORY/lib-diff/COPYING")
test_expect_success 'prepare work tree' '
cp path0/COPYING path1/COPYING &&
git update-index --add --remove path0/COPYING path1/COPYING
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index 2299f27..562aaf3 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -25,8 +25,8 @@
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success setup '
- cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
- cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 &&
+ echo some dissimilar content >file0 &&
+ COPYING_test_data >file1 &&
blob0_id=$(git hash-object file0) &&
blob1_id=$(git hash-object file1) &&
git update-index --add file0 file1 &&
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index b1da807..59b7f44 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -11,7 +11,7 @@
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
orig=$(git hash-object COPYING) &&
@@ -81,7 +81,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+ 'COPYING_test_data >COPYING &&
git update-index --add --remove COPYING COPYING.1'
git diff-index -z -C --find-copies-harder $tree >current
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 876271d..5a8d887 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -6,6 +6,7 @@
test_description='Quoting paths in diff output.
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
P0='pathname'
diff --git a/t/t4018/java-class-member-function b/t/t4018/java-class-member-function
index 298bc7a..3b95f68 100644
--- a/t/t4018/java-class-member-function
+++ b/t/t4018/java-class-member-function
@@ -3,6 +3,10 @@
int special;
public static void main(String RIGHT[])
{
+ someMethodCall();
+ someOtherMethod("17")
+ .doThat();
+ // Whatever
System.out.print("ChangeMe");
}
}
diff --git a/t/t4018/java-enum-constant b/t/t4018/java-enum-constant
new file mode 100644
index 0000000..a1931c8
--- /dev/null
+++ b/t/t4018/java-enum-constant
@@ -0,0 +1,6 @@
+private enum RIGHT {
+ ONE,
+ TWO,
+ THREE,
+ ChangeMe
+}
diff --git a/t/t4018/java-method-return-generic-bounded b/t/t4018/java-method-return-generic-bounded
new file mode 100644
index 0000000..66dd78c
--- /dev/null
+++ b/t/t4018/java-method-return-generic-bounded
@@ -0,0 +1,9 @@
+class MyExample {
+ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+ someMethodCall();
+ someOtherMethod()
+ .doThat();
+ // Whatever...
+ return (List<T>) Arrays.asList("ChangeMe");
+ }
+}
diff --git a/t/t4018/java-method-return-generic-wildcard b/t/t4018/java-method-return-generic-wildcard
new file mode 100644
index 0000000..96e9e5f
--- /dev/null
+++ b/t/t4018/java-method-return-generic-wildcard
@@ -0,0 +1,9 @@
+class MyExample {
+ public List<? extends Comparable> foo(String[] RIGHT) {
+ someMethodCall();
+ someOtherMethod()
+ .doThat();
+ // Whatever...
+ return Arrays.asList("ChangeMe");
+ }
+}
diff --git a/t/t4018/java-nested-field b/t/t4018/java-nested-field
new file mode 100644
index 0000000..d92d3ec
--- /dev/null
+++ b/t/t4018/java-nested-field
@@ -0,0 +1,6 @@
+class MyExample {
+ private static class RIGHT {
+ // change an inner class field
+ String inner = "ChangeMe";
+ }
+}
diff --git a/t/t4018/php-enum b/t/t4018/php-enum
new file mode 100644
index 0000000..91a69c1
--- /dev/null
+++ b/t/t4018/php-enum
@@ -0,0 +1,4 @@
+enum RIGHT: string
+{
+ case Foo = 'ChangeMe';
+}
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index c6135c7..c68729a 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -2,6 +2,7 @@
test_description='diff whitespace error detection'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d9..1c89050 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
test_description='rewrite diff'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success setup '
- cat "$TEST_DIRECTORY"/../COPYING >test &&
+ COPYING_test_data >test.data &&
+ cp test.data test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
- <"$TEST_DIRECTORY"/../COPYING >test &&
+ <test.data >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c98237..47d6f35 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
test_description='typechange rename detection'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,7 +36,7 @@
# This is purely for sanity check
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
git add foo bar &&
git commit -a -m Fifth &&
@@ -43,7 +44,7 @@
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six
diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 35578f2..6356961 100755
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -2,6 +2,7 @@
test_description='diff hunk header truncation'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
N='日本語'
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index c0b642c..cc73161 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -4,6 +4,8 @@
#
test_description='Test diff/status color escape codes'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
ESC=$(printf '\033')
diff --git a/t/t4034/cpp/expect b/t/t4034/cpp/expect
index 37d1ea2..dc500ae 100644
--- a/t/t4034/cpp/expect
+++ b/t/t4034/cpp/expect
@@ -1,36 +1,35 @@
<BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 23d5c8a..7e8c026 100644<RESET>
+<BOLD>index a1a09b7..f1b6f3c 100644<RESET>
<BOLD>--- a/pre<RESET>
<BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,19 +1,19 @@<RESET>
-Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<RESET> }
+<CYAN>@@ -1,30 +1,30 @@<RESET>
+Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x.<RED>find<RESET><GREEN>Find<RESET>); }
cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
-<GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
-[<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET>
-!<RED>a<RESET><GREEN>x<RESET> ~<RED>a a<RESET><GREEN>x x<RESET>++ <RED>a<RESET><GREEN>x<RESET>-- <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<<RED>b a<RESET><GREEN>y x<RESET>>><RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>^<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>|<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>||<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>?<RED>b<RESET><GREEN>y<RESET>:z
-<RED>a<RESET><GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>,y
-<RED>a<RESET><GREEN>x<RESET>::<RED>b<RESET><GREEN>y<RESET>
+<GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>2<RESET>'
+// long double<RESET>
+<RED>3.141592653e-10l<RESET><GREEN>3.141592654e+10l<RESET>
+// float<RESET>
+<RED>120E5f<RESET><GREEN>120E6f<RESET>
+// hex<RESET>
+<RED>0xdead<RESET><GREEN>0xdeaf<RESET>'1<RED>eaF<RESET><GREEN>eaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
+// octal<RESET>
+<RED>01234567<RESET><GREEN>01234560<RESET>
+// binary<RESET>
+<RED>0b1000<RESET><GREEN>0b1100<RESET>+e1
+// expression<RESET>
+1.5-e+<RED>2<RESET><GREEN>3<RESET>+f
+// another one<RESET>
+str.e+<RED>65<RESET><GREEN>75<RESET>
+[a] b<RED>-><RESET><GREEN>->*<RESET>v d<RED>.<RESET><GREEN>.*<RESET>e
+<GREEN>~<RESET>!a <GREEN>!<RESET>~b c<RED>++<RESET><GREEN>+<RESET> d<RED>--<RESET><GREEN>-<RESET> e*<GREEN>*<RESET>f g<RED>&<RESET><GREEN>&&<RESET>h
+a<RED>*<RESET><GREEN>*=<RESET>b c<RED>/<RESET><GREEN>/=<RESET>d e<RED>%<RESET><GREEN>%=<RESET>f
+a<RED>+<RESET><GREEN>++<RESET>b c<RED>-<RESET><GREEN>--<RESET>d
+a<RED><<<RESET><GREEN><<=<RESET>b c<RED>>><RESET><GREEN>>>=<RESET>d
+a<RED><<RESET><GREEN><=<RESET>b c<RED><=<RESET><GREEN><<RESET>d e<RED>><RESET><GREEN>>=<RESET>f g<RED>>=<RESET><GREEN>><RESET>h i<RED><=<RESET><GREEN><=><RESET>j
+a<RED>==<RESET><GREEN>!=<RESET>b c<RED>!=<RESET><GREEN>=<RESET>d
+a<RED>^<RESET><GREEN>^=<RESET>b c<RED>|<RESET><GREEN>|=<RESET>d e<RED>&&<RESET><GREEN>&=<RESET>f
+a<RED>||<RESET><GREEN>|<RESET>b
+a?<GREEN>:<RESET>b
+a<RED>=<RESET><GREEN>==<RESET>b c<RED>+=<RESET><GREEN>+<RESET>d e<RED>-=<RESET><GREEN>-<RESET>f g<RED>*=<RESET><GREEN>*<RESET>h i<RED>/=<RESET><GREEN>/<RESET>j k<RED>%=<RESET><GREEN>%<RESET>l m<RED><<=<RESET><GREEN><<<RESET>n o<RED>>>=<RESET><GREEN>>><RESET>p q<RED>&=<RESET><GREEN>&<RESET>r s<RED>^=<RESET><GREEN>^<RESET>t u<RED>|=<RESET><GREEN>|<RESET>v
+a,b<RESET>
+a<RED>::<RESET><GREEN>:<RESET>b
diff --git a/t/t4034/cpp/post b/t/t4034/cpp/post
index 7e8c026..f1b6f3c 100644
--- a/t/t4034/cpp/post
+++ b/t/t4034/cpp/post
@@ -1,19 +1,30 @@
-Foo() : x(0&42) { bar(x); }
+Foo() : x(0&42) { bar(x.Find); }
cout<<"Hello World?\n"<<endl;
-(1) (-1e10) (0xabcdef) 'y'
-[x] x->y x.y
-!x ~x x++ x-- x*y x&y
-x*y x/y x%y
-x+y x-y
-x<<y x>>y
-x<y x<=y x>y x>=y
-x==y x!=y
-x&y
-x^y
-x|y
-x&&y
-x||y
-x?y:z
-x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y
-x,y
-x::y
+(1 +1e10 0xabcdef) '2'
+// long double
+3.141592654e+10l
+// float
+120E6f
+// hex
+0xdeaf'1eaf+7ULL
+// octal
+01234560
+// binary
+0b1100+e1
+// expression
+1.5-e+3+f
+// another one
+str.e+75
+[a] b->*v d.*e
+~!a !~b c+ d- e**f g&&h
+a*=b c/=d e%=f
+a++b c--d
+a<<=b c>>=d
+a<=b c<d e>=f g>h i<=>j
+a!=b c=d
+a^=b c|=d e&=f
+a|b
+a?:b
+a==b c+d e-f g*h i/j k%l m<<n o>>p q&r s^t u|v
+a,b
+a:b
diff --git a/t/t4034/cpp/pre b/t/t4034/cpp/pre
index 23d5c8a..a1a09b7 100644
--- a/t/t4034/cpp/pre
+++ b/t/t4034/cpp/pre
@@ -1,19 +1,30 @@
-Foo():x(0&&1){}
+Foo():x(0&&1){ foo0( x.find); }
cout<<"Hello World!\n"<<endl;
1 -1e10 0xabcdef 'x'
-[a] a->b a.b
-!a ~a a++ a-- a*b a&b
-a*b a/b a%b
-a+b a-b
-a<<b a>>b
-a<b a<=b a>b a>=b
-a==b a!=b
-a&b
-a^b
-a|b
-a&&b
+// long double
+3.141592653e-10l
+// float
+120E5f
+// hex
+0xdead'1eaF+8ULL
+// octal
+01234567
+// binary
+0b1000+e1
+// expression
+1.5-e+2+f
+// another one
+str.e+65
+[a] b->v d.e
+!a ~b c++ d-- e*f g&h
+a*b c/d e%f
+a+b c-d
+a<<b c>>d
+a<b c<=d e>f g>=h i<=j
+a==b c!=d
+a^b c|d e&&f
a||b
-a?b:z
-a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b
-a,y
+a?b
+a=b c+=d e-=f g*=h i/=j k%=l m<<=n o>>=p q&=r s^=t u|=v
+a,b
a::b
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index dc7b242..d86e38a 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -361,7 +361,6 @@
rm -f sm1 &&
test_create_repo sm1 &&
head6=$(add_file sm1 foo6 foo7)
-fullhead6=$(cd sm1; git rev-parse --verify HEAD)
test_expect_success 'nonexistent commit' '
git diff-index -p --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
@@ -704,10 +703,26 @@
diff_cmp expected actual
'
-commit_file sm2
+cat >.gitmodules <<-EOF
+[submodule "sm2"]
+ path = sm2
+ url = bogus_url
+EOF
+git add .gitmodules
+commit_file sm2 .gitmodules
+
test_expect_success 'given commit' '
git diff-index -p --submodule=diff HEAD^ >actual &&
cat >expected <<-EOF &&
+ diff --git a/.gitmodules b/.gitmodules
+ new file mode 100644
+ index 1234567..89abcde
+ --- /dev/null
+ +++ b/.gitmodules
+ @@ -0,0 +1,3 @@
+ +[submodule "sm2"]
+ +path = sm2
+ +url = bogus_url
Submodule sm1 $head7...0000000 (submodule deleted)
Submodule sm2 0000000...$head9 (new submodule)
diff --git a/sm2/foo8 b/sm2/foo8
@@ -729,15 +744,21 @@
'
test_expect_success 'setup .git file for sm2' '
- (cd sm2 &&
- REAL="$(pwd)/../.real" &&
- mv .git "$REAL" &&
- echo "gitdir: $REAL" >.git)
+ git submodule absorbgitdirs sm2
'
test_expect_success 'diff --submodule=diff with .git file' '
git diff --submodule=diff HEAD^ >actual &&
cat >expected <<-EOF &&
+ diff --git a/.gitmodules b/.gitmodules
+ new file mode 100644
+ index 1234567..89abcde
+ --- /dev/null
+ +++ b/.gitmodules
+ @@ -0,0 +1,3 @@
+ +[submodule "sm2"]
+ +path = sm2
+ +url = bogus_url
Submodule sm1 $head7...0000000 (submodule deleted)
Submodule sm2 0000000...$head9 (new submodule)
diff --git a/sm2/foo8 b/sm2/foo8
@@ -758,9 +779,67 @@
diff_cmp expected actual
'
+mv sm2 sm2-bak
+
+test_expect_success 'deleted submodule with .git file' '
+ git diff-index -p --submodule=diff HEAD >actual &&
+ cat >expected <<-EOF &&
+ Submodule sm1 $head7...0000000 (submodule deleted)
+ Submodule sm2 $head9...0000000 (submodule deleted)
+ diff --git a/sm2/foo8 b/sm2/foo8
+ deleted file mode 100644
+ index 1234567..89abcde
+ --- a/sm2/foo8
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo8
+ diff --git a/sm2/foo9 b/sm2/foo9
+ deleted file mode 100644
+ index 1234567..89abcde
+ --- a/sm2/foo9
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo9
+ EOF
+ diff_cmp expected actual
+'
+
+echo submodule-to-blob>sm2
+
+test_expect_success 'typechanged(submodule->blob) submodule with .git file' '
+ git diff-index -p --submodule=diff HEAD >actual &&
+ cat >expected <<-EOF &&
+ Submodule sm1 $head7...0000000 (submodule deleted)
+ Submodule sm2 $head9...0000000 (submodule deleted)
+ diff --git a/sm2/foo8 b/sm2/foo8
+ deleted file mode 100644
+ index 1234567..89abcde
+ --- a/sm2/foo8
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo8
+ diff --git a/sm2/foo9 b/sm2/foo9
+ deleted file mode 100644
+ index 1234567..89abcde
+ --- a/sm2/foo9
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo9
+ diff --git a/sm2 b/sm2
+ new file mode 100644
+ index 1234567..89abcde
+ --- /dev/null
+ +++ b/sm2
+ @@ -0,0 +1 @@
+ +submodule-to-blob
+ EOF
+ diff_cmp expected actual
+'
+
+rm sm2
+mv sm2-bak sm2
+
test_expect_success 'setup nested submodule' '
- git submodule add -f ./sm2 &&
- git commit -a -m "add sm2" &&
git -C sm2 submodule add ../sm2 nested &&
git -C sm2 commit -a -m "nested sub" &&
head10=$(git -C sm2 rev-parse --short --verify HEAD)
@@ -791,6 +870,7 @@
test_expect_success 'diff --submodule=diff recurses into nested submodules' '
cat >expected <<-EOF &&
+ Submodule sm1 $head7...0000000 (submodule deleted)
Submodule sm2 contains modified content
Submodule sm2 $head9..$head10:
diff --git a/sm2/.gitmodules b/sm2/.gitmodules
@@ -830,4 +910,67 @@
diff_cmp expected actual
'
+(cd sm2; commit_file nested)
+commit_file sm2
+head12=$(cd sm2; git rev-parse --short --verify HEAD)
+
+mv sm2 sm2-bak
+
+test_expect_success 'diff --submodule=diff recurses into deleted nested submodules' '
+ cat >expected <<-EOF &&
+ Submodule sm1 $head7...0000000 (submodule deleted)
+ Submodule sm2 $head12...0000000 (submodule deleted)
+ diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+ deleted file mode 100644
+ index 3a816b8..0000000
+ --- a/sm2/.gitmodules
+ +++ /dev/null
+ @@ -1,3 +0,0 @@
+ -[submodule "nested"]
+ - path = nested
+ - url = ../sm2
+ diff --git a/sm2/foo8 b/sm2/foo8
+ deleted file mode 100644
+ index db9916b..0000000
+ --- a/sm2/foo8
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo8
+ diff --git a/sm2/foo9 b/sm2/foo9
+ deleted file mode 100644
+ index 9c3b4f6..0000000
+ --- a/sm2/foo9
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo9
+ Submodule nested $head11...0000000 (submodule deleted)
+ diff --git a/sm2/nested/file b/sm2/nested/file
+ deleted file mode 100644
+ index ca281f5..0000000
+ --- a/sm2/nested/file
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -nested content
+ diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+ deleted file mode 100644
+ index db9916b..0000000
+ --- a/sm2/nested/foo8
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo8
+ diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+ deleted file mode 100644
+ index 9c3b4f6..0000000
+ --- a/sm2/nested/foo9
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -foo9
+ EOF
+ git diff --submodule=diff >actual 2>err &&
+ test_must_be_empty err &&
+ diff_cmp expected actual
+'
+
+mv sm2-bak sm2
+
test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 9dfead9..7884e3d 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -449,6 +449,57 @@
)
'
+test_expect_success 'log --author' '
+ cat >expect <<-\EOF &&
+ Author: <BOLD;RED>A U<RESET> Thor <author@example.com>
+ EOF
+ git log -1 --color=always --author="A U" >log &&
+ grep Author log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --committer' '
+ cat >expect <<-\EOF &&
+ Commit: C O Mitter <committer@<BOLD;RED>example<RESET>.com>
+ EOF
+ git log -1 --color=always --pretty=fuller --committer="example" >log &&
+ grep "Commit:" log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log -i --grep with color' '
+ cat >expect <<-\EOF &&
+ <BOLD;RED>Sec<RESET>ond
+ <BOLD;RED>sec<RESET>ond
+ EOF
+ git log --color=always -i --grep=^sec >log &&
+ grep -i sec log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.selected log --grep' '
+ cat >expect <<-\EOF &&
+ <GREEN>th<RESET><BOLD;RED>ir<RESET><GREEN>d<RESET>
+ EOF
+ git -c color.grep.selected="green" log --color=always --grep=ir >log &&
+ grep ir log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.matchSelected log --grep' '
+ cat >expect <<-\EOF &&
+ <BLUE>i<RESET>n<BLUE>i<RESET>t<BLUE>i<RESET>al
+ EOF
+ git -c color.grep.matchSelected="blue" log --color=always --grep=i >log &&
+ grep al log >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect actual
+'
+
cat > expect <<EOF
* Second
* sixth
@@ -1616,6 +1667,16 @@
git commit -S -m signed_commit
'
+test_expect_success GPGSSH 'setup sshkey signed branch' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b signed-ssh main &&
+ echo foo >foo &&
+ git add foo &&
+ git commit -S -m signed_commit
+'
+
test_expect_success GPGSM 'log x509 fingerprint' '
echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
git log -n1 --format="%GF | %GP" signed-x509 >actual &&
@@ -1628,6 +1689,13 @@
test_cmp expect actual
'
+test_expect_success GPGSSH 'log ssh key fingerprint' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2\" | \"}" >expect &&
+ git log -n1 --format="%GF | %GP" signed-ssh >actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
@@ -1640,6 +1708,12 @@
grep "^| gpgsm: Good signature" actual
'
+test_expect_success GPGSSH 'log --graph --show-signature ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git log --graph --show-signature -n1 signed-ssh >actual &&
+ grep "${GOOD_SIGNATURE_TRUSTED}" actual
+'
+
test_expect_success GPG 'log --graph --show-signature for merged tag' '
test_when_finished "git reset --hard && git checkout main" &&
git checkout -b plain main &&
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index e59601e..c52c8a2 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -4,6 +4,8 @@
#
test_description='git merge-tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 7cabb85..8ae314a 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -291,6 +291,7 @@
cat ../expected >blob &&
git add blob &&
git commit -m "second commit in third" &&
+ git clean -f && # Remove untracked left behind by deleting index
git reset --hard HEAD^
) &&
git prune --expire=now &&
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index b028387..dcf03d3 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -5,9 +5,12 @@
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-bundle.sh
. "$TEST_DIRECTORY"/lib-bitmap.sh
+# t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in
+# their place.
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
objpath () {
echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
}
@@ -25,93 +28,10 @@
grep -Ff "$1" "$2"
}
-# To ensure the logic for "maximal commits" is exercised, make
-# the repository a bit more complicated.
-#
-# other second
-# * *
-# (99 commits) (99 commits)
-# * *
-# |\ /|
-# | * octo-other octo-second * |
-# |/|\_________ ____________/|\|
-# | \ \/ __________/ |
-# | | ________/\ / |
-# * |/ * merge-right *
-# | _|__________/ \____________ |
-# |/ | \|
-# (l1) * * merge-left * (r1)
-# | / \________________________ |
-# |/ \|
-# (l2) * * (r2)
-# \___________________________ |
-# \|
-# * (base)
-#
-# We only push bits down the first-parent history, which
-# makes some of these commits unimportant!
-#
-# The important part for the maximal commit algorithm is how
-# the bitmasks are extended. Assuming starting bit positions
-# for second (bit 0) and other (bit 1), the bitmasks at the
-# end should be:
-#
-# second: 1 (maximal, selected)
-# other: 01 (maximal, selected)
-# (base): 11 (maximal)
-#
-# This complicated history was important for a previous
-# version of the walk that guarantees never walking a
-# commit multiple times. That goal might be important
-# again, so preserve this complicated case. For now, this
-# test will guarantee that the bitmaps are computed
-# correctly, even with the repeat calculations.
+setup_bitmap_history
-test_expect_success 'setup repo with moderate-sized history' '
- test_commit_bulk --id=file 10 &&
- git branch -M second &&
- git checkout -b other HEAD~5 &&
- test_commit_bulk --id=side 10 &&
-
- # add complicated history setup, including merges and
- # ambiguous merge-bases
-
- git checkout -b merge-left other~2 &&
- git merge second~2 -m "merge-left" &&
-
- git checkout -b merge-right second~1 &&
- git merge other~1 -m "merge-right" &&
-
- git checkout -b octo-second second &&
- git merge merge-left merge-right -m "octopus-second" &&
-
- git checkout -b octo-other other &&
- git merge merge-left merge-right -m "octopus-other" &&
-
- git checkout other &&
- git merge octo-other -m "pull octopus" &&
-
- git checkout second &&
- git merge octo-second -m "pull octopus" &&
-
- # Remove these branches so they are not selected
- # as bitmap tips
- git branch -D merge-left &&
- git branch -D merge-right &&
- git branch -D octo-other &&
- git branch -D octo-second &&
-
- # add padding to make these merges less interesting
- # and avoid having them selected for bitmaps
- test_commit_bulk --id=file 100 &&
- git checkout other &&
- test_commit_bulk --id=side 100 &&
- git checkout second &&
-
- bitmaptip=$(git rev-parse second) &&
- blob=$(echo tagged-blob | git hash-object -w --stdin) &&
- git tag tagged-blob $blob &&
- git config repack.writebitmaps true
+test_expect_success 'setup writing bitmaps during repack' '
+ git config repack.writeBitmaps true
'
test_expect_success 'full repack creates bitmaps' '
@@ -123,109 +43,7 @@
grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
'
-test_expect_success 'rev-list --test-bitmap verifies bitmaps' '
- git rev-list --test-bitmap HEAD
-'
-
-rev_list_tests_head () {
- test_expect_success "counting commits via bitmap ($state, $branch)" '
- git rev-list --count $branch >expect &&
- git rev-list --use-bitmap-index --count $branch >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "counting partial commits via bitmap ($state, $branch)" '
- git rev-list --count $branch~5..$branch >expect &&
- git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "counting commits with limit ($state, $branch)" '
- git rev-list --count -n 1 $branch >expect &&
- git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "counting non-linear history ($state, $branch)" '
- git rev-list --count other...second >expect &&
- git rev-list --use-bitmap-index --count other...second >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "counting commits with limiting ($state, $branch)" '
- git rev-list --count $branch -- 1.t >expect &&
- git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "counting objects via bitmap ($state, $branch)" '
- git rev-list --count --objects $branch >expect &&
- git rev-list --use-bitmap-index --count --objects $branch >actual &&
- test_cmp expect actual
- '
-
- test_expect_success "enumerate commits ($state, $branch)" '
- git rev-list --use-bitmap-index $branch >actual &&
- git rev-list $branch >expect &&
- test_bitmap_traversal --no-confirm-bitmaps expect actual
- '
-
- test_expect_success "enumerate --objects ($state, $branch)" '
- git rev-list --objects --use-bitmap-index $branch >actual &&
- git rev-list --objects $branch >expect &&
- test_bitmap_traversal expect actual
- '
-
- test_expect_success "bitmap --objects handles non-commit objects ($state, $branch)" '
- git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
- grep $blob actual
- '
-}
-
-rev_list_tests () {
- state=$1
-
- for branch in "second" "other"
- do
- rev_list_tests_head
- done
-}
-
-rev_list_tests 'full bitmap'
-
-test_expect_success 'clone from bitmapped repository' '
- git clone --no-local --bare . clone.git &&
- git rev-parse HEAD >expect &&
- git --git-dir=clone.git rev-parse HEAD >actual &&
- test_cmp expect actual
-'
-
-test_expect_success 'partial clone from bitmapped repository' '
- test_config uploadpack.allowfilter true &&
- git clone --no-local --bare --filter=blob:none . partial-clone.git &&
- (
- cd partial-clone.git &&
- pack=$(echo objects/pack/*.pack) &&
- git verify-pack -v "$pack" >have &&
- awk "/blob/ { print \$1 }" <have >blobs &&
- # we expect this single blob because of the direct ref
- git rev-parse refs/tags/tagged-blob >expect &&
- test_cmp expect blobs
- )
-'
-
-test_expect_success 'setup further non-bitmapped commits' '
- test_commit_bulk --id=further 10
-'
-
-rev_list_tests 'partial bitmap'
-
-test_expect_success 'fetch (partial bitmap)' '
- git --git-dir=clone.git fetch origin second:second &&
- git rev-parse HEAD >expect &&
- git --git-dir=clone.git rev-parse HEAD >actual &&
- test_cmp expect actual
-'
+basic_bitmap_tests
test_expect_success 'incremental repack fails when bitmaps are requested' '
test_commit more-1 &&
@@ -461,40 +279,6 @@
test_i18ngrep corrupted.bitmap.index stderr
'
-test_expect_success 'enumerating progress counts pack-reused objects' '
- count=$(git rev-list --objects --all --count) &&
- git repack -adb &&
-
- # check first with only reused objects; confirm that our progress
- # showed the right number, and also that we did pack-reuse as expected.
- # Check only the final "done" line of the meter (there may be an
- # arbitrary number of intermediate lines ending with CR).
- GIT_PROGRESS_DELAY=0 \
- git pack-objects --all --stdout --progress \
- </dev/null >/dev/null 2>stderr &&
- grep "Enumerating objects: $count, done" stderr &&
- grep "pack-reused $count" stderr &&
-
- # now the same but with one non-reused object
- git commit --allow-empty -m "an extra commit object" &&
- GIT_PROGRESS_DELAY=0 \
- git pack-objects --all --stdout --progress \
- </dev/null >/dev/null 2>stderr &&
- grep "Enumerating objects: $((count+1)), done" stderr &&
- grep "pack-reused $count" stderr
-'
-
-# have_delta <obj> <expected_base>
-#
-# Note that because this relies on cat-file, it might find _any_ copy of an
-# object in the repository. The caller is responsible for making sure
-# there's only one (e.g., via "repack -ad", or having just fetched a copy).
-have_delta () {
- echo $2 >expect &&
- echo $1 | git cat-file --batch-check="%(deltabase)" >actual &&
- test_cmp expect actual
-}
-
# Create a state of history with these properties:
#
# - refs that allow a client to fetch some new history, while sharing some old
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 11423b3..ea889c0 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -7,6 +7,9 @@
bail out or to proceed using it as a reachable tip, but it is _not_
OK to proceed as if it did not exist. Otherwise we might silently
delete objects that cannot be recovered.
+
+Note that we do assert command failure in these cases, because that is
+what currently happens. If that changes, these tests should be revisited.
'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -18,39 +21,58 @@
git reflog expire --expire=all --all
'
+create_bogus_ref () {
+ test_when_finished 'rm -f .git/refs/heads/bogus..name' &&
+ echo $bogus >.git/refs/heads/bogus..name
+}
+
test_expect_success 'create history reachable only from a bogus-named ref' '
test_tick && git commit --allow-empty -m main &&
base=$(git rev-parse HEAD) &&
test_tick && git commit --allow-empty -m bogus &&
bogus=$(git rev-parse HEAD) &&
git cat-file commit $bogus >saved &&
- echo $bogus >.git/refs/heads/bogus..name &&
git reset --hard HEAD^
'
test_expect_success 'pruning does not drop bogus object' '
test_when_finished "git hash-object -w -t commit saved" &&
- test_might_fail git prune --expire=now &&
- verbose git cat-file -e $bogus
+ create_bogus_ref &&
+ test_must_fail git prune --expire=now &&
+ git cat-file -e $bogus
'
test_expect_success 'put bogus object into pack' '
git tag reachable $bogus &&
git repack -ad &&
git tag -d reachable &&
- verbose git cat-file -e $bogus
+ git cat-file -e $bogus
'
+test_expect_success 'non-destructive repack bails on bogus ref' '
+ create_bogus_ref &&
+ test_must_fail git repack -adk
+'
+
+test_expect_success 'GIT_REF_PARANOIA=0 overrides safety' '
+ create_bogus_ref &&
+ GIT_REF_PARANOIA=0 git repack -adk
+'
+
+
test_expect_success 'destructive repack keeps packed object' '
- test_might_fail git repack -Ad --unpack-unreachable=now &&
- verbose git cat-file -e $bogus &&
- test_might_fail git repack -ad &&
- verbose git cat-file -e $bogus
+ create_bogus_ref &&
+ test_must_fail git repack -Ad --unpack-unreachable=now &&
+ git cat-file -e $bogus &&
+ test_must_fail git repack -ad &&
+ git cat-file -e $bogus
'
-# subsequent tests will have different corruptions
-test_expect_success 'clean up bogus ref' '
- rm .git/refs/heads/bogus..name
+test_expect_success 'destructive repack not confused by dangling symref' '
+ test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
+ git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
+ git repack -ad &&
+ test_must_fail git cat-file -e $bogus
'
# We create two new objects here, "one" and "two". Our
@@ -77,8 +99,8 @@
test_expect_success 'pruning with a corrupted tip does not drop history' '
test_when_finished "git hash-object -w -t commit saved" &&
- test_might_fail git prune --expire=now &&
- verbose git cat-file -e $recoverable
+ test_must_fail git prune --expire=now &&
+ git cat-file -e $recoverable
'
test_expect_success 'pack-refs does not silently delete broken loose ref' '
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index af88f80..f516fda 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -5,6 +5,25 @@
GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
+test_expect_success 'usage' '
+ test_expect_code 129 git commit-graph write blah 2>err &&
+ test_expect_code 129 git commit-graph write verify
+'
+
+test_expect_success 'usage shown without sub-command' '
+ test_expect_code 129 git commit-graph 2>err &&
+ ! grep error: err
+'
+
+test_expect_success 'usage shown with an error on unknown sub-command' '
+ cat >expect <<-\EOF &&
+ error: unrecognized subcommand: unknown
+ EOF
+ test_expect_code 129 git commit-graph unknown 2>stderr &&
+ grep error stderr >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'setup full repo' '
mkdir full &&
cd "$TRASH_DIRECTORY/full" &&
@@ -51,8 +70,8 @@
'
graph_git_two_modes() {
- git -c core.commitGraph=true $1 >output
- git -c core.commitGraph=false $1 >expect
+ git -c core.commitGraph=true $1 >output &&
+ git -c core.commitGraph=false $1 >expect &&
test_cmp expect output
}
@@ -366,6 +385,7 @@
git commit-graph write --reachable &&
test_path_is_file .git/objects/info/commit-graph &&
git replace HEAD~1 HEAD~2 &&
+ graph_git_two_modes "commit-graph verify" &&
git -c core.commitGraph=false log >expect &&
git -c core.commitGraph=true log >actual &&
test_cmp expect actual &&
@@ -674,12 +694,33 @@
$GRAPH_CHUNK_LOOKUP_OFFSET
'
-test_expect_success 'git fsck (checks commit-graph)' '
+test_expect_success 'git fsck (checks commit-graph when config set to true)' '
cd "$TRASH_DIRECTORY/full" &&
git fsck &&
corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
"incorrect checksum" &&
cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+ test_must_fail git -c core.commitGraph=true fsck
+'
+
+test_expect_success 'git fsck (ignores commit-graph when config set to false)' '
+ cd "$TRASH_DIRECTORY/full" &&
+ git fsck &&
+ corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+ "incorrect checksum" &&
+ cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+ git -c core.commitGraph=false fsck
+'
+
+test_expect_success 'git fsck (checks commit-graph when config unset)' '
+ cd "$TRASH_DIRECTORY/full" &&
+ test_when_finished "git config core.commitGraph true" &&
+
+ git fsck &&
+ corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+ "incorrect checksum" &&
+ test_unconfig core.commitGraph &&
+ cp commit-graph-pre-write-test $objdir/info/commit-graph &&
test_must_fail git fsck
'
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 3d4d9f1..3f69e43 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -168,18 +168,33 @@
compare_results_with_midx "two packs"
+test_expect_success 'write midx with --stdin-packs' '
+ rm -fr $objdir/pack/multi-pack-index &&
+
+ idx="$(find $objdir/pack -name "test-2-*.idx")" &&
+ basename "$idx" >in &&
+
+ git multi-pack-index write --stdin-packs <in &&
+
+ test-tool read-midx $objdir | grep "\.idx$" >packs &&
+
+ test_cmp packs in
+'
+
+compare_results_with_midx "mixed mode (one pack + extra)"
+
test_expect_success 'write progress off for redirected stderr' '
git multi-pack-index --object-dir=$objdir write 2>err &&
test_line_count = 0 err
'
test_expect_success 'write force progress on for stderr' '
- GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress write 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --progress 2>err &&
test_file_not_empty err
'
test_expect_success 'write with the --no-progress option' '
- GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress write 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --no-progress 2>err &&
test_line_count = 0 err
'
@@ -201,6 +216,34 @@
compare_results_with_midx "twelve packs"
+test_expect_success 'multi-pack-index *.rev cleanup with --object-dir' '
+ git init repo &&
+ git clone -s repo alternate &&
+
+ test_when_finished "rm -rf repo alternate" &&
+
+ (
+ cd repo &&
+ test_commit base &&
+ git repack -d
+ ) &&
+
+ ours="alternate/.git/objects/pack/multi-pack-index-123.rev" &&
+ theirs="repo/.git/objects/pack/multi-pack-index-abc.rev" &&
+ touch "$ours" "$theirs" &&
+
+ (
+ cd alternate &&
+ git multi-pack-index --object-dir ../repo/.git/objects write
+ ) &&
+
+ # writing a midx in "repo" should not remove the .rev file in the
+ # alternate
+ test_path_is_file repo/.git/objects/pack/multi-pack-index &&
+ test_path_is_file $ours &&
+ test_path_is_missing $theirs
+'
+
test_expect_success 'warn on improper hash version' '
git init --object-format=sha1 sha1 &&
(
@@ -277,6 +320,23 @@
)
'
+test_expect_success 'preferred packs must be non-empty' '
+ test_when_finished rm -rf preferred.git &&
+ git init preferred.git &&
+ (
+ cd preferred.git &&
+
+ test_commit base &&
+ git repack -ad &&
+
+ empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
+
+ test_must_fail git multi-pack-index write \
+ --preferred-pack=pack-$empty.pack 2>err &&
+ grep "with no objects" err
+ )
+'
+
test_expect_success 'verify multi-pack-index success' '
git multi-pack-index verify --object-dir=$objdir
'
@@ -407,7 +467,10 @@
test_expect_success 'git-fsck incorrect offset' '
corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
"incorrect object offset" \
- "git -c core.multipackindex=true fsck"
+ "git -c core.multiPackIndex=true fsck" &&
+ test_unconfig core.multiPackIndex &&
+ test_must_fail git fsck &&
+ git -c core.multiPackIndex=false fsck
'
test_expect_success 'corrupt MIDX is not reused' '
@@ -429,12 +492,12 @@
'
test_expect_success 'repack force progress on for stderr' '
- GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress repack 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --progress 2>err &&
test_file_not_empty err
'
test_expect_success 'repack with the --no-progress option' '
- GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress repack 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --no-progress 2>err &&
test_line_count = 0 err
'
@@ -487,7 +550,8 @@
compare_results_with_midx "after repack"
test_expect_success 'multi-pack-index and pack-bitmap' '
- git -c repack.writeBitmaps=true repack -ad &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -c repack.writeBitmaps=true repack -ad &&
git multi-pack-index write &&
git rev-list --test-bitmap HEAD
'
@@ -537,7 +601,15 @@
idx64=objects64/pack/test-64-$pack64.idx &&
chmod u+w $idx64 &&
corrupt_data $idx64 $(test_oid idxoff) "\02" &&
- midx64=$(git multi-pack-index --object-dir=objects64 write) &&
+ # objects64 is not a real repository, but can serve as an alternate
+ # anyway so we can write a MIDX into it
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+ ( cd ../objects64 && pwd ) >.git/objects/info/alternates &&
+ midx64=$(git multi-pack-index --object-dir=../objects64 write)
+ ) &&
midx_read_expect 1 63 5 objects64 " large-offsets"
'
@@ -618,7 +690,7 @@
test_expect_success 'expire force progress on for stderr' '
(
cd dup &&
- GIT_PROGRESS_DELAY=0 git multi-pack-index --progress expire 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index expire --progress 2>err &&
test_file_not_empty err
)
'
@@ -626,7 +698,7 @@
test_expect_success 'expire with the --no-progress option' '
(
cd dup &&
- GIT_PROGRESS_DELAY=0 git multi-pack-index --no-progress expire 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index expire --no-progress 2>err &&
test_line_count = 0 err
)
'
@@ -842,4 +914,9 @@
! test_i18ngrep "unrecognized subcommand" err
'
+test_expect_success 'complains when run outside of a repository' '
+ nongit test_must_fail git multi-pack-index write 2>err &&
+ grep "not a git repository" err
+'
+
test_done
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 587226e..847b809 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -55,8 +55,8 @@
'
graph_git_two_modes() {
- git -c core.commitGraph=true $1 >output
- git -c core.commitGraph=false $1 >expect
+ git ${2:+ -C "$2"} -c core.commitGraph=true $1 >output &&
+ git ${2:+ -C "$2"} -c core.commitGraph=false $1 >expect &&
test_cmp expect output
}
@@ -64,12 +64,13 @@
MSG=$1
BRANCH=$2
COMPARE=$3
+ DIR=$4
test_expect_success "check normal git operations: $MSG" '
- graph_git_two_modes "log --oneline $BRANCH" &&
- graph_git_two_modes "log --topo-order $BRANCH" &&
- graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
- graph_git_two_modes "branch -vv" &&
- graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+ graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+ graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+ graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+ graph_git_two_modes "branch -vv" "$DIR" &&
+ graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
'
}
@@ -187,7 +188,10 @@
)
'
-graph_git_behavior 'alternate: commit 13 vs 6' commits/13 commits/6
+if test -d fork
+then
+ graph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 "fork"
+fi
test_expect_success 'test merge stragety constants' '
git clone . merge-2 &&
diff --git a/t/t5326-multi-pack-bitmaps.sh b/t/t5326-multi-pack-bitmaps.sh
new file mode 100755
index 0000000..e187f90
--- /dev/null
+++ b/t/t5326-multi-pack-bitmaps.sh
@@ -0,0 +1,398 @@
+#!/bin/sh
+
+test_description='exercise basic multi-pack bitmap functionality'
+. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+
+# We'll be writing our own midx and bitmaps, so avoid getting confused by the
+# automatic ones.
+GIT_TEST_MULTI_PACK_INDEX=0
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
+# midx_pack_source <obj>
+midx_pack_source () {
+ test-tool read-midx --show-objects .git/objects | grep "^$1 " | cut -f2
+}
+
+setup_bitmap_history
+
+test_expect_success 'enable core.multiPackIndex' '
+ git config core.multiPackIndex true
+'
+
+test_expect_success 'create single-pack midx with bitmaps' '
+ git repack -ad &&
+ git multi-pack-index write --bitmap &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev
+'
+
+basic_bitmap_tests
+
+test_expect_success 'create new additional packs' '
+ for i in $(test_seq 1 16)
+ do
+ test_commit "$i" &&
+ git repack -d || return 1
+ done &&
+
+ git checkout -b other2 HEAD~8 &&
+ for i in $(test_seq 1 8)
+ do
+ test_commit "side-$i" &&
+ git repack -d || return 1
+ done &&
+ git checkout second
+'
+
+test_expect_success 'create multi-pack midx with bitmaps' '
+ git multi-pack-index write --bitmap &&
+
+ ls $objdir/pack/pack-*.pack >packs &&
+ test_line_count = 25 packs &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev
+'
+
+basic_bitmap_tests
+
+test_expect_success '--no-bitmap is respected when bitmaps exist' '
+ git multi-pack-index write --bitmap &&
+
+ test_commit respect--no-bitmap &&
+ git repack -d &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev &&
+
+ git multi-pack-index write --no-bitmap &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_missing $midx-$(midx_checksum $objdir).rev
+'
+
+test_expect_success 'setup midx with base from later pack' '
+ # Write a and b so that "a" is a delta on top of base "b", since Git
+ # prefers to delete contents out of a base rather than add to a shorter
+ # object.
+ test_seq 1 128 >a &&
+ test_seq 1 130 >b &&
+
+ git add a b &&
+ git commit -m "initial commit" &&
+
+ a=$(git rev-parse HEAD:a) &&
+ b=$(git rev-parse HEAD:b) &&
+
+ # In the first pack, "a" is stored as a delta to "b".
+ p1=$(git pack-objects .git/objects/pack/pack <<-EOF
+ $a
+ $b
+ EOF
+ ) &&
+
+ # In the second pack, "a" is missing, and "b" is not a delta nor base to
+ # any other object.
+ p2=$(git pack-objects .git/objects/pack/pack <<-EOF
+ $b
+ $(git rev-parse HEAD)
+ $(git rev-parse HEAD^{tree})
+ EOF
+ ) &&
+
+ git prune-packed &&
+ # Use the second pack as the preferred source, so that "b" occurs
+ # earlier in the MIDX object order, rendering "a" unusable for pack
+ # reuse.
+ git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
+
+ have_delta $a $b &&
+ test $(midx_pack_source $a) != $(midx_pack_source $b)
+'
+
+rev_list_tests 'full bitmap with backwards delta'
+
+test_expect_success 'clone with bitmaps enabled' '
+ git clone --no-local --bare . clone-reverse-delta.git &&
+ test_when_finished "rm -fr clone-reverse-delta.git" &&
+
+ git rev-parse HEAD >expect &&
+ git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
+ test_cmp expect actual
+'
+
+bitmap_reuse_tests() {
+ from=$1
+ to=$2
+
+ test_expect_success "setup pack reuse tests ($from -> $to)" '
+ rm -fr repo &&
+ git init repo &&
+ (
+ cd repo &&
+ test_commit_bulk 16 &&
+ git tag old-tip &&
+
+ git config core.multiPackIndex true &&
+ if test "MIDX" = "$from"
+ then
+ git repack -Ad &&
+ git multi-pack-index write --bitmap
+ else
+ git repack -Adb
+ fi
+ )
+ '
+
+ test_expect_success "build bitmap from existing ($from -> $to)" '
+ (
+ cd repo &&
+ test_commit_bulk --id=further 16 &&
+ git tag new-tip &&
+
+ if test "MIDX" = "$to"
+ then
+ git repack -d &&
+ git multi-pack-index write --bitmap
+ else
+ git repack -Adb
+ fi
+ )
+ '
+
+ test_expect_success "verify resulting bitmaps ($from -> $to)" '
+ (
+ cd repo &&
+ git for-each-ref &&
+ git rev-list --test-bitmap refs/tags/old-tip &&
+ git rev-list --test-bitmap refs/tags/new-tip
+ )
+ '
+}
+
+bitmap_reuse_tests 'pack' 'MIDX'
+bitmap_reuse_tests 'MIDX' 'pack'
+bitmap_reuse_tests 'MIDX' 'MIDX'
+
+test_expect_success 'missing object closure fails gracefully' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit loose &&
+ test_commit packed &&
+
+ # Do not pass "--revs"; we want a pack without the "loose"
+ # commit.
+ git pack-objects $objdir/pack/pack <<-EOF &&
+ $(git rev-parse packed)
+ EOF
+
+ test_must_fail git multi-pack-index write --bitmap 2>err &&
+ grep "doesn.t have full closure" err &&
+ test_path_is_missing $midx
+ )
+'
+
+test_expect_success 'setup partial bitmaps' '
+ test_commit packed &&
+ git repack &&
+ test_commit loose &&
+ git multi-pack-index write --bitmap 2>err &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev
+'
+
+basic_bitmap_tests HEAD~
+
+test_expect_success 'removing a MIDX clears stale bitmaps' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+ test_commit base &&
+ git repack &&
+ git multi-pack-index write --bitmap &&
+
+ # Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
+ stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
+ stale_rev=$midx-$(midx_checksum $objdir).rev &&
+ rm $midx &&
+
+ # Then write a new MIDX.
+ test_commit new &&
+ git repack &&
+ git multi-pack-index write --bitmap &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev &&
+ test_path_is_missing $stale_bitmap &&
+ test_path_is_missing $stale_rev
+ )
+'
+
+test_expect_success 'pack.preferBitmapTips' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit_bulk --message="%s" 103 &&
+
+ git log --format="%H" >commits.raw &&
+ sort <commits.raw >commits &&
+
+ git log --format="create refs/tags/%s %H" HEAD >refs &&
+ git update-ref --stdin <refs &&
+
+ git multi-pack-index write --bitmap &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >before &&
+ test_line_count = 1 before &&
+
+ perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
+ <before | git update-ref --stdin &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx-$(midx_checksum $objdir).rev &&
+ rm -fr $midx &&
+
+ git -c pack.preferBitmapTips=refs/tags/include \
+ multi-pack-index write --bitmap &&
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >after &&
+
+ ! test_cmp before after
+ )
+'
+
+test_expect_success 'writing a bitmap with --refs-snapshot' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit one &&
+ test_commit two &&
+
+ git rev-parse one >snapshot &&
+
+ git repack -ad &&
+
+ # First, write a MIDX which see both refs/tags/one and
+ # refs/tags/two (causing both of those commits to receive
+ # bitmaps).
+ git multi-pack-index write --bitmap &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ grep "$(git rev-parse one)" bitmaps &&
+ grep "$(git rev-parse two)" bitmaps &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx-$(midx_checksum $objdir).rev &&
+ rm -fr $midx &&
+
+ # Then again, but with a refs snapshot which only sees
+ # refs/tags/one.
+ git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ grep "$(git rev-parse one)" bitmaps &&
+ ! grep "$(git rev-parse two)" bitmaps
+ )
+'
+
+test_expect_success 'write a bitmap with --refs-snapshot (preferred tips)' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit_bulk --message="%s" 103 &&
+
+ git log --format="%H" >commits.raw &&
+ sort <commits.raw >commits &&
+
+ git log --format="create refs/tags/%s %H" HEAD >refs &&
+ git update-ref --stdin <refs &&
+
+ git multi-pack-index write --bitmap &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >before &&
+ test_line_count = 1 before &&
+
+ (
+ grep -vf before commits.raw &&
+ # mark missing commits as preferred
+ sed "s/^/+/" before
+ ) >snapshot &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx-$(midx_checksum $objdir).rev &&
+ rm -fr $midx &&
+
+ git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >after &&
+
+ ! test_cmp before after
+ )
+'
+
+test_expect_success 'hash-cache values are propagated from pack bitmaps' '
+ rm -fr repo &&
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit base &&
+ test_commit base2 &&
+ git repack -adb &&
+
+ test-tool bitmap dump-hashes >pack.raw &&
+ test_file_not_empty pack.raw &&
+ sort pack.raw >pack.hashes &&
+
+ test_commit new &&
+ git repack &&
+ git multi-pack-index write --bitmap &&
+
+ test-tool bitmap dump-hashes >midx.raw &&
+ sort midx.raw >midx.hashes &&
+
+ # ensure that every namehash in the pack bitmap can be found in
+ # the midx bitmap (i.e., that there are no oid-namehash pairs
+ # unique to the pack bitmap).
+ comm -23 pack.hashes midx.hashes >dropped.hashes &&
+ test_must_be_empty dropped.hashes
+ )
+'
+
+test_done
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 4db8edd..8212ca5 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -662,10 +662,10 @@
test_expect_success 'allow deleting an invalid remote ref' '
- mk_test testrepo heads/main &&
+ mk_test testrepo heads/branch &&
rm -f testrepo/.git/objects/??/* &&
- git push testrepo :refs/heads/main &&
- (cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
+ git push testrepo :refs/heads/branch &&
+ (cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
'
@@ -706,25 +706,26 @@
'
test_expect_success 'deleting dangling ref triggers hooks with correct args' '
- mk_test_with_hooks testrepo heads/main &&
+ mk_test_with_hooks testrepo heads/branch &&
+ orig=$(git -C testrepo rev-parse refs/heads/branch) &&
rm -f testrepo/.git/objects/??/* &&
- git push testrepo :refs/heads/main &&
+ git push testrepo :refs/heads/branch &&
(
cd testrepo/.git &&
cat >pre-receive.expect <<-EOF &&
- $ZERO_OID $ZERO_OID refs/heads/main
+ $orig $ZERO_OID refs/heads/branch
EOF
cat >update.expect <<-EOF &&
- refs/heads/main $ZERO_OID $ZERO_OID
+ refs/heads/branch $orig $ZERO_OID
EOF
cat >post-receive.expect <<-EOF &&
- $ZERO_OID $ZERO_OID refs/heads/main
+ $orig $ZERO_OID refs/heads/branch
EOF
cat >post-update.expect <<-EOF &&
- refs/heads/main
+ refs/heads/branch
EOF
test_cmp pre-receive.expect pre-receive.actual &&
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 672001a..93ecfcd 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -546,15 +546,6 @@
test_cmp expect actual
'
-test_expect_success REBASE_P \
- 'pull.rebase=preserve rebases and merges keep-merge' '
- git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
- git pull . copy &&
- test_cmp_rev HEAD^^ copy &&
- test_cmp_rev HEAD^2 keep-merge
-'
-
test_expect_success 'pull.rebase=interactive' '
write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
echo I was here >fake.out &&
@@ -598,7 +589,7 @@
test_expect_success '--rebase=true rebases and flattens keep-merge' '
git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase=true . copy &&
test_cmp_rev HEAD^^ copy &&
echo file3 >expect &&
@@ -606,23 +597,14 @@
test_cmp expect actual
'
-test_expect_success REBASE_P \
- '--rebase=preserve rebases and merges keep-merge' '
- git reset --hard before-preserve-rebase &&
- test_config pull.rebase true &&
- git pull --rebase=preserve . copy &&
- test_cmp_rev HEAD^^ copy &&
- test_cmp_rev HEAD^2 keep-merge
-'
-
test_expect_success '--rebase=invalid fails' '
git reset --hard before-preserve-rebase &&
test_must_fail git pull --rebase=invalid . copy
'
-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
+test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
git reset --hard before-preserve-rebase &&
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase . copy &&
test_cmp_rev HEAD^^ copy &&
echo file3 >expect &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 7601c91..66cfcb0 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -228,4 +228,28 @@
test_must_be_empty actual
'
+test_expect_success 'git pull --no-verify flag passed to merge' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ write_script dst/.git/hooks/commit-msg <<-\EOF &&
+ false
+ EOF
+ test_commit -C src two &&
+ git -C dst pull --no-ff --no-verify
+'
+
+test_expect_success 'git pull --no-verify --verify passed to merge' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ write_script dst/.git/hooks/commit-msg <<-\EOF &&
+ false
+ EOF
+ test_commit -C src two &&
+ test_must_fail git -C dst pull --no-ff --no-verify --verify
+'
+
test_done
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index ed11569..2dc75b8 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -6,6 +6,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
pwd=$(pwd)
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index d573ca4..3f58b51 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index bba768f..24d374a 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -137,6 +137,53 @@
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSSH 'ssh signed push sends push certificate' '
+ prepare_dst &&
+ mkdir -p dst/.git/hooks &&
+ git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git -C dst config receive.certnonceseed sekrit &&
+ write_script dst/.git/hooks/post-receive <<-\EOF &&
+ # discard the update list
+ cat >/dev/null
+ # record the push certificate
+ if test -n "${GIT_PUSH_CERT-}"
+ then
+ git cat-file blob $GIT_PUSH_CERT >../push-cert
+ fi &&
+
+ cat >../push-cert-status <<E_O_F
+ SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+ KEY=${GIT_PUSH_CERT_KEY-nokey}
+ STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+ NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=principal with number 1
+ KEY=FINGERPRINT
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
test_expect_success GPG 'inconsistent push options in signed push not allowed' '
# First, invoke receive-pack with dummy input to obtain its preamble.
prepare_dst &&
@@ -276,6 +323,60 @@
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSSH 'fail without key and heed user.signingkey ssh' '
+ test_config gpg.format ssh &&
+ prepare_dst &&
+ mkdir -p dst/.git/hooks &&
+ git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git -C dst config receive.certnonceseed sekrit &&
+ write_script dst/.git/hooks/post-receive <<-\EOF &&
+ # discard the update list
+ cat >/dev/null
+ # record the push certificate
+ if test -n "${GIT_PUSH_CERT-}"
+ then
+ git cat-file blob $GIT_PUSH_CERT >../push-cert
+ fi &&
+
+ cat >../push-cert-status <<E_O_F
+ SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+ KEY=${GIT_PUSH_CERT_KEY-nokey}
+ STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+ NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+
+ test_config user.email hasnokey@nowhere.com &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "" &&
+ (
+ sane_unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=principal with number 1
+ KEY=FINGERPRINT
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
test_expect_success GPG 'failed atomic push does not execute GPG' '
prepare_dst &&
git -C dst config receive.certnonceseed sekrit &&
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index c024fa2..8ca50f8 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -509,4 +509,20 @@
test_i18ngrep ! "^hint: " decoded
'
+test_expect_success 'report error server does not provide ref status' '
+ git init "$HTTPD_DOCUMENT_ROOT_PATH/no_report" &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" config http.receivepack true &&
+ test_must_fail git push --porcelain \
+ $HTTPD_URL_USER_PASS/smart/no_report \
+ HEAD:refs/tags/will-fail >actual &&
+ test_must_fail git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" \
+ rev-parse --verify refs/tags/will-fail &&
+ cat >expect <<-EOF &&
+ To $HTTPD_URL/smart/no_report
+ ! HEAD:refs/tags/will-fail [remote failure] (remote failed to report status)
+ Done
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 58c7add..2142283 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
mk_repo_pair () {
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 4e54226..f92c79c 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -558,4 +558,13 @@
expect_askpass both user@host
'
+test_expect_success 'client falls back from v2 to v0 to match server' '
+ GIT_TRACE_PACKET=$PWD/trace \
+ GIT_TEST_PROTOCOL_VERSION=2 \
+ git clone $HTTPD_URL/smart_v0/repo.git repo-v0 &&
+ # check for v0; there the HEAD symref is communicated in the capability
+ # line; v2 uses a different syntax on each ref advertisement line
+ grep symref=HEAD:refs/heads/ trace
+'
+
test_done
diff --git a/t/t5555-http-smart-common.sh b/t/t5555-http-smart-common.sh
new file mode 100755
index 0000000..49faf5e
--- /dev/null
+++ b/t/t5555-http-smart-common.sh
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+test_description='test functionality common to smart fetch & push'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit --no-tag initial
+'
+
+test_expect_success 'git upload-pack --http-backend-info-refs and --advertise-refs are aliased' '
+ git upload-pack --http-backend-info-refs . >expected 2>err.expected &&
+ git upload-pack --advertise-refs . >actual 2>err.actual &&
+ test_cmp err.expected err.actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'git receive-pack --http-backend-info-refs and --advertise-refs are aliased' '
+ git receive-pack --http-backend-info-refs . >expected 2>err.expected &&
+ git receive-pack --advertise-refs . >actual 2>err.actual &&
+ test_cmp err.expected err.actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'git upload-pack --advertise-refs' '
+ cat >expect <<-EOF &&
+ $(git rev-parse HEAD) HEAD
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ # We only care about GIT_PROTOCOL, not GIT_TEST_PROTOCOL_VERSION
+ sane_unset GIT_PROTOCOL &&
+ GIT_TEST_PROTOCOL_VERSION=2 \
+ git upload-pack --advertise-refs . >out 2>err &&
+
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect &&
+
+ # The --advertise-refs alias works
+ git upload-pack --advertise-refs . >out 2>err &&
+
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v0' '
+ # With no specified protocol
+ cat >expect <<-EOF &&
+ $(git rev-parse HEAD) HEAD
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ git upload-pack --advertise-refs . >out 2>err &&
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect &&
+
+ # With explicit v0
+ GIT_PROTOCOL=version=0 \
+ git upload-pack --advertise-refs . >out 2>err &&
+ test-tool pkt-line unpack <out >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v0' '
+ # With no specified protocol
+ cat >expect <<-EOF &&
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ git receive-pack --advertise-refs . >out 2>err &&
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect &&
+
+ # With explicit v0
+ GIT_PROTOCOL=version=0 \
+ git receive-pack --advertise-refs . >out 2>err &&
+ test-tool pkt-line unpack <out >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v1' '
+ # With no specified protocol
+ cat >expect <<-EOF &&
+ version 1
+ $(git rev-parse HEAD) HEAD
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ GIT_PROTOCOL=version=1 \
+ git upload-pack --advertise-refs . >out &&
+
+ test-tool pkt-line unpack <out >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v1' '
+ # With no specified protocol
+ cat >expect <<-EOF &&
+ version 1
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ GIT_PROTOCOL=version=1 \
+ git receive-pack --advertise-refs . >out &&
+
+ test-tool pkt-line unpack <out >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v2' '
+ cat >expect <<-EOF &&
+ version 2
+ agent=FAKE
+ ls-refs=unborn
+ fetch=shallow wait-for-done
+ server-option
+ object-format=$(test_oid algo)
+ object-info
+ 0000
+ EOF
+
+ GIT_PROTOCOL=version=2 \
+ GIT_USER_AGENT=FAKE \
+ git upload-pack --advertise-refs . >out 2>err &&
+
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v2' '
+ # There is no v2 yet for receive-pack, implicit v0
+ cat >expect <<-EOF &&
+ $(git rev-parse HEAD) $(git symbolic-ref HEAD)
+ 0000
+ EOF
+
+ GIT_PROTOCOL=version=2 \
+ git receive-pack --advertise-refs . >out 2>err &&
+
+ test-tool pkt-line unpack <out >actual &&
+ test_must_be_empty err &&
+ test_cmp actual expect
+'
+
+test_done
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 4f92a11..fa6b4cc 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -2,6 +2,9 @@
test_description='pull can handle submodules'
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index cd803ae..cd7604f 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -4,6 +4,7 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
if test_have_prereq CYGWIN
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 5bf1026..34b3df4 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -35,7 +35,9 @@
'
test_expect_success 'create objects in repo for later corruption' '
- test_commit -C foo file
+ test_commit -C foo file &&
+ git -C foo checkout --detach &&
+ test_commit -C foo detached
'
# source repository given to git clone should be relative to the
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 3a595c0..d822153 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -16,6 +16,18 @@
'
+test_expect_success 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value' '
+
+ test_config_global submodule.stickyRecursiveClone true &&
+ git clone --recurse-submodules parent clone_recurse_true &&
+ test_cmp_config -C clone_recurse_true true submodule.recurse &&
+
+ test_config_global submodule.stickyRecursiveClone false &&
+ git clone --recurse-submodules parent clone_recurse_false &&
+ test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
+
+'
+
test_expect_success 'clone -o' '
git clone -o foo parent clone-o &&
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index ed0d911..51705aa 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -91,7 +91,8 @@
git fetch long-subject-bundle.bdl &&
- if ! test_have_prereq SHA1
+ algo=$(test_oid algo) &&
+ if test "$algo" != sha1
then
echo "@object-format=sha256"
fi >expect &&
@@ -100,7 +101,7 @@
$(git rev-parse HEAD) HEAD
EOF
- if test_have_prereq SHA1
+ if test "$algo" = sha1
then
head -n 3 long-subject-bundle.bdl
else
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index b4905b8..83513e4 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='handling of alternates in environment variables'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
check_obj () {
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index 930721f..aa1827d 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -72,6 +72,37 @@
test_i18ngrep "invalid command" err
'
+test_expect_success 'request capability as command' '
+ test-tool pkt-line pack >in <<-EOF &&
+ command=agent
+ object-format=$(test_oid algo)
+ 0000
+ EOF
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+ grep invalid.command.*agent err
+'
+
+test_expect_success 'request command as capability' '
+ test-tool pkt-line pack >in <<-EOF &&
+ command=ls-refs
+ object-format=$(test_oid algo)
+ fetch
+ 0000
+ EOF
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+ grep unknown.capability err
+'
+
+test_expect_success 'requested command is command=value' '
+ test-tool pkt-line pack >in <<-EOF &&
+ command=ls-refs=whatever
+ object-format=$(test_oid algo)
+ 0000
+ EOF
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+ grep invalid.command.*ls-refs=whatever err
+'
+
test_expect_success 'wrong object-format' '
test-tool pkt-line pack >in <<-EOF &&
command=fetch
@@ -116,6 +147,19 @@
test_cmp expect actual
'
+test_expect_success 'ls-refs complains about unknown options' '
+ test-tool pkt-line pack >in <<-EOF &&
+ command=ls-refs
+ object-format=$(test_oid algo)
+ 0001
+ no-such-arg
+ 0000
+ EOF
+
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+ grep unexpected.line.*no-such-arg err
+'
+
test_expect_success 'basic ref-prefixes' '
test-tool pkt-line pack >in <<-EOF &&
command=ls-refs
@@ -158,6 +202,37 @@
test_cmp expect actual
'
+test_expect_success 'ignore very large set of prefixes' '
+ # generate a large number of ref-prefixes that we expect
+ # to match nothing; the value here exceeds TOO_MANY_PREFIXES
+ # from ls-refs.c.
+ {
+ echo command=ls-refs &&
+ echo object-format=$(test_oid algo) &&
+ echo 0001 &&
+ perl -le "print \"ref-prefix refs/heads/\$_\" for (1..65536)" &&
+ echo 0000
+ } |
+ test-tool pkt-line pack >in &&
+
+ # and then confirm that we see unmatched prefixes anyway (i.e.,
+ # that the prefix was not applied).
+ cat >expect <<-EOF &&
+ $(git rev-parse HEAD) HEAD
+ $(git rev-parse refs/heads/dev) refs/heads/dev
+ $(git rev-parse refs/heads/main) refs/heads/main
+ $(git rev-parse refs/heads/release) refs/heads/release
+ $(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
+ $(git rev-parse refs/tags/one) refs/tags/one
+ $(git rev-parse refs/tags/two) refs/tags/two
+ 0000
+ EOF
+
+ test-tool serve-v2 --stateless-rpc <in >out &&
+ test-tool pkt-line unpack <out >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'peel parameter' '
test-tool pkt-line pack >in <<-EOF &&
command=ls-refs
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 90d93f7..7294147 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -23,7 +23,8 @@
git commit -a -m "Third in one history." &&
A2=$(git rev-parse --verify HEAD) &&
- rm -f .git/refs/heads/main .git/index &&
+ git update-ref -d refs/heads/main &&
+ rm -f .git/index &&
echo >fileA fileA again &&
echo >subdir/fileB fileB again &&
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index a1baf4e..1be85d0 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -962,4 +962,22 @@
grep "$bad is the first bad commit" output
'
+test_expect_success 'bisect run fails with exit code equals or greater than 128' '
+ write_script test_script.sh <<-\EOF &&
+ exit 128
+ EOF
+ test_must_fail git bisect run ./test_script.sh &&
+ write_script test_script.sh <<-\EOF &&
+ exit 255
+ EOF
+ test_must_fail git bisect run ./test_script.sh
+'
+
+test_expect_success 'bisect visualize with a filename with dash and space' '
+ echo "My test line" >>"./-hello 2" &&
+ git add -- "./-hello 2" &&
+ git commit --quiet -m "Add test line" -- "./-hello 2" &&
+ git bisect visualize -p -- "-hello 2"
+'
+
test_done
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index e33d512..2500acc 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -132,7 +132,7 @@
EOF
test_expect_success 'tag replaced commit' '
- git mktag <tag.sig >.git/refs/tags/mytag
+ git update-ref refs/tags/mytag $(git mktag <tag.sig)
'
test_expect_success '"git fsck" works' '
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 1a501ee..bae2419 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -107,7 +107,8 @@
check_describe tags/A --all A^0
test_expect_success 'renaming tag A to Q locally produces a warning' "
- mv .git/refs/tags/A .git/refs/tags/Q &&
+ git update-ref refs/tags/Q $(git rev-parse refs/tags/A) &&
+ git update-ref -d refs/tags/A &&
git describe HEAD 2>err >out &&
cat >expected <<-\EOF &&
warning: tag 'Q' is externally known as 'A'
@@ -135,7 +136,8 @@
'
test_expect_success 'rename tag Q back to A' '
- mv .git/refs/tags/Q .git/refs/tags/A
+ git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
+ git update-ref -d refs/tags/Q
'
test_expect_success 'pack tag refs' 'git pack-refs'
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 44f55d9..06c5fb5 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -81,6 +81,16 @@
git tag -s -m signed-tag-msg signed-good-tag left
'
+test_expect_success GPGSSH 'created ssh signed commit and tag' '
+ test_config gpg.format ssh &&
+ git checkout -b signed-ssh &&
+ touch file &&
+ git add file &&
+ git commit -m "ssh signed" -S"${GPGSSH_KEY_PRIMARY}" &&
+ git tag -s -u"${GPGSSH_KEY_PRIMARY}" -m signed-ssh-tag-msg signed-good-ssh-tag left &&
+ git tag -s -u"${GPGSSH_KEY_UNTRUSTED}" -m signed-ssh-tag-msg-untrusted signed-untrusted-ssh-tag left
+'
+
test_expect_success 'message for merging local branch' '
echo "Merge branch ${apos}left${apos}" >expected &&
@@ -109,6 +119,24 @@
grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
'
+test_expect_success GPGSSH 'message for merging local tag signed by good ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . signed-good-ssh-tag &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh key' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout main &&
+ git fetch . signed-untrusted-ssh-tag &&
+ git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
+'
test_expect_success 'message for merging external branch' '
echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 05a15a9..80679d5 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -137,6 +137,8 @@
test_atom head numparent 0
test_atom head object ''
test_atom head type ''
+test_atom head raw "$(git cat-file commit refs/heads/main)
+"
test_atom head '*objectname' ''
test_atom head '*objecttype' ''
test_atom head author 'A U Thor <author@example.com> 1151968724 +0200'
@@ -228,6 +230,15 @@
'
test_atom tag HEAD ' '
+test_expect_success 'basic atom: refs/tags/testtag *raw' '
+ git cat-file commit refs/tags/testtag^{} >expected &&
+ git for-each-ref --format="%(*raw)" refs/tags/testtag >actual &&
+ sanitize_pgp <expected >expected.clean &&
+ echo >>expected.clean &&
+ sanitize_pgp <actual >actual.clean &&
+ test_cmp expected.clean actual.clean
+'
+
test_expect_success 'Check invalid atoms names are errors' '
test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
'
@@ -693,6 +704,15 @@
test_atom refs/tags/signed-empty contents:signature "$sig"
test_atom refs/tags/signed-empty contents "$sig"
+test_expect_success GPG 'basic atom: refs/tags/signed-empty raw' '
+ git cat-file tag refs/tags/signed-empty >expected &&
+ git for-each-ref --format="%(raw)" refs/tags/signed-empty >actual &&
+ sanitize_pgp <expected >expected.clean &&
+ echo >>expected.clean &&
+ sanitize_pgp <actual >actual.clean &&
+ test_cmp expected.clean actual.clean
+'
+
test_atom refs/tags/signed-short subject 'subject line'
test_atom refs/tags/signed-short subject:sanitize 'subject-line'
test_atom refs/tags/signed-short contents:subject 'subject line'
@@ -702,6 +722,15 @@
test_atom refs/tags/signed-short contents "subject line
$sig"
+test_expect_success GPG 'basic atom: refs/tags/signed-short raw' '
+ git cat-file tag refs/tags/signed-short >expected &&
+ git for-each-ref --format="%(raw)" refs/tags/signed-short >actual &&
+ sanitize_pgp <expected >expected.clean &&
+ echo >>expected.clean &&
+ sanitize_pgp <actual >actual.clean &&
+ test_cmp expected.clean actual.clean
+'
+
test_atom refs/tags/signed-long subject 'subject line'
test_atom refs/tags/signed-long subject:sanitize 'subject-line'
test_atom refs/tags/signed-long contents:subject 'subject line'
@@ -715,6 +744,15 @@
body contents
$sig"
+test_expect_success GPG 'basic atom: refs/tags/signed-long raw' '
+ git cat-file tag refs/tags/signed-long >expected &&
+ git for-each-ref --format="%(raw)" refs/tags/signed-long >actual &&
+ sanitize_pgp <expected >expected.clean &&
+ echo >>expected.clean &&
+ sanitize_pgp <actual >actual.clean &&
+ test_cmp expected.clean actual.clean
+'
+
test_expect_success 'set up refs pointing to tree and blob' '
git update-ref refs/mytrees/first refs/heads/main^{tree} &&
git update-ref refs/myblobs/first refs/heads/main:one
@@ -727,6 +765,16 @@
test_atom refs/mytrees/first contents:signature ""
test_atom refs/mytrees/first contents ""
+test_expect_success 'basic atom: refs/mytrees/first raw' '
+ git cat-file tree refs/mytrees/first >expected &&
+ echo >>expected &&
+ git for-each-ref --format="%(raw)" refs/mytrees/first >actual &&
+ test_cmp expected actual &&
+ git cat-file -s refs/mytrees/first >expected &&
+ git for-each-ref --format="%(raw:size)" refs/mytrees/first >actual &&
+ test_cmp expected actual
+'
+
test_atom refs/myblobs/first subject ""
test_atom refs/myblobs/first contents:subject ""
test_atom refs/myblobs/first body ""
@@ -734,6 +782,189 @@
test_atom refs/myblobs/first contents:signature ""
test_atom refs/myblobs/first contents ""
+test_expect_success 'basic atom: refs/myblobs/first raw' '
+ git cat-file blob refs/myblobs/first >expected &&
+ echo >>expected &&
+ git for-each-ref --format="%(raw)" refs/myblobs/first >actual &&
+ test_cmp expected actual &&
+ git cat-file -s refs/myblobs/first >expected &&
+ git for-each-ref --format="%(raw:size)" refs/myblobs/first >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'set up refs pointing to binary blob' '
+ printf "a\0b\0c" >blob1 &&
+ printf "a\0c\0b" >blob2 &&
+ printf "\0a\0b\0c" >blob3 &&
+ printf "abc" >blob4 &&
+ printf "\0 \0 \0 " >blob5 &&
+ printf "\0 \0a\0 " >blob6 &&
+ printf " " >blob7 &&
+ >blob8 &&
+ obj=$(git hash-object -w blob1) &&
+ git update-ref refs/myblobs/blob1 "$obj" &&
+ obj=$(git hash-object -w blob2) &&
+ git update-ref refs/myblobs/blob2 "$obj" &&
+ obj=$(git hash-object -w blob3) &&
+ git update-ref refs/myblobs/blob3 "$obj" &&
+ obj=$(git hash-object -w blob4) &&
+ git update-ref refs/myblobs/blob4 "$obj" &&
+ obj=$(git hash-object -w blob5) &&
+ git update-ref refs/myblobs/blob5 "$obj" &&
+ obj=$(git hash-object -w blob6) &&
+ git update-ref refs/myblobs/blob6 "$obj" &&
+ obj=$(git hash-object -w blob7) &&
+ git update-ref refs/myblobs/blob7 "$obj" &&
+ obj=$(git hash-object -w blob8) &&
+ git update-ref refs/myblobs/blob8 "$obj"
+'
+
+test_expect_success 'Verify sorts with raw' '
+ cat >expected <<-EOF &&
+ refs/myblobs/blob8
+ refs/myblobs/blob5
+ refs/myblobs/blob6
+ refs/myblobs/blob3
+ refs/myblobs/blob7
+ refs/mytrees/first
+ refs/myblobs/first
+ refs/myblobs/blob1
+ refs/myblobs/blob2
+ refs/myblobs/blob4
+ refs/heads/main
+ EOF
+ git for-each-ref --format="%(refname)" --sort=raw \
+ refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'Verify sorts with raw:size' '
+ cat >expected <<-EOF &&
+ refs/myblobs/blob8
+ refs/myblobs/first
+ refs/myblobs/blob7
+ refs/heads/main
+ refs/myblobs/blob4
+ refs/myblobs/blob1
+ refs/myblobs/blob2
+ refs/myblobs/blob3
+ refs/myblobs/blob5
+ refs/myblobs/blob6
+ refs/mytrees/first
+ EOF
+ git for-each-ref --format="%(refname)" --sort=raw:size \
+ refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'validate raw atom with %(if:equals)' '
+ cat >expected <<-EOF &&
+ not equals
+ not equals
+ not equals
+ not equals
+ not equals
+ not equals
+ refs/myblobs/blob4
+ not equals
+ not equals
+ not equals
+ not equals
+ not equals
+ EOF
+ git for-each-ref --format="%(if:equals=abc)%(raw)%(then)%(refname)%(else)not equals%(end)" \
+ refs/myblobs/ refs/heads/ >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'validate raw atom with %(if:notequals)' '
+ cat >expected <<-EOF &&
+ refs/heads/ambiguous
+ refs/heads/main
+ refs/heads/newtag
+ refs/myblobs/blob1
+ refs/myblobs/blob2
+ refs/myblobs/blob3
+ equals
+ refs/myblobs/blob5
+ refs/myblobs/blob6
+ refs/myblobs/blob7
+ refs/myblobs/blob8
+ refs/myblobs/first
+ EOF
+ git for-each-ref --format="%(if:notequals=abc)%(raw)%(then)%(refname)%(else)equals%(end)" \
+ refs/myblobs/ refs/heads/ >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'empty raw refs with %(if)' '
+ cat >expected <<-EOF &&
+ refs/myblobs/blob1 not empty
+ refs/myblobs/blob2 not empty
+ refs/myblobs/blob3 not empty
+ refs/myblobs/blob4 not empty
+ refs/myblobs/blob5 not empty
+ refs/myblobs/blob6 not empty
+ refs/myblobs/blob7 empty
+ refs/myblobs/blob8 empty
+ refs/myblobs/first not empty
+ EOF
+ git for-each-ref --format="%(refname) %(if)%(raw)%(then)not empty%(else)empty%(end)" \
+ refs/myblobs/ >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success '%(raw) with --python must fail' '
+ test_must_fail git for-each-ref --format="%(raw)" --python
+'
+
+test_expect_success '%(raw) with --tcl must fail' '
+ test_must_fail git for-each-ref --format="%(raw)" --tcl
+'
+
+test_expect_success '%(raw) with --perl' '
+ git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob1 --perl | perl >actual &&
+ cmp blob1 actual &&
+ git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob3 --perl | perl >actual &&
+ cmp blob3 actual &&
+ git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob8 --perl | perl >actual &&
+ cmp blob8 actual &&
+ git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/first --perl | perl >actual &&
+ cmp one actual &&
+ git cat-file tree refs/mytrees/first > expected &&
+ git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/mytrees/first --perl | perl >actual &&
+ cmp expected actual
+'
+
+test_expect_success '%(raw) with --shell must fail' '
+ test_must_fail git for-each-ref --format="%(raw)" --shell
+'
+
+test_expect_success '%(raw) with --shell and --sort=raw must fail' '
+ test_must_fail git for-each-ref --format="%(raw)" --sort=raw --shell
+'
+
+test_expect_success '%(raw:size) with --shell' '
+ git for-each-ref --format="%(raw:size)" | while read line
+ do
+ echo "'\''$line'\''" >>expect
+ done &&
+ git for-each-ref --format="%(raw:size)" --shell >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'for-each-ref --format compare with cat-file --batch' '
+ git rev-parse refs/mytrees/first | git cat-file --batch >expected &&
+ git for-each-ref --format="%(objectname) %(objecttype) %(objectsize)
+%(raw)" refs/mytrees/first >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'set up multiple-sort tags' '
for when in 100000 200000
do
@@ -987,6 +1218,10 @@
test_cmp expect actual.clean
'
+test_expect_success 'basic atom: rest must fail' '
+ test_must_fail git for-each-ref --format="%(rest)" refs/heads/main
+'
+
test_expect_success 'trailer parsing not fooled by --- line' '
git commit --allow-empty -F - <<-\EOF &&
this is the subject
diff --git a/t/t6415-merge-dir-to-symlink.sh b/t/t6415-merge-dir-to-symlink.sh
index 2ce104a..2655e29 100755
--- a/t/t6415-merge-dir-to-symlink.sh
+++ b/t/t6415-merge-dir-to-symlink.sh
@@ -25,7 +25,8 @@
git reset --hard main &&
git rm --cached a/b &&
git commit -m "untracked symlink remains" &&
- test_must_fail git checkout start^0
+ test_must_fail git checkout start^0 &&
+ git clean -fd # Do not leave the untracked symlink in the way
'
test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
@@ -34,7 +35,8 @@
git rm --cached a/b &&
git commit -m "untracked symlink remains" &&
git checkout -f start^0 &&
- test_path_is_file a/b-2/c/d
+ test_path_is_file a/b-2/c/d &&
+ git clean -fd # Do not leave the untracked symlink in the way
'
test_expect_success 'checkout should not have deleted a/b-2/c/d' '
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 5e3779e..89dd544 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -132,6 +132,7 @@
# Make index match B
git diff C B -- | git apply --cached &&
+ test_when_finished "git clean -fd" && # Do not leave untracked around
# Merge B & F, with B as "head"
git merge-recursive A -- B F > out &&
test_i18ngrep "Already up to date" out
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index ffcc01f..a0efe7c 100755
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -718,7 +718,9 @@
# merge-recursive prints in reverse order, but we do not care
sort <trees >expect &&
sed -n "s/^virtual //p" out | sort >actual &&
- test_cmp expect actual
+ test_cmp expect actual &&
+
+ git clean -fd
'
test_expect_success 'merge-recursive internal merge resolves to the sameness' '
diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
index 84b4aac..c0b7bd7 100755
--- a/t/t6436-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -68,7 +68,8 @@
git commit -m "rm c1.c" &&
cp important c1.c &&
test_must_fail git merge c1a &&
- test_cmp important c1.c
+ test_cmp important c1.c &&
+ rm c1.c # Do not leave untracked file in way of future tests
'
test_expect_success 'will not overwrite re-added file' '
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index e5e89c2..178413c 100755
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -5,6 +5,9 @@
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-merge.sh
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 10c7ae7..c202126 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -241,7 +241,7 @@
# create a ref whose loose presence we can use to detect a pack-refs run
git update-ref refs/heads/should-be-loose HEAD &&
- test_path_is_file .git/refs/heads/should-be-loose &&
+ (ls -1 .git/refs/heads .git/reftable >expect || true) &&
# now fake a concurrent gc that holds the lock; we can use our
# shell pid so that it looks valid.
@@ -258,7 +258,8 @@
# our gc should exit zero without doing anything
run_and_wait_for_auto_gc &&
- test_path_is_file .git/refs/heads/should-be-loose
+ (ls -1 .git/refs/heads .git/reftable >actual || true) &&
+ test_cmp expect actual
'
# DO NOT leave a detached auto gc process running near the end of the
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bb..963356b 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,11 @@
test_description='git mv in subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -107,7 +108,7 @@
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
git add path0/README &&
git commit -m add2 -a
'
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
new file mode 100755
index 0000000..1d3d2ac
--- /dev/null
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -0,0 +1,209 @@
+#!/bin/sh
+
+test_description='git mv in sparse working trees'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' "
+ mkdir -p sub/dir sub/dir2 &&
+ touch a b c sub/d sub/dir/e sub/dir2/e &&
+ git add -A &&
+ git commit -m files &&
+
+ cat >sparse_error_header <<-EOF &&
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
+ EOF
+
+ cat >sparse_hint <<-EOF
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
+ hint: Disable this message with \"git config advice.updateSparsePath false\"
+ EOF
+"
+
+test_expect_success 'mv refuses to move sparse-to-sparse' '
+ test_when_finished rm -f e &&
+ git reset --hard &&
+ git sparse-checkout set a &&
+ touch b &&
+ test_must_fail git mv b e 2>stderr &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'mv refuses to move sparse-to-sparse, ignores failure' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a &&
+
+ # tracked-to-untracked
+ touch b &&
+ git mv -k b e 2>stderr &&
+ test_path_exists b &&
+ test_path_is_missing e &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b &&
+ test_path_exists e &&
+
+ # tracked-to-tracked
+ git reset --hard &&
+ touch b &&
+ git mv -k b c 2>stderr &&
+ test_path_exists b &&
+ test_path_is_missing c &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ echo c >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+
+ git mv --sparse b c 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing b &&
+ test_path_exists c
+'
+
+test_expect_success 'mv refuses to move non-sparse-to-sparse' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a &&
+
+ # tracked-to-untracked
+ test_must_fail git mv a e 2>stderr &&
+ test_path_exists a &&
+ test_path_is_missing e &&
+ cat sparse_error_header >expect &&
+ echo e >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse a e 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing a &&
+ test_path_exists e &&
+
+ # tracked-to-tracked
+ rm e &&
+ git reset --hard &&
+ test_must_fail git mv a c 2>stderr &&
+ test_path_exists a &&
+ test_path_is_missing c &&
+ cat sparse_error_header >expect &&
+ echo c >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse a c 2>stderr &&
+ test_must_be_empty stderr &&
+ test_path_is_missing a &&
+ test_path_exists c
+'
+
+test_expect_success 'mv refuses to move sparse-to-non-sparse' '
+ test_when_finished rm -f b c e &&
+ git reset --hard &&
+ git sparse-checkout set a e &&
+
+ # tracked-to-untracked
+ touch b &&
+ test_must_fail git mv b e 2>stderr &&
+ cat sparse_error_header >expect &&
+ echo b >>expect &&
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse b e 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'recursive mv refuses to move (possible) sparse' '
+ test_when_finished rm -rf b c e sub2 &&
+ git reset --hard &&
+ # Without cone mode, "sub" and "sub2" do not match
+ git sparse-checkout set sub/dir sub2/dir &&
+
+ # Add contained contents to ensure we avoid non-existence errors
+ mkdir sub/dir2 &&
+ touch sub/d sub/dir2/e &&
+
+ test_must_fail git mv sub sub2 2>stderr &&
+ cat sparse_error_header >expect &&
+ cat >>expect <<-\EOF &&
+ sub/d
+ sub2/d
+ sub/dir2/e
+ sub2/dir2/e
+ EOF
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse sub sub2 2>stderr &&
+ test_must_be_empty stderr &&
+ git commit -m "moved sub to sub2" &&
+ git rev-parse HEAD~1:sub >expect &&
+ git rev-parse HEAD:sub2 >actual &&
+ test_cmp expect actual &&
+ git reset --hard HEAD~1
+'
+
+test_expect_success 'recursive mv refuses to move sparse' '
+ git reset --hard &&
+ # Use cone mode so "sub/" matches the sparse-checkout patterns
+ git sparse-checkout init --cone &&
+ git sparse-checkout set sub/dir sub2/dir &&
+
+ # Add contained contents to ensure we avoid non-existence errors
+ mkdir sub/dir2 &&
+ touch sub/dir2/e &&
+
+ test_must_fail git mv sub sub2 2>stderr &&
+ cat sparse_error_header >expect &&
+ cat >>expect <<-\EOF &&
+ sub/dir2/e
+ sub2/dir2/e
+ EOF
+ cat sparse_hint >>expect &&
+ test_cmp expect stderr &&
+ git mv --sparse sub sub2 2>stderr &&
+ test_must_be_empty stderr &&
+ git commit -m "moved sub to sub2" &&
+ git rev-parse HEAD~1:sub >expect &&
+ git rev-parse HEAD:sub2 >actual &&
+ test_cmp expect actual &&
+ git reset --hard HEAD~1
+'
+
+test_expect_success 'can move files to non-sparse dir' '
+ git reset --hard &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set a b c w !/x y/ &&
+ mkdir -p w x/y &&
+
+ git mv a w/new-a 2>stderr &&
+ git mv b x/y/new-b 2>stderr &&
+ test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to move file to non-skip-worktree sparse path' '
+ git reset --hard &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set a !/x y/ !x/y/z &&
+ mkdir -p x/y/z &&
+
+ test_must_fail git mv a x/y/z/new-a 2>stderr &&
+ echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
+ test_cmp expect stderr
+'
+
+test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 2f72c5c..082be85 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1998,6 +1998,10 @@
test_cmp expect actual
'
+test_expect_success 'git tag -l with --format="%(rest)" must fail' '
+ test_must_fail git tag -l --format="%(rest)" "v1*"
+'
+
test_expect_success "set up color tests" '
echo "<RED>v1.0<RESET>" >expect.color &&
echo "v1.0" >expect.bare &&
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 3cefde9..10faa64 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -194,6 +194,10 @@
test_cmp expect actual
'
+test_expect_success GPG 'verifying tag with --format="%(rest)" must fail' '
+ test_must_fail git verify-tag --format="%(rest)" "fourth-signed"
+'
+
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
test_must_be_empty actual-forged
diff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh
new file mode 100755
index 0000000..06c9dd6
--- /dev/null
+++ b/t/t7031-verify-tag-signed-ssh.sh
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+test_description='signed tag tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed tags ssh' '
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+ echo 1 >file && git add file &&
+ test_tick && git commit -m initial &&
+ git tag -s -m initial initial &&
+ git branch side &&
+
+ echo 2 >file && test_tick && git commit -a -m second &&
+ git tag -s -m second second &&
+
+ git checkout side &&
+ echo 3 >elif && git add elif &&
+ test_tick && git commit -m "third on side" &&
+
+ git checkout main &&
+ test_tick && git merge -S side &&
+ git tag -s -m merge merge &&
+
+ echo 4 >file && test_tick && git commit -a -S -m "fourth unsigned" &&
+ git tag -a -m fourth-unsigned fourth-unsigned &&
+
+ test_tick && git commit --amend -S -m "fourth signed" &&
+ git tag -s -m fourth fourth-signed &&
+
+ echo 5 >file && test_tick && git commit -a -m "fifth" &&
+ git tag fifth-unsigned &&
+
+ git config commit.gpgsign true &&
+ echo 6 >file && test_tick && git commit -a -m "sixth" &&
+ git tag -a -m sixth sixth-unsigned &&
+
+ test_tick && git rebase -f HEAD^^ && git tag -s -m 6th sixth-signed HEAD^ &&
+ git tag -m seventh -s seventh-signed &&
+
+ echo 8 >file && test_tick && git commit -a -m eighth &&
+ git tag -u"${GPGSSH_KEY_UNTRUSTED}" -m eighth eighth-signed-alt
+'
+
+test_expect_success GPGSSH 'verify and show ssh signatures' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for tag in initial second merge fourth-signed sixth-signed seventh-signed
+ do
+ git verify-tag $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+ do
+ test_must_fail git verify-tag $tag 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in eighth-signed-alt
+ do
+ test_must_fail git verify-tag $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+ echo $tag OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'detect fudged ssh signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file tag seventh-signed >raw &&
+ sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
+ git hash-object -w -t tag forged1 >forged1.tag &&
+ test_must_fail git verify-tag $(cat forged1.tag) 2>actual1 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'verify ssh signatures with --raw' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for tag in initial second merge fourth-signed sixth-signed seventh-signed
+ do
+ git verify-tag --raw $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+ do
+ test_must_fail git verify-tag --raw $tag 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ ) &&
+ (
+ for tag in eighth-signed-alt
+ do
+ test_must_fail git verify-tag --raw $tag 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $tag OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git verify-tag --raw sixth-signed 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo sixth-signed OK
+'
+
+test_expect_success GPGSSH 'verify multiple tags ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ tags="seventh-signed sixth-signed" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
+test_expect_success GPGSSH 'verifying tag with --format - ssh' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect <<-\EOF &&
+ tagname : fourth-signed
+ EOF
+ git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'verifying a forged tag with --format should fail silently - ssh' '
+ test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
+ test_must_be_empty actual-forged
+'
+
+test_done
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 4613882..eeb0534 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -373,10 +373,7 @@
## Test upstream-gone case. Fake this by pointing
## origin/initial-branch at a non-existing commit.
- OLD=$(git rev-parse origin/initial-branch) &&
- NEW=$ZERO_OID &&
- mv .git/packed-refs .git/old-packed-refs &&
- sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
+ git update-ref -d refs/remotes/origin/initial-branch &&
HUF=$(git rev-parse HEAD) &&
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05a..5530651 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -5,10 +5,11 @@
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'creating initial files' '
mkdir path0 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -16,10 +17,10 @@
test_expect_success 'creating second files' '
mkdir path1 &&
mkdir path1/path2 &&
- cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+ COPYING_test_data >path1/path2/COPYING &&
+ COPYING_test_data >path1/COPYING &&
+ COPYING_test_data >COPYING &&
+ COPYING_test_data >path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&
diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index 7948ec3..cf9697e 100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -2,6 +2,7 @@
test_description='reset --hard unmerged'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index 19830d9..a3e2413 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -6,7 +6,6 @@
. "$TEST_DIRECTORY"/lib-submodule-update.sh
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
test_submodule_switch_recursing_with_args "reset --keep"
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 7f6e23a..b7ba1c3 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -585,6 +585,7 @@
'
test_expect_success 'failing checkout -b should not break working tree' '
+ git clean -fd && # Remove untracked files in the way
git reset --hard main &&
git symbolic-ref HEAD refs/heads/main &&
test_must_fail git checkout -b renamer side^ &&
diff --git a/t/t7418-submodule-sparse-gitmodules.sh b/t/t7418-submodule-sparse-gitmodules.sh
index 3f7f2718..f87e524 100755
--- a/t/t7418-submodule-sparse-gitmodules.sh
+++ b/t/t7418-submodule-sparse-gitmodules.sh
@@ -12,6 +12,9 @@
also by committing .gitmodules and then just removing it from the filesystem.
'
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
. ./test-lib.sh
test_expect_success 'sparse checkout setup which hides .gitmodules' '
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 4e75925..bba58f0 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -133,6 +133,14 @@
'
+test_expect_success '-n followed by --verify with failing hook' '
+
+ echo "even more" >> file &&
+ git add file &&
+ test_must_fail git commit -n --verify -m "even more"
+
+'
+
test_expect_success '--no-verify with failing hook (editor)' '
echo "more stuff" >> file &&
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 7a8194c..2a07c70 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -250,7 +250,6 @@
}
test_rebase success
-test_have_prereq !REBASE_P || test_rebase success -p
test_expect_success 'with hook (cherry-pick)' '
test_when_finished "git checkout -f main" &&
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 8df5a74..d65a017 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -71,7 +71,25 @@
git tag eleventh-signed $(cat oid) &&
echo 12 | git commit-tree --gpg-sign=B7227189 HEAD^{tree} >oid &&
test_line_count = 1 oid &&
- git tag twelfth-signed-alt $(cat oid)
+ git tag twelfth-signed-alt $(cat oid) &&
+
+ cat >keydetails <<-\EOF &&
+ Key-Type: RSA
+ Key-Length: 2048
+ Subkey-Type: RSA
+ Subkey-Length: 2048
+ Name-Real: Unknown User
+ Name-Email: unknown@git.com
+ Expire-Date: 0
+ %no-ask-passphrase
+ %no-protection
+ EOF
+ gpg --batch --gen-key keydetails &&
+ echo 13 >file && git commit -a -S"unknown@git.com" -m thirteenth &&
+ git tag thirteenth-signed &&
+ DELETE_FINGERPRINT=$(gpg -K --with-colons --fingerprint --batch unknown@git.com | grep "^fpr" | head -n 1 | awk -F ":" "{print \$10;}") &&
+ gpg --batch --yes --delete-secret-keys $DELETE_FINGERPRINT &&
+ gpg --batch --yes --delete-keys unknown@git.com
'
test_expect_success GPG 'verify and show signatures' '
@@ -110,6 +128,13 @@
)
'
+test_expect_success GPG 'verify-commit exits failure on unknown signature' '
+ test_must_fail git verify-commit thirteenth-signed 2>actual &&
+ ! grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual &&
+ grep -q -F -e "No public key" -e "public key not found" actual
+'
+
test_expect_success GPG 'verify-commit exits success on untrusted signature' '
git verify-commit eighth-signed-alt 2>actual &&
grep "Good signature from" actual &&
@@ -338,6 +363,8 @@
'
+# NEEDSWORK: This test relies on the test_tick commit/author dates from the first
+# 'create signed commits' test even though it creates its own
test_expect_success GPG 'verify-commit verifies multiply signed commits' '
git init multiply-signed &&
cd multiply-signed &&
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 405420a..163ae80 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -75,19 +75,6 @@
git rebase -i HEAD^
'
-test_expect_success REBASE_P \
- 'fast-forward rebase does not care about ident (preserve)' '
- git checkout -B tmp side-without-commit &&
- git rebase -p main
-'
-
-test_expect_success REBASE_P \
- 'non-fast-forward rebase refuses to write commits (preserve)' '
- test_when_finished "git rebase --abort || true" &&
- git checkout -B tmp side-with-commit &&
- test_must_fail git rebase -p main
-'
-
test_expect_success 'author.name overrides user.name' '
test_config user.name user &&
test_config user.email user@example.com &&
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index 905957b..fffdb6f 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -1,6 +1,8 @@
#!/bin/sh
test_description='corner cases in ident strings'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# confirm that we do not segfault _and_ that we do not say "(null)", as
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index deea88d..f488d93 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -389,47 +389,55 @@
# If "!" is supplied, then we verify that we do not call ensure_full_index
# during a call to 'git status'. Otherwise, we verify that we _do_ call it.
check_sparse_index_behavior () {
- git status --porcelain=v2 >expect &&
- git sparse-checkout init --cone --sparse-index &&
- git sparse-checkout set dir1 dir2 &&
+ git -C full status --porcelain=v2 >expect &&
GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
- git status --porcelain=v2 >actual &&
+ git -C sparse status --porcelain=v2 >actual &&
test_region $1 index ensure_full_index trace2.txt &&
test_region fsm_hook query trace2.txt &&
test_cmp expect actual &&
- rm trace2.txt &&
- git sparse-checkout disable
+ rm trace2.txt
}
test_expect_success 'status succeeds with sparse index' '
- git reset --hard &&
+ (
+ sane_unset GIT_TEST_SPLIT_INDEX &&
- test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
- check_sparse_index_behavior ! &&
+ git clone . full &&
+ git clone --sparse . sparse &&
+ git -C sparse sparse-checkout init --cone --sparse-index &&
+ git -C sparse sparse-checkout set dir1 dir2 &&
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
- printf "last_update_token\0"
- EOF
- git config core.fsmonitor .git/hooks/fsmonitor-test &&
- check_sparse_index_behavior ! &&
+ write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ printf "last_update_token\0"
+ EOF
+ git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+ git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+ check_sparse_index_behavior ! &&
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
- printf "last_update_token\0"
- printf "dir1/modified\0"
- EOF
- check_sparse_index_behavior ! &&
+ write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ printf "last_update_token\0"
+ printf "dir1/modified\0"
+ EOF
+ check_sparse_index_behavior ! &&
- cp -r dir1 dir1a &&
- git add dir1a &&
- git commit -m "add dir1a" &&
+ git -C sparse sparse-checkout add dir1a &&
- # This one modifies outside the sparse-checkout definition
- # and hence we expect to expand the sparse-index.
- write_script .git/hooks/fsmonitor-test<<-\EOF &&
- printf "last_update_token\0"
- printf "dir1a/modified\0"
- EOF
- check_sparse_index_behavior
+ for repo in full sparse
+ do
+ cp -r $repo/dir1 $repo/dir1a &&
+ git -C $repo add dir1a &&
+ git -C $repo commit -m "add dir1a" || return 1
+ done &&
+ git -C sparse sparse-checkout set dir1 dir2 &&
+
+ # This one modifies outside the sparse-checkout definition
+ # and hence we expect to expand the sparse-index.
+ write_script .git/hooks/fsmonitor-test <<-\EOF &&
+ printf "last_update_token\0"
+ printf "dir1a/modified\0"
+ EOF
+ check_sparse_index_behavior
+ )
'
test_done
diff --git a/t/t7528-signed-commit-ssh.sh b/t/t7528-signed-commit-ssh.sh
new file mode 100755
index 0000000..badf3ed
--- /dev/null
+++ b/t/t7528-signed-commit-ssh.sh
@@ -0,0 +1,398 @@
+#!/bin/sh
+
+test_description='ssh signed commit tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+GNUPGHOME_NOT_USED=$GNUPGHOME
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed commits' '
+ test_oid_cache <<-\EOF &&
+ header sha1:gpgsig
+ header sha256:gpgsig-sha256
+ EOF
+
+ test_when_finished "test_unconfig commit.gpgsign" &&
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+ echo 1 >file && git add file &&
+ test_tick && git commit -S -m initial &&
+ git tag initial &&
+ git branch side &&
+
+ echo 2 >file && test_tick && git commit -a -S -m second &&
+ git tag second &&
+
+ git checkout side &&
+ echo 3 >elif && git add elif &&
+ test_tick && git commit -m "third on side" &&
+
+ git checkout main &&
+ test_tick && git merge -S side &&
+ git tag merge &&
+
+ echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
+ git tag fourth-unsigned &&
+
+ test_tick && git commit --amend -S -m "fourth signed" &&
+ git tag fourth-signed &&
+
+ git config commit.gpgsign true &&
+ echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
+ git tag fifth-signed &&
+
+ git config commit.gpgsign false &&
+ echo 6 >file && test_tick && git commit -a -m "sixth" &&
+ git tag sixth-unsigned &&
+
+ git config commit.gpgsign true &&
+ echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
+ git tag seventh-unsigned &&
+
+ test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
+ git tag seventh-signed &&
+
+ echo 8 >file && test_tick && git commit -a -m eighth -S"${GPGSSH_KEY_UNTRUSTED}" &&
+ git tag eighth-signed-alt &&
+
+ # commit.gpgsign is still on but this must not be signed
+ echo 9 | git commit-tree HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag ninth-unsigned $(cat oid) &&
+ # explicit -S of course must sign.
+ echo 10 | git commit-tree -S HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag tenth-signed $(cat oid) &&
+
+ # --gpg-sign[=<key-id>] must sign.
+ echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag eleventh-signed $(cat oid) &&
+ echo 12 | git commit-tree --gpg-sign="${GPGSSH_KEY_UNTRUSTED}" HEAD^{tree} >oid &&
+ test_line_count = 1 oid &&
+ git tag twelfth-signed-alt $(cat oid)
+'
+
+test_expect_success GPGSSH 'verify and show signatures' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.mintrustlevel UNDEFINED &&
+ (
+ for commit in initial second merge fourth-signed \
+ fifth-signed sixth-signed seventh-signed tenth-signed \
+ eleventh-signed
+ do
+ git verify-commit $commit &&
+ git show --pretty=short --show-signature $commit >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in merge^2 fourth-unsigned sixth-unsigned \
+ seventh-unsigned ninth-unsigned
+ do
+ test_must_fail git verify-commit $commit &&
+ git show --pretty=short --show-signature $commit >actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in eighth-signed-alt twelfth-signed-alt
+ do
+ git show --pretty=short --show-signature $commit >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+ echo $commit OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure on untrusted signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_must_fail git verify-commit eighth-signed-alt 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'verify-commit exits success with matching minTrustLevel' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.minTrustLevel fully &&
+ git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits success with low minTrustLevel' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config gpg.minTrustLevel marginal &&
+ git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure with high minTrustLevel' '
+ test_config gpg.minTrustLevel ultimate &&
+ test_must_fail git verify-commit eighth-signed-alt
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ (
+ for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+ do
+ git verify-commit --raw $commit 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+ do
+ test_must_fail git verify-commit --raw $commit 2>actual &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ ) &&
+ (
+ for commit in eighth-signed-alt
+ do
+ test_must_fail git verify-commit --raw $commit 2>actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+ echo $commit OK || exit 1
+ done
+ )
+'
+
+test_expect_success GPGSSH 'proper header is used for hash algorithm' '
+ git cat-file commit fourth-signed >output &&
+ grep "^$(test_oid header) -----BEGIN SSH SIGNATURE-----" output
+'
+
+test_expect_success GPGSSH 'show signed commit with signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git show -s initial >commit &&
+ git show -s --show-signature initial >show &&
+ git verify-commit -v initial >verify.1 2>verify.2 &&
+ git cat-file commit initial >cat &&
+ grep -v -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.commit &&
+ grep -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.gpg &&
+ grep -v "^ " cat | grep -v "^gpgsig.* " >cat.commit &&
+ test_cmp show.commit commit &&
+ test_cmp show.gpg verify.2 &&
+ test_cmp cat.commit verify.1
+'
+
+test_expect_success GPGSSH 'detect fudged signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file commit seventh-signed >raw &&
+ sed -e "s/^seventh/7th forged/" raw >forged1 &&
+ git hash-object -w -t commit forged1 >forged1.commit &&
+ test_must_fail git verify-commit $(cat forged1.commit) &&
+ git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'detect fudged signature with NUL' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git cat-file commit seventh-signed >raw &&
+ cat raw >forged2 &&
+ echo Qwik | tr "Q" "\000" >>forged2 &&
+ git hash-object -w -t commit forged2 >forged2.commit &&
+ test_must_fail git verify-commit $(cat forged2.commit) &&
+ git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
+ grep "${GPGSSH_BAD_SIGNATURE}" actual2 &&
+ ! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual2
+'
+
+test_expect_success GPGSSH 'amending already signed commit' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ git checkout fourth-signed^0 &&
+ git commit --amend -S --no-edit &&
+ git verify-commit HEAD &&
+ git show -s --show-signature HEAD >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+ ! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH 'show good signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ cat >expect.tmpl <<-\EOF &&
+ G
+ FINGERPRINT
+ principal with number 1
+ FINGERPRINT
+
+ EOF
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show bad signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect <<-\EOF &&
+ B
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with custom format' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ U
+ FINGERPRINT
+
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with undefined trust level' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ undefined
+ FINGERPRINT
+
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with ultimate trust level' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ cat >expect.tmpl <<-\EOF &&
+ fully
+ FINGERPRINT
+ principal with number 1
+ FINGERPRINT
+
+ EOF
+ git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+ FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+ sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show lack of signature with custom format' '
+ cat >expect <<-\EOF &&
+ N
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'log.showsignature behaves like --show-signature' '
+ test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+ test_config log.showsignature true &&
+ git show initial >actual &&
+ grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'check config gpg.format values' '
+ test_config gpg.format ssh &&
+ test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+ test_config gpg.format ssh &&
+ git commit -S --amend -m "success" &&
+ test_config gpg.format OpEnPgP &&
+ test_must_fail git commit -S --amend -m "fail"
+'
+
+test_expect_failure GPGSSH 'detect fudged commit with double signature (TODO)' '
+ sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
+ sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
+ sed -e "s/^$(test_oid header)//;s/^ //" | gpg --dearmor >double-sig1.sig &&
+ gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
+ cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
+ sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/$(test_oid header) /;2,\$s/^/ /" \
+ double-combined.asc > double-gpgsig &&
+ sed -e "/committer/r double-gpgsig" double-base >double-commit &&
+ git hash-object -w -t commit double-commit >double-commit.commit &&
+ test_must_fail git verify-commit $(cat double-commit.commit) &&
+ git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
+ grep "BAD signature from" double-actual &&
+ grep "Good signature from" double-actual
+'
+
+test_expect_failure GPGSSH 'show double signature with custom format (TODO)' '
+ cat >expect <<-\EOF &&
+ E
+
+
+
+
+ EOF
+ git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+ test_cmp expect actual
+'
+
+
+test_expect_failure GPGSSH 'verify-commit verifies multiply signed commits (TODO)' '
+ git init multiply-signed &&
+ cd multiply-signed &&
+ test_commit first &&
+ echo 1 >second &&
+ git add second &&
+ tree=$(git write-tree) &&
+ parent=$(git rev-parse HEAD^{commit}) &&
+ git commit --gpg-sign -m second &&
+ git cat-file commit HEAD &&
+ # Avoid trailing whitespace.
+ sed -e "s/^Q//" -e "s/^Z/ /" >commit <<-EOF &&
+ Qtree $tree
+ Qparent $parent
+ Qauthor A U Thor <author@example.com> 1112912653 -0700
+ Qcommitter C O Mitter <committer@example.com> 1112912653 -0700
+ Qgpgsig -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBDRYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMNd+8AoK1I8mhLHviPH+q2I5fIVgPsEtYC
+ Q AKCTqBh+VabJceXcGIZuF0Ry+udbBQ==
+ Q =tQ0N
+ Q -----END PGP SIGNATURE-----
+ Qgpgsig-sha256 -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBIBYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMN/NEAn0XO9RYSBj2dFyozi0JKSbssYMtO
+ Q AJwKCQ1BQOtuwz//IjU8TiS+6S4iUw==
+ Q =pIwP
+ Q -----END PGP SIGNATURE-----
+ Q
+ Qsecond
+ EOF
+ head=$(git hash-object -t commit -w commit) &&
+ git reset --hard $head &&
+ git verify-commit $head 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual
+'
+
+test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 2ef39d3..c773e30 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -717,6 +717,7 @@
git reset --hard c0 &&
git merge-file file file.orig file.5 &&
cp file.5 other &&
+ test_when_finished "rm other" &&
test_must_fail git merge --autostash c1 2>err &&
test_i18ngrep "Applied autostash." err &&
test_cmp file.5 file
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 1f652f4..bd238d8 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -2,7 +2,7 @@
test_description='git merge
-Testing pull.* configuration parsing.'
+Testing pull.* configuration parsing and other things.'
. ./test-lib.sh
@@ -387,6 +387,26 @@
test_must_fail git pull . c3
'
+test_expect_success 'already-up-to-date pull succeeds with unspecified pull.ff' '
+ git reset --hard c1 &&
+ git pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull succeeds with "only" in pull.ff' '
+ git reset --hard c1 &&
+ test_config pull.ff only &&
+ git pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull/rebase succeeds with "only" in pull.ff' '
+ git reset --hard c1 &&
+ test_config pull.ff only &&
+ git -c pull.rebase=true pull . c0 &&
+ test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
git reset --hard c1 &&
git config pull.twohead ours &&
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index cd4f960..eca7555 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -4,6 +4,7 @@
Testing merge when using a custom message for the merge commit.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
create_merge_msgs() {
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 25b235c..0260ad6 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -3,6 +3,8 @@
test_description='git repack works correctly'
. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+. "${TEST_DIRECTORY}/lib-midx.sh"
commit_and_pack () {
test_commit "$@" 1>&2 &&
@@ -63,13 +65,14 @@
test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
# build on $oid, $packid, and .keep state from previous
- git repack -Adbl &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 git repack -Adbl &&
test_has_duplicate_object true
'
test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
# build on $oid, $packid, and .keep state from previous
- git -c repack.writebitmaps=true repack -Adl &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -c repack.writebitmaps=true repack -Adl &&
test_has_duplicate_object true
'
@@ -189,7 +192,9 @@
test_expect_success 'bitmaps are created by default in bare repos' '
git clone --bare .git bare.git &&
- git -C bare.git repack -ad &&
+ rm -f bare.git/objects/pack/*.bitmap &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -C bare.git repack -ad &&
bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
test_path_is_file "$bitmap"
'
@@ -200,7 +205,8 @@
'
test_expect_success 'bitmaps can be disabled on bare repos' '
- git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -c repack.writeBitmaps=false -C bare.git repack -ad &&
bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
test -z "$bitmap"
'
@@ -211,7 +217,8 @@
keep=${pack%.pack}.keep &&
test_when_finished "rm -f \"\$keep\"" &&
>"$keep" &&
- git -C bare.git repack -ad 2>stderr &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -C bare.git repack -ad 2>stderr &&
test_must_be_empty stderr &&
find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
test_must_be_empty actual
@@ -222,10 +229,147 @@
blob=$(test-tool genrandom big $((1024*1024)) |
git -C bare.git hash-object -w --stdin) &&
git -C bare.git update-ref refs/tags/big $blob &&
- git -C bare.git repack -ad 2>stderr &&
+ GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+ git -C bare.git repack -ad 2>stderr &&
test_must_be_empty stderr &&
find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
test_must_be_empty actual
'
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
+test_expect_success 'setup for --write-midx tests' '
+ git init midx &&
+ (
+ cd midx &&
+ git config core.multiPackIndex true &&
+
+ test_commit base
+ )
+'
+
+test_expect_success '--write-midx unchanged' '
+ (
+ cd midx &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack &&
+ test_path_is_missing $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with a new pack' '
+ (
+ cd midx &&
+ test_commit loose &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with -b' '
+ (
+ cd midx &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -mb &&
+
+ test_path_is_file $midx &&
+ test_path_is_file $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success '--write-midx with -d' '
+ (
+ cd midx &&
+ test_commit repack &&
+
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ad --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-*.bitmap &&
+ test_midx_consistent $objdir
+ )
+'
+
+test_expect_success 'cleans up MIDX when appropriate' '
+ (
+ cd midx &&
+
+ test_commit repack-2 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+ checksum=$(midx_checksum $objdir) &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$checksum.bitmap &&
+ test_path_is_file $midx-$checksum.rev &&
+
+ test_commit repack-3 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+ test_path_is_file $midx &&
+ test_path_is_missing $midx-$checksum.bitmap &&
+ test_path_is_missing $midx-$checksum.rev &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ test_path_is_file $midx-$(midx_checksum $objdir).rev &&
+
+ test_commit repack-4 &&
+ GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb &&
+
+ find $objdir/pack -type f -name "multi-pack-index*" >files &&
+ test_must_be_empty files
+ )
+'
+
+test_expect_success '--write-midx with preferred bitmap tips' '
+ git init midx-preferred-tips &&
+ test_when_finished "rm -fr midx-preferred-tips" &&
+ (
+ cd midx-preferred-tips &&
+
+ test_commit_bulk --message="%s" 103 &&
+
+ git log --format="%H" >commits.raw &&
+ sort <commits.raw >commits &&
+
+ git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
+ git update-ref --stdin <refs &&
+
+ git repack --write-midx --write-bitmap-index &&
+ test_path_is_file $midx &&
+ test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >before &&
+ test_line_count = 1 before &&
+
+ rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+ rm -fr $midx-$(midx_checksum $objdir).rev &&
+ rm -fr $midx &&
+
+ # instead of constructing the snapshot ourselves (c.f., the test
+ # "write a bitmap with --refs-snapshot (preferred tips)" in
+ # t5326), mark the missing commit as preferred by adding it to
+ # the pack.preferBitmapTips configuration.
+ git for-each-ref --format="%(refname:rstrip=1)" \
+ --points-at="$(cat before)" >missing &&
+ git config pack.preferBitmapTips "$(cat missing)" &&
+ git repack --write-midx --write-bitmap-index &&
+
+ test-tool bitmap list-commits | sort >bitmaps &&
+ comm -13 bitmaps commits >after &&
+
+ ! test_cmp before after
+ )
+'
+
test_done
diff --git a/t/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
index 5ccaa44..bdbbcbf 100755
--- a/t/t7703-repack-geometric.sh
+++ b/t/t7703-repack-geometric.sh
@@ -15,7 +15,7 @@
(
cd geometric &&
- git repack --geometric 2 >out &&
+ git repack --write-midx --geometric 2 >out &&
test_i18ngrep "Nothing new to pack" out
)
'
@@ -180,4 +180,26 @@
)
'
+test_expect_success '--geometric chooses largest MIDX preferred pack' '
+ git init geometric &&
+ test_when_finished "rm -fr geometric" &&
+ (
+ cd geometric &&
+
+ # These packs already form a geometric progression.
+ test_commit_bulk --start=1 1 && # 3 objects
+ test_commit_bulk --start=2 2 && # 6 objects
+ ls $objdir/pack/pack-*.idx >before &&
+ test_commit_bulk --start=4 4 && # 12 objects
+ ls $objdir/pack/pack-*.idx >after &&
+
+ git repack --geometric 2 -dbm &&
+
+ comm -3 before after | xargs -n 1 basename >expect &&
+ test-tool read-midx --preferred-pack $objdir >actual &&
+
+ test_cmp expect actual
+ )
+'
+
test_done
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 528e0da..0964562 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -453,6 +453,13 @@
grep "^file$" output
'
+run_dir_diff_test 'difftool --dir-diff avoids repeated slashes in TMPDIR' '
+ TMPDIR="${TMPDIR:-/tmp}////" \
+ git difftool --dir-diff $symlinks --extcmd echo branch >output &&
+ grep -v // output >actual &&
+ test_line_count = 1 actual
+'
+
run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
git difftool --dir-diff $symlinks --prompt --extcmd ls branch >output &&
grep "^sub$" output &&
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index a98785d..1dd0714 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -3,6 +3,7 @@
test_description='git grep --open-files-in-pager
'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-pager.sh
unset PAGER GIT_PAGER
@@ -114,8 +115,8 @@
unrelated
EOF
+ test_when_finished "git reset --hard" &&
echo "enum grep_pat_token" >unrelated &&
- test_when_finished "git checkout HEAD unrelated" &&
GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
test_cmp expect actual &&
test_must_be_empty out
diff --git a/t/t7813-grep-icase-iso.sh b/t/t7813-grep-icase-iso.sh
index 701e08a..1227885 100755
--- a/t/t7813-grep-icase-iso.sh
+++ b/t/t7813-grep-icase-iso.sh
@@ -2,6 +2,7 @@
test_description='grep icase on non-English locales'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
test_expect_success GETTEXT_ISO_LOCALE 'setup' '
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 828cb3b..058e5d0 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -8,6 +8,9 @@
. ./test-lib.sh
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
test_expect_success 'setup directory structure and submodule' '
echo "(1|2)d(3|4)" >a &&
mkdir b &&
@@ -438,4 +441,107 @@
test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
test_must_be_empty actual
'
+
+test_expect_failure 'grep --textconv: superproject .gitattributes does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .gitattributes (from index) does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >.gitattributes &&
+ git add .gitattributes &&
+ rm .gitattributes &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .git/info/attributes does not affect submodules' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ super_attr="$(git rev-parse --git-path info/attributes)" &&
+ test_when_finished "rm -f \"$super_attr\"" &&
+ echo "a diff=d2x" >"$super_attr" &&
+
+ cat >expect <<-\EOF &&
+ a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+# Note: what currently prevents this test from passing is not that the
+# .gitattributes file from "./submodule" is being ignored, but that it is being
+# propagated to the nested "./submodule/sub" files.
+#
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >submodule/.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes (from index)' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+ echo "a diff=d2x" >submodule/.gitattributes &&
+ git -C submodule add .gitattributes &&
+ rm submodule/.gitattributes &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .git/info/attributes' '
+ reset_and_clean &&
+ test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+
+ submodule_attr="$(git -C submodule rev-parse --path-format=absolute --git-path info/attributes)" &&
+ test_when_finished "rm -f \"$submodule_attr\"" &&
+ echo "a diff=d2x" >"$submodule_attr" &&
+
+ cat >expect <<-\EOF &&
+ submodule/a:(1|2)x(3|4)
+ EOF
+ git grep --textconv --recurse-submodules x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_failure 'grep saves textconv cache in the appropriate repository' '
+ reset_and_clean &&
+ test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
+ test_config_global diff.d2x_cached.cachetextconv true &&
+ echo "a diff=d2x_cached" >submodule/.gitattributes &&
+
+ # We only read/write to the textconv cache when grepping from an OID,
+ # as the working tree file might have modifications.
+ git grep --textconv --cached --recurse-submodules x &&
+
+ super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
+ sub_textconv_cache="$(git -C submodule rev-parse \
+ --path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
+ test_path_is_missing "$super_textconv_cache" &&
+ test_path_is_file "$sub_textconv_cache"
+'
+
test_done
diff --git a/t/t7816-grep-binary-pattern.sh b/t/t7816-grep-binary-pattern.sh
index 9d67a5f..fdb2355 100755
--- a/t/t7816-grep-binary-pattern.sh
+++ b/t/t7816-grep-binary-pattern.sh
@@ -2,6 +2,7 @@
test_description='git grep with a binary pattern files'
+TEST_PASSES_SANITIZE_LEAK=true
. ./lib-gettext.sh
nul_match_internal () {
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index fc16ac2..74aa638 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -20,6 +20,17 @@
fi
}
+test_lazy_prereq SYSTEMD_ANALYZE '
+ systemd-analyze verify /lib/systemd/system/basic.target
+'
+
+test_systemd_analyze_verify () {
+ if test_have_prereq SYSTEMD_ANALYZE
+ then
+ systemd-analyze verify "$@"
+ fi
+}
+
test_expect_success 'help text' '
test_expect_code 129 git maintenance -h 2>err &&
test_i18ngrep "usage: git maintenance <subcommand>" err &&
@@ -265,7 +276,7 @@
# Delete refs that have not been repacked in these packs.
git for-each-ref --format="delete %(refname)" \
- refs/prefetch refs/tags >refs &&
+ refs/prefetch refs/tags refs/remotes >refs &&
git update-ref --stdin <refs &&
# Replace the object directory with this pack layout.
@@ -274,6 +285,10 @@
ls $packDir/*.pack >packs-before &&
test_line_count = 3 packs-before &&
+ # make sure we do not have any broken refs that were
+ # missed in the deletion above
+ git for-each-ref &&
+
# the job repacks the two into a new pack, but does not
# delete the old ones.
git maintenance run --task=incremental-repack &&
@@ -321,15 +336,15 @@
--no-progress --batch-size=2147483647 <run-2g.txt
'
-test_expect_success 'maintenance.incremental-repack.auto' '
+run_incremental_repack_and_verify () {
+ test_commit A &&
git repack -adk &&
- git config core.multiPackIndex true &&
git multi-pack-index write &&
GIT_TRACE2_EVENT="$(pwd)/midx-init.txt" git \
-c maintenance.incremental-repack.auto=1 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand ! git multi-pack-index write --no-progress <midx-init.txt &&
- test_commit A &&
+ test_commit B &&
git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
HEAD
^HEAD~1
@@ -338,7 +353,7 @@
-c maintenance.incremental-repack.auto=2 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand ! git multi-pack-index write --no-progress <trace-A &&
- test_commit B &&
+ test_commit C &&
git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
HEAD
^HEAD~1
@@ -347,6 +362,26 @@
-c maintenance.incremental-repack.auto=2 \
maintenance run --auto --task=incremental-repack 2>/dev/null &&
test_subcommand git multi-pack-index write --no-progress <trace-B
+}
+
+test_expect_success 'maintenance.incremental-repack.auto' '
+ rm -rf incremental-repack-true &&
+ git init incremental-repack-true &&
+ (
+ cd incremental-repack-true &&
+ git config core.multiPackIndex true &&
+ run_incremental_repack_and_verify
+ )
+'
+
+test_expect_success 'maintenance.incremental-repack.auto (when config is unset)' '
+ rm -rf incremental-repack-unset &&
+ git init incremental-repack-unset &&
+ (
+ cd incremental-repack-unset &&
+ test_unconfig core.multiPackIndex &&
+ run_incremental_repack_and_verify
+ )
'
test_expect_success 'pack-refs task' '
@@ -492,8 +527,21 @@
maintenance.repo "$(pwd)/$META"
'
+test_expect_success 'start --scheduler=<scheduler>' '
+ test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
+ test_i18ngrep "unrecognized --scheduler argument" err &&
+
+ test_expect_code 129 git maintenance start --no-scheduler 2>err &&
+ test_i18ngrep "unknown option" err &&
+
+ test_expect_code 128 \
+ env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
+ git maintenance start --scheduler=crontab 2>err &&
+ test_i18ngrep "fatal: crontab scheduler is not available" err
+'
+
test_expect_success 'start from empty cron table' '
- GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
# start registers the repo
git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -516,7 +564,7 @@
test_expect_success 'start preserves existing schedule' '
echo "Important information!" >cron.txt &&
- GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
grep "Important information!" cron.txt
'
@@ -545,7 +593,7 @@
EOF
rm -f args &&
- GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
# start registers the repo
git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -584,11 +632,11 @@
test_expect_success 'use launchctl list to prevent extra work' '
# ensure we are registered
- GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
# do it again on a fresh args file
rm -f args &&
- GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
ls "$HOME/Library/LaunchAgents" >actual &&
cat >expect <<-\EOF &&
@@ -613,7 +661,7 @@
EOF
rm -f args &&
- GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start &&
+ GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
# start registers the repo
git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -636,6 +684,83 @@
test_cmp expect args
'
+test_expect_success 'start and stop Linux/systemd maintenance' '
+ write_script print-args <<-\EOF &&
+ printf "%s\n" "$*" >>args
+ EOF
+
+ XDG_CONFIG_HOME="$PWD" &&
+ export XDG_CONFIG_HOME &&
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
+
+ # start registers the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ test_systemd_analyze_verify "systemd/user/git-maintenance@.service" &&
+
+ printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+ test_cmp expect args &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
+
+ # stop does not unregister the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ test_path_is_missing "systemd/user/git-maintenance@.timer" &&
+ test_path_is_missing "systemd/user/git-maintenance@.service" &&
+
+ printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+ test_cmp expect args
+'
+
+test_expect_success 'start and stop when several schedulers are available' '
+ write_script print-args <<-\EOF &&
+ printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
+ EOF
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
+ printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+ hourly daily weekly >expect &&
+ printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+ hourly daily weekly >>expect &&
+ printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
+ test_cmp expect args &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
+ printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+ printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+ hourly daily weekly >>expect &&
+ for frequency in hourly daily weekly
+ do
+ PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+ echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
+ echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
+ done &&
+ test_cmp expect args &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
+ printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+ printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+ hourly daily weekly >>expect &&
+ printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
+ hourly daily weekly >>expect &&
+ test_cmp expect args &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
+ printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+ printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+ hourly daily weekly >>expect &&
+ printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+ hourly daily weekly >>expect &&
+ test_cmp expect args
+'
+
test_expect_success 'register preserves existing strategy' '
git config maintenance.strategy none &&
git maintenance register &&
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index e28411b..eef2262 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -137,33 +137,110 @@
# Stop execution and start a shell. This is useful for debugging tests.
#
# Be sure to remove all invocations of this command before submitting.
+# WARNING: the shell invoked by this helper does not have the same environment
+# as the one running the tests (shell variables and functions are not
+# available, and the options below further modify the environment). As such,
+# commands copied from a test script might behave differently than when
+# running the test.
+#
+# Usage: test_pause [options]
+# -t
+# Use your original TERM instead of test-lib.sh's "dumb".
+# This usually restores color output in the invoked shell.
+# -s
+# Invoke $SHELL instead of $TEST_SHELL_PATH.
+# -h
+# Use your original HOME instead of test-lib.sh's "$TRASH_DIRECTORY".
+# This allows you to use your regular shell environment and Git aliases.
+# CAUTION: running commands copied from a test script into the paused shell
+# might result in files in your HOME being overwritten.
+# -a
+# Shortcut for -t -s -h
test_pause () {
- "$SHELL_PATH" <&6 >&5 2>&7
+ PAUSE_TERM=$TERM &&
+ PAUSE_SHELL=$TEST_SHELL_PATH &&
+ PAUSE_HOME=$HOME &&
+ while test $# != 0
+ do
+ case "$1" in
+ -t)
+ PAUSE_TERM="$USER_TERM"
+ ;;
+ -s)
+ PAUSE_SHELL="$SHELL"
+ ;;
+ -h)
+ PAUSE_HOME="$USER_HOME"
+ ;;
+ -a)
+ PAUSE_TERM="$USER_TERM"
+ PAUSE_SHELL="$SHELL"
+ PAUSE_HOME="$USER_HOME"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done &&
+ TERM="$PAUSE_TERM" HOME="$PAUSE_HOME" "$PAUSE_SHELL" <&6 >&5 2>&7
}
# Wrap git with a debugger. Adding this to a command can make it easier
# to understand what is going on in a failing test.
#
+# Usage: debug [options] <git command>
+# -d <debugger>
+# --debugger=<debugger>
+# Use <debugger> instead of GDB
+# -t
+# Use your original TERM instead of test-lib.sh's "dumb".
+# This usually restores color output in the debugger.
+# WARNING: the command being debugged might behave differently than when
+# running the test.
+#
# Examples:
# debug git checkout master
# debug --debugger=nemiver git $ARGS
# debug -d "valgrind --tool=memcheck --track-origins=yes" git $ARGS
debug () {
- case "$1" in
- -d)
- GIT_DEBUGGER="$2" &&
- shift 2
- ;;
- --debugger=*)
- GIT_DEBUGGER="${1#*=}" &&
- shift 1
- ;;
- *)
- GIT_DEBUGGER=1
- ;;
- esac &&
- GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7
+ GIT_DEBUGGER=1 &&
+ DEBUG_TERM=$TERM &&
+ while test $# != 0
+ do
+ case "$1" in
+ -t)
+ DEBUG_TERM="$USER_TERM"
+ ;;
+ -d)
+ GIT_DEBUGGER="$2" &&
+ shift
+ ;;
+ --debugger=*)
+ GIT_DEBUGGER="${1#*=}"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done &&
+
+ dotfiles=".gdbinit .lldbinit"
+
+ for dotfile in $dotfiles
+ do
+ dotfile="$USER_HOME/$dotfile" &&
+ test -f "$dotfile" && cp "$dotfile" "$HOME" || :
+ done &&
+
+ TERM="$DEBUG_TERM" GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7 &&
+
+ for dotfile in $dotfiles
+ do
+ rm -f "$HOME/$dotfile"
+ done
}
# Usage: test_commit [options] <message> [<file> [<contents> [<tag>]]]
diff --git a/t/test-lib.sh b/t/test-lib.sh
index fc1e521..2679a75 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -534,7 +534,7 @@
# when case-folding filenames
u200c=$(printf '\342\200\214')
-export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX
+export _x05 _x35 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX
# Each test should start with something like this, after copyright notices:
#
@@ -585,20 +585,37 @@
}
fi
+USER_TERM="$TERM"
TERM=dumb
-export TERM
+export TERM USER_TERM
-error () {
- say_color error "error: $*"
+_error_exit () {
finalize_junit_xml
GIT_EXIT_OK=t
exit 1
}
+error () {
+ say_color error "error: $*"
+ _error_exit
+}
+
BUG () {
error >&7 "bug in the test script: $*"
}
+BAIL_OUT () {
+ test $# -ne 1 && BUG "1 param"
+
+ # Do not change "Bail out! " string. It's part of TAP syntax:
+ # https://testanything.org/tap-specification.html
+ local bail_out="Bail out! "
+ local message="$1"
+
+ say_color error $bail_out "$message"
+ _error_exit
+}
+
say () {
say_color info "$*"
}
@@ -607,9 +624,7 @@
then
if test "$verbose" = t || test -n "$verbose_only"
then
- printf 'Bail out! %s\n' \
- 'verbose mode forbidden under TAP harness; try --verbose-log'
- exit 1
+ BAIL_OUT 'verbose mode forbidden under TAP harness; try --verbose-log'
fi
fi
@@ -719,7 +734,7 @@
say_color error "not ok $test_count - $1"
shift
printf '%s\n' "$*" | sed -e 's/^/# /'
- test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
+ test "$immediate" = "" || _error_exit
}
test_known_broken_ok_ () {
@@ -1380,13 +1395,46 @@
test_done
fi
+# skip non-whitelisted tests when compiled with SANITIZE=leak
+if test -n "$SANITIZE_LEAK"
+then
+ if test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false
+ then
+ # We need to see it in "git env--helper" (via
+ # test_bool_env)
+ export TEST_PASSES_SANITIZE_LEAK
+
+ if ! test_bool_env TEST_PASSES_SANITIZE_LEAK false
+ then
+ skip_all="skipping $this_test under GIT_TEST_PASSING_SANITIZE_LEAK=true"
+ test_done
+ fi
+ fi
+elif test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false
+then
+ BAIL_OUT "GIT_TEST_PASSING_SANITIZE_LEAK=true has no effect except when compiled with SANITIZE=leak"
+fi
+
# Last-minute variable setup
+USER_HOME="$HOME"
HOME="$TRASH_DIRECTORY"
GNUPGHOME="$HOME/gnupg-home-not-used"
-export HOME GNUPGHOME
+export HOME GNUPGHOME USER_HOME
+
+# "rm -rf" existing trash directory, even if a previous run left it
+# with bad permissions.
+remove_trash_directory () {
+ dir="$1"
+ if ! rm -rf "$dir" 2>/dev/null
+ then
+ chmod -R u+rwx "$dir"
+ rm -rf "$dir"
+ fi
+ ! test -d "$dir"
+}
# Test repository
-rm -fr "$TRASH_DIRECTORY" || {
+remove_trash_directory "$TRASH_DIRECTORY" || {
GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area"
exit 1
@@ -1423,10 +1471,9 @@
fi
# Convenience
-# A regexp to match 5, 35 and 40 hexdigits
+# A regexp to match 5 and 35 hexdigits
_x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
-_x40="$_x35$_x05"
test_oid_init
@@ -1435,7 +1482,6 @@
OIDPATH_REGEX=$(test_oid_to_path $ZERO_OID | sed -e 's/0/[0-9a-f]/g')
EMPTY_TREE=$(test_oid empty_tree)
EMPTY_BLOB=$(test_oid empty_blob)
-_z40=$ZERO_OID
# Provide an implementation of the 'yes' utility; the upper bound
# limit is there to help Windows that cannot stop this loop from
@@ -1534,6 +1580,7 @@
test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
+test -n "$SANITIZE_LEAK" && test_set_prereq SANITIZE_LEAK
if test -z "$GIT_TEST_CHECK_CACHE_TREE"
then
@@ -1709,10 +1756,6 @@
esac
'
-test_lazy_prereq REBASE_P '
- test -z "$GIT_TEST_SKIP_REBASE_P"
-'
-
# Ensure that no test accidentally triggers a Git command
# that runs the actual maintenance scheduler, affecting a user's
# system permanently.
diff --git a/trace.h b/trace.h
index 0dbbad0..e259840 100644
--- a/trace.h
+++ b/trace.h
@@ -89,7 +89,7 @@
extern struct trace_key trace_default_key;
-#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
+#define TRACE_KEY_INIT(name) { .key = "GIT_TRACE_" #name }
extern struct trace_key trace_perf_key;
extern struct trace_key trace_setup_key;
diff --git a/trace2.c b/trace2.c
index 256120c..b2d4715 100644
--- a/trace2.c
+++ b/trace2.c
@@ -260,6 +260,19 @@
tgt_j->pfn_command_path_fl(file, line, pathname);
}
+void trace2_cmd_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_command_ancestry_fl)
+ tgt_j->pfn_command_ancestry_fl(file, line, parent_names);
+}
+
void trace2_cmd_name_fl(const char *file, int line, const char *name)
{
struct tr2_tgt *tgt_j;
@@ -381,6 +394,37 @@
us_elapsed_child);
}
+void trace2_child_ready_fl(const char *file, int line,
+ struct child_process *cmd,
+ const char *ready)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_child;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ if (cmd->trace2_child_us_start)
+ us_elapsed_child = us_now - cmd->trace2_child_us_start;
+ else
+ us_elapsed_child = 0;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_child_ready_fl)
+ tgt_j->pfn_child_ready_fl(file, line,
+ us_elapsed_absolute,
+ cmd->trace2_child_id,
+ cmd->pid,
+ ready,
+ us_elapsed_child);
+}
+
int trace2_exec_fl(const char *file, int line, const char *exe,
const char **argv)
{
diff --git a/trace2.h b/trace2.h
index 49c96ec..0cc7b5f 100644
--- a/trace2.h
+++ b/trace2.h
@@ -134,6 +134,16 @@
#define trace2_cmd_path(p) trace2_cmd_path_fl(__FILE__, __LINE__, (p))
/*
+ * Emit an 'ancestry' event with the process name of the current process's
+ * parent process.
+ * This gives post-processors a way to determine what invoked the command and
+ * learn more about usage patterns.
+ */
+void trace2_cmd_ancestry_fl(const char *file, int line, const char **parent_names);
+
+#define trace2_cmd_ancestry(v) trace2_cmd_ancestry_fl(__FILE__, __LINE__, (v))
+
+/*
* Emit a 'cmd_name' event with the canonical name of the command.
* This gives post-processors a simple field to identify the command
* without having to parse the argv.
@@ -244,6 +254,31 @@
trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
/**
+ * Emits a "child_ready" message containing the "child-id" and a flag
+ * indicating whether the child was considered "ready" when we
+ * released it.
+ *
+ * This function should be called after starting a daemon process in
+ * the background (and after giving it sufficient time to boot
+ * up) to indicate that we no longer control or own it.
+ *
+ * The "ready" argument should contain one of { "ready", "timeout",
+ * "error" } to indicate the state of the running daemon when we
+ * released it.
+ *
+ * If the daemon process fails to start or it exits or is terminated
+ * while we are still waiting for it, the caller should emit a
+ * regular "child_exit" to report the normal process exit information.
+ *
+ */
+void trace2_child_ready_fl(const char *file, int line,
+ struct child_process *cmd,
+ const char *ready);
+
+#define trace2_child_ready(cmd, ready) \
+ trace2_child_ready_fl(__FILE__, __LINE__, (cmd), (ready))
+
+/**
* Emit an 'exec' event prior to calling one of exec(), execv(),
* execvp(), and etc. On Unix-derived systems, this will be the
* last event emitted for the current process, unless the exec
@@ -492,13 +527,7 @@
TRACE2_PROCESS_INFO_EXIT,
};
-#if defined(GIT_WINDOWS_NATIVE)
void trace2_collect_process_info(enum trace2_process_info_reason reason);
-#else
-#define trace2_collect_process_info(reason) \
- do { \
- } while (0)
-#endif
const char *trace2_session_id(void);
diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h
index 7b90469..65f94e1 100644
--- a/trace2/tr2_tgt.h
+++ b/trace2/tr2_tgt.h
@@ -27,6 +27,8 @@
typedef void(tr2_tgt_evt_command_path_fl_t)(const char *file, int line,
const char *command_path);
+typedef void(tr2_tgt_evt_command_ancestry_fl_t)(const char *file, int line,
+ const char **parent_names);
typedef void(tr2_tgt_evt_command_name_fl_t)(const char *file, int line,
const char *name,
const char *hierarchy);
@@ -43,6 +45,10 @@
uint64_t us_elapsed_absolute, int cid,
int pid, int code,
uint64_t us_elapsed_child);
+typedef void(tr2_tgt_evt_child_ready_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ int cid, int pid, const char *ready,
+ uint64_t us_elapsed_child);
typedef void(tr2_tgt_evt_thread_start_fl_t)(const char *file, int line,
uint64_t us_elapsed_absolute);
@@ -108,11 +114,13 @@
tr2_tgt_evt_atexit_t *pfn_atexit;
tr2_tgt_evt_error_va_fl_t *pfn_error_va_fl;
tr2_tgt_evt_command_path_fl_t *pfn_command_path_fl;
+ tr2_tgt_evt_command_ancestry_fl_t *pfn_command_ancestry_fl;
tr2_tgt_evt_command_name_fl_t *pfn_command_name_fl;
tr2_tgt_evt_command_mode_fl_t *pfn_command_mode_fl;
tr2_tgt_evt_alias_fl_t *pfn_alias_fl;
tr2_tgt_evt_child_start_fl_t *pfn_child_start_fl;
tr2_tgt_evt_child_exit_fl_t *pfn_child_exit_fl;
+ tr2_tgt_evt_child_ready_fl_t *pfn_child_ready_fl;
tr2_tgt_evt_thread_start_fl_t *pfn_thread_start_fl;
tr2_tgt_evt_thread_exit_fl_t *pfn_thread_exit_fl;
tr2_tgt_evt_exec_fl_t *pfn_exec_fl;
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 6353e8a..3a00144 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -20,7 +20,7 @@
* a new field to an existing event, do not require an increment to the EVENT
* format version.
*/
-#define TR2_EVENT_VERSION "2"
+#define TR2_EVENT_VERSION "3"
/*
* Region nesting limit for messages written to the event target.
@@ -261,6 +261,26 @@
jw_release(&jw);
}
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+ const char *event_name = "cmd_ancestry";
+ const char *parent_name = NULL;
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_inline_begin_array(&jw, "ancestry");
+
+ while ((parent_name = *parent_names++))
+ jw_array_string(&jw, parent_name);
+
+ jw_end(&jw); /* 'ancestry' array */
+ jw_end(&jw); /* event object */
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
static void fn_command_name_fl(const char *file, int line, const char *name,
const char *hierarchy)
{
@@ -363,6 +383,27 @@
jw_release(&jw);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_ready";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_rel = (double)us_elapsed_child / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "child_id", cid);
+ jw_object_intmax(&jw, "pid", pid);
+ jw_object_string(&jw, "ready", ready);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+
+ jw_release(&jw);
+}
+
static void fn_thread_start_fl(const char *file, int line,
uint64_t us_elapsed_absolute)
{
@@ -584,11 +625,13 @@
fn_atexit,
fn_error_va_fl,
fn_command_path_fl,
+ fn_command_ancestry_fl,
fn_command_name_fl,
fn_command_mode_fl,
fn_alias_fl,
fn_child_start_fl,
fn_child_exit_fl,
+ fn_child_ready_fl,
fn_thread_start_fl,
fn_thread_exit_fl,
fn_exec_fl,
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 31b602c..58d9e43 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -160,6 +160,24 @@
strbuf_release(&buf_payload);
}
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+ const char *parent_name = NULL;
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ /* cmd_ancestry parent <- grandparent <- great-grandparent */
+ strbuf_addstr(&buf_payload, "cmd_ancestry ");
+ while ((parent_name = *parent_names++)) {
+ strbuf_addstr(&buf_payload, parent_name);
+ /* if we'll write another one after this, add a delimiter */
+ if (parent_names && *parent_names)
+ strbuf_addstr(&buf_payload, " <- ");
+ }
+
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_command_name_fl(const char *file, int line, const char *name,
const char *hierarchy)
{
@@ -233,6 +251,19 @@
strbuf_release(&buf_payload);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_child / 1000000.0;
+
+ strbuf_addf(&buf_payload, "child_ready[%d] pid:%d ready:%s elapsed:%.6f",
+ cid, pid, ready, elapsed);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
int exec_id, const char *exe, const char **argv)
{
@@ -306,11 +337,13 @@
fn_atexit,
fn_error_va_fl,
fn_command_path_fl,
+ fn_command_ancestry_fl,
fn_command_name_fl,
fn_command_mode_fl,
fn_alias_fl,
fn_child_start_fl,
fn_child_exit_fl,
+ fn_child_ready_fl,
NULL, /* thread_start */
NULL, /* thread_exit */
fn_exec_fl,
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index a8018f1..e4acca1 100644
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -253,6 +253,21 @@
strbuf_release(&buf_payload);
}
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+ const char *event_name = "cmd_ancestry";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, "ancestry:[");
+ /* It's not an argv but the rules are basically the same. */
+ sq_append_quote_argv_pretty(&buf_payload, parent_names);
+ strbuf_addch(&buf_payload, ']');
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_command_name_fl(const char *file, int line, const char *name,
const char *hierarchy)
{
@@ -345,6 +360,20 @@
strbuf_release(&buf_payload);
}
+static void fn_child_ready_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ const char *ready, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_ready";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "[ch%d] pid:%d ready:%s", cid, pid, ready);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ &us_elapsed_child, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
static void fn_thread_start_fl(const char *file, int line,
uint64_t us_elapsed_absolute)
{
@@ -532,11 +561,13 @@
fn_atexit,
fn_error_va_fl,
fn_command_path_fl,
+ fn_command_ancestry_fl,
fn_command_name_fl,
fn_command_mode_fl,
fn_alias_fl,
fn_child_start_fl,
fn_child_exit_fl,
+ fn_child_ready_fl,
fn_thread_start_fl,
fn_thread_exit_fl,
fn_exec_fl,
diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c
index 067c237..7da94ab 100644
--- a/trace2/tr2_tls.c
+++ b/trace2/tr2_tls.c
@@ -95,6 +95,7 @@
pthread_setspecific(tr2tls_key, NULL);
+ strbuf_release(&ctx->thread_name);
free(ctx->array_us_start);
free(ctx);
}
diff --git a/transport-helper.c b/transport-helper.c
index 4be035e..a0297b0 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -671,8 +671,8 @@
static struct ref *get_refs_list_using_list(struct transport *transport,
int for_push);
-static int fetch(struct transport *transport,
- int nr_heads, struct ref **to_fetch)
+static int fetch_refs(struct transport *transport,
+ int nr_heads, struct ref **to_fetch)
{
struct helper_data *data = transport->data;
int i, count;
@@ -681,7 +681,7 @@
if (process_connect(transport, 0)) {
do_take_over(transport);
- return transport->vtable->fetch(transport, nr_heads, to_fetch);
+ return transport->vtable->fetch_refs(transport, nr_heads, to_fetch);
}
/*
@@ -845,6 +845,10 @@
forced = 1;
FREE_AND_NULL(msg);
}
+ else if (!strcmp(msg, "expecting report")) {
+ status = REF_STATUS_EXPECTING_REPORT;
+ FREE_AND_NULL(msg);
+ }
}
if (state->hint)
@@ -1261,12 +1265,12 @@
}
static struct transport_vtable vtable = {
- set_helper_option,
- get_refs_list,
- fetch,
- push_refs,
- connect_helper,
- release_helper
+ .set_option = set_helper_option,
+ .get_refs_list = get_refs_list,
+ .fetch_refs = fetch_refs,
+ .push_refs = push_refs,
+ .connect = connect_helper,
+ .disconnect = release_helper
};
int transport_helper_init(struct transport *transport, const char *name)
diff --git a/transport-internal.h b/transport-internal.h
index b60f1ba..c4ca0b7 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -34,7 +34,7 @@
* get_refs_list(), it should set the old_sha1 fields in the
* provided refs now.
**/
- int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
+ int (*fetch_refs)(struct transport *transport, int refs_nr, struct ref **refs);
/**
* Push the objects and refs. Send the necessary objects, and
diff --git a/transport.c b/transport.c
index 17e9629..e4f1dec 100644
--- a/transport.c
+++ b/transport.c
@@ -1,7 +1,7 @@
#include "cache.h"
#include "config.h"
#include "transport.h"
-#include "run-command.h"
+#include "hook.h"
#include "pkt-line.h"
#include "fetch-pack.h"
#include "remote.h"
@@ -162,12 +162,16 @@
int nr_heads, struct ref **to_fetch)
{
struct bundle_transport_data *data = transport->data;
+ struct strvec extra_index_pack_args = STRVEC_INIT;
int ret;
+ if (transport->progress)
+ strvec_push(&extra_index_pack_args, "-v");
+
if (!data->get_refs_from_bundle_called)
get_refs_from_bundle(transport, 0, NULL);
ret = unbundle(the_repository, &data->header, data->fd,
- transport->progress ? BUNDLE_VERBOSE : 0);
+ &extra_index_pack_args);
transport->hash_algo = data->header.hash_algo;
return ret;
}
@@ -883,12 +887,10 @@
}
static struct transport_vtable taken_over_vtable = {
- NULL,
- get_refs_via_connect,
- fetch_refs_via_pack,
- git_transport_push,
- NULL,
- disconnect_git
+ .get_refs_list = get_refs_via_connect,
+ .fetch_refs = fetch_refs_via_pack,
+ .push_refs = git_transport_push,
+ .disconnect = disconnect_git
};
void transport_take_over(struct transport *transport,
@@ -1032,21 +1034,17 @@
}
static struct transport_vtable bundle_vtable = {
- NULL,
- get_refs_from_bundle,
- fetch_refs_from_bundle,
- NULL,
- NULL,
- close_bundle
+ .get_refs_list = get_refs_from_bundle,
+ .fetch_refs = fetch_refs_from_bundle,
+ .disconnect = close_bundle
};
static struct transport_vtable builtin_smart_vtable = {
- NULL,
- get_refs_via_connect,
- fetch_refs_via_pack,
- git_transport_push,
- connect_git,
- disconnect_git
+ .get_refs_list = get_refs_via_connect,
+ .fetch_refs = fetch_refs_via_pack,
+ .push_refs = git_transport_push,
+ .connect = connect_git,
+ .disconnect = disconnect_git
};
struct transport *transport_get(struct remote *remote, const char *url)
@@ -1453,7 +1451,7 @@
heads[nr_heads++] = rm;
}
- rc = transport->vtable->fetch(transport, nr_heads, heads);
+ rc = transport->vtable->fetch_refs(transport, nr_heads, heads);
free(heads);
return rc;
diff --git a/transport.h b/transport.h
index 1cbab11..8bb4c8b 100644
--- a/transport.h
+++ b/transport.h
@@ -262,7 +262,9 @@
*/
char *unborn_head_target;
};
-#define TRANSPORT_LS_REFS_OPTIONS_INIT { STRVEC_INIT }
+#define TRANSPORT_LS_REFS_OPTIONS_INIT { \
+ .ref_prefixes = STRVEC_INIT, \
+}
/*
* Retrieve refs from a remote.
diff --git a/unpack-trees.c b/unpack-trees.c
index f07304f..89ca95c 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -111,17 +111,17 @@
strvec_init(&opts->msgs_to_free);
if (!strcmp(cmd, "checkout"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
"Please commit your changes or stash them before you switch branches.")
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("Your local changes to the following files would be overwritten by merge:\n%%s"
"Please commit your changes or stash them before you merge.")
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
else
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("Your local changes to the following files would be overwritten by %s:\n%%s"
"Please commit your changes or stash them before you %s.")
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
@@ -132,17 +132,17 @@
_("Updating the following directories would lose untracked files in them:\n%s");
if (!strcmp(cmd, "checkout"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be removed by checkout:\n%%s"
"Please move or remove them before you switch branches.")
: _("The following untracked working tree files would be removed by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be removed by merge:\n%%s"
"Please move or remove them before you merge.")
: _("The following untracked working tree files would be removed by merge:\n%%s");
else
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be removed by %s:\n%%s"
"Please move or remove them before you %s.")
: _("The following untracked working tree files would be removed by %s:\n%%s");
@@ -150,17 +150,17 @@
strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
if (!strcmp(cmd, "checkout"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
"Please move or remove them before you switch branches.")
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be overwritten by merge:\n%%s"
"Please move or remove them before you merge.")
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
else
- msg = advice_commit_before_merge
+ msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
? _("The following untracked working tree files would be overwritten by %s:\n%%s"
"Please move or remove them before you %s.")
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
@@ -1255,7 +1255,7 @@
static struct cache_entry *find_cache_entry(struct traverse_info *info,
const struct name_entry *p)
{
- struct cache_entry *ce;
+ const char *path;
int pos = find_cache_pos(info, p->path, p->pathlen);
struct unpack_trees_options *o = info->data;
@@ -1281,9 +1281,11 @@
* paths (e.g. "subdir-").
*/
while (pos >= 0) {
- ce = o->src_index->cache[pos];
+ struct cache_entry *ce = o->src_index->cache[pos];
- if (strncmp(ce->name, p->path, p->pathlen))
+ if (!skip_prefix(ce->name, info->traverse_path, &path) ||
+ strncmp(path, p->path, p->pathlen) ||
+ path[p->pathlen] != '/')
return NULL;
if (S_ISSPARSEDIR(ce->ce_mode) &&
@@ -1692,9 +1694,15 @@
static struct cache_entry *dfc;
struct pattern_list pl;
int free_pattern_list = 0;
+ struct dir_struct dir = DIR_INIT;
+
+ if (o->reset == UNPACK_RESET_INVALID)
+ BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
+ if (o->dir)
+ BUG("o->dir is for internal use only");
trace_performance_enter();
trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
@@ -1705,6 +1713,16 @@
ensure_full_index(o->dst_index);
}
+ if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED &&
+ o->preserve_ignored)
+ BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
+
+ if (!o->preserve_ignored) {
+ o->dir = &dir;
+ o->dir->flags |= DIR_SHOW_IGNORED;
+ setup_standard_excludes(o->dir);
+ }
+
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout && !o->pl) {
@@ -1866,6 +1884,10 @@
done:
if (free_pattern_list)
clear_pattern_list(&pl);
+ if (o->dir) {
+ dir_clear(o->dir);
+ o->dir = NULL;
+ }
trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
trace_performance_leave("unpack_trees");
return ret;
@@ -2134,9 +2156,10 @@
if (o->dir)
d.exclude_per_dir = o->dir->exclude_per_dir;
i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
+ dir_clear(&d);
+ free(pathbuf);
if (i)
return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
- free(pathbuf);
return cnt;
}
@@ -2156,9 +2179,15 @@
return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
}
+enum absent_checking_type {
+ COMPLETELY_ABSENT,
+ ABSENT_ANY_DIRECTORY
+};
+
static int check_ok_to_remove(const char *name, int len, int dtype,
const struct cache_entry *ce, struct stat *st,
enum unpack_trees_error_types error_type,
+ enum absent_checking_type absent_type,
struct unpack_trees_options *o)
{
const struct cache_entry *result;
@@ -2193,6 +2222,10 @@
return 0;
}
+ /* If we only care about directories, then we can remove */
+ if (absent_type == ABSENT_ANY_DIRECTORY)
+ return 0;
+
/*
* The previous round may already have decided to
* delete this path, which is in a subdirectory that
@@ -2213,12 +2246,14 @@
*/
static int verify_absent_1(const struct cache_entry *ce,
enum unpack_trees_error_types error_type,
+ enum absent_checking_type absent_type,
struct unpack_trees_options *o)
{
int len;
struct stat st;
- if (o->index_only || o->reset || !o->update)
+ if (o->index_only || !o->update ||
+ o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED)
return 0;
len = check_leading_path(ce->name, ce_namelen(ce), 0);
@@ -2238,7 +2273,8 @@
NULL, o);
else
ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
- &st, error_type, o);
+ &st, error_type,
+ absent_type, o);
}
free(path);
return ret;
@@ -2253,7 +2289,7 @@
return check_ok_to_remove(ce->name, ce_namelen(ce),
ce_to_dtype(ce), ce, &st,
- error_type, o);
+ error_type, absent_type, o);
}
}
@@ -2263,14 +2299,23 @@
{
if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
return 0;
- return verify_absent_1(ce, error_type, o);
+ return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
+}
+
+static int verify_absent_if_directory(const struct cache_entry *ce,
+ enum unpack_trees_error_types error_type,
+ struct unpack_trees_options *o)
+{
+ if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
+ return 0;
+ return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o);
}
static int verify_absent_sparse(const struct cache_entry *ce,
enum unpack_trees_error_types error_type,
struct unpack_trees_options *o)
{
- return verify_absent_1(ce, error_type, o);
+ return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
}
static int merged_entry(const struct cache_entry *ce,
@@ -2344,6 +2389,12 @@
* Previously unmerged entry left as an existence
* marker by read_index_unmerged();
*/
+ if (verify_absent_if_directory(merge,
+ ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
+ discard_cache_entry(merge);
+ return -1;
+ }
+
invalidate_ce_path(old, o);
}
@@ -2361,7 +2412,10 @@
if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
return -1;
return 0;
+ } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) {
+ return -1;
}
+
if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
return -1;
add_entry(o, ce, CE_REMOVE, 0);
diff --git a/unpack-trees.h b/unpack-trees.h
index 2d88b19..71ffb7e 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -45,10 +45,17 @@
*/
void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
+enum unpack_trees_reset_type {
+ UNPACK_RESET_NONE = 0, /* traditional "false" value; still valid */
+ UNPACK_RESET_INVALID = 1, /* "true" no longer valid; use below values */
+ UNPACK_RESET_PROTECT_UNTRACKED,
+ UNPACK_RESET_OVERWRITE_UNTRACKED
+};
+
struct unpack_trees_options {
- unsigned int reset,
- merge,
+ unsigned int merge,
update,
+ preserve_ignored,
clone,
index_only,
nontrivial_merge,
@@ -64,9 +71,9 @@
exiting_early,
show_all_errors,
dry_run;
+ enum unpack_trees_reset_type reset;
const char *prefix;
int cache_bottom;
- struct dir_struct *dir;
struct pathspec *pathspec;
merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
@@ -88,6 +95,7 @@
struct index_state result;
struct pattern_list *pl; /* for internal use */
+ struct dir_struct *dir; /* for internal use only */
struct checkout_metadata meta;
};
diff --git a/upload-pack.c b/upload-pack.c
index 6ce0723..c78d55b 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1207,14 +1207,14 @@
format_symref_info(&symref_info, &data->symref);
format_session_id(&session_id, data);
- packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
+ packet_fwrite_fmt(stdout, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
oid_to_hex(oid), refname_nons,
0, capabilities,
(data->allow_uor & ALLOW_TIP_SHA1) ?
" allow-tip-sha1-in-want" : "",
(data->allow_uor & ALLOW_REACHABLE_SHA1) ?
" allow-reachable-sha1-in-want" : "",
- data->stateless_rpc ? " no-done" : "",
+ data->no_done ? " no-done" : "",
symref_info.buf,
data->allow_filter ? " filter" : "",
session_id.buf,
@@ -1223,11 +1223,11 @@
strbuf_release(&symref_info);
strbuf_release(&session_id);
} else {
- packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
+ packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons);
}
capabilities = NULL;
if (!peel_iterated_oid(oid, &peeled))
- packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
+ packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
return 0;
}
@@ -1329,7 +1329,8 @@
return parse_hide_refs_config(var, value, "uploadpack");
}
-void upload_pack(struct upload_pack_options *options)
+void upload_pack(const int advertise_refs, const int stateless_rpc,
+ const int timeout)
{
struct packet_reader reader;
struct upload_pack_data data;
@@ -1338,16 +1339,24 @@
git_config(upload_pack_config, &data);
- data.stateless_rpc = options->stateless_rpc;
- data.daemon_mode = options->daemon_mode;
- data.timeout = options->timeout;
+ data.stateless_rpc = stateless_rpc;
+ data.timeout = timeout;
+ if (data.timeout)
+ data.daemon_mode = 1;
head_ref_namespaced(find_symref, &data.symref);
- if (options->advertise_refs || !data.stateless_rpc) {
+ if (advertise_refs || !data.stateless_rpc) {
reset_timeout(data.timeout);
+ if (advertise_refs)
+ data.no_done = 1;
head_ref_namespaced(send_ref, &data);
for_each_namespaced_ref(send_ref, &data);
+ /*
+ * fflush stdout before calling advertise_shallow_grafts because send_ref
+ * uses stdio.
+ */
+ fflush_or_die(stdout);
advertise_shallow_grafts(1);
packet_flush(1);
} else {
@@ -1355,7 +1364,7 @@
for_each_namespaced_ref(check_ref, NULL);
}
- if (!options->advertise_refs) {
+ if (!advertise_refs) {
packet_reader_init(&reader, 0, NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
@@ -1659,8 +1668,7 @@
FETCH_DONE,
};
-int upload_pack_v2(struct repository *r, struct strvec *keys,
- struct packet_reader *request)
+int upload_pack_v2(struct repository *r, struct packet_reader *request)
{
enum fetch_state state = FETCH_PROCESS_ARGS;
struct upload_pack_data data;
diff --git a/upload-pack.h b/upload-pack.h
index 27ddcdc..d6ee25e 100644
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -1,20 +1,12 @@
#ifndef UPLOAD_PACK_H
#define UPLOAD_PACK_H
-struct upload_pack_options {
- int stateless_rpc;
- int advertise_refs;
- unsigned int timeout;
- int daemon_mode;
-};
-
-void upload_pack(struct upload_pack_options *options);
+void upload_pack(const int advertise_refs, const int stateless_rpc,
+ const int timeout);
struct repository;
-struct strvec;
struct packet_reader;
-int upload_pack_v2(struct repository *r, struct strvec *keys,
- struct packet_reader *request);
+int upload_pack_v2(struct repository *r, struct packet_reader *request);
struct strbuf;
int upload_pack_advertise(struct repository *r,
diff --git a/urlmatch.h b/urlmatch.h
index 6ff42f8..34a3ba6 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -66,6 +66,10 @@
int (*fallback_match_fn)(const char *url, void *cb);
};
+#define URLMATCH_CONFIG_INIT { \
+ .vars = STRING_LIST_INIT_DUP, \
+}
+
int urlmatch_config_entry(const char *var, const char *value, void *cb);
#endif /* URL_MATCH_H */
diff --git a/userdiff.c b/userdiff.c
index d9b2ba7..8578cb0 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -13,6 +13,16 @@
#define IPATTERN(name, pattern, word_regex) \
{ name, NULL, -1, { pattern, REG_EXTENDED | REG_ICASE }, \
word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
+
+/*
+ * Built-in drivers for various languages, sorted by their names
+ * (except that the "default" is left at the end).
+ *
+ * When writing or updating patterns, assume that the contents these
+ * patterns are applied to are syntactically correct. The patterns
+ * can be simple without implementing all syntactical corner cases, as
+ * long as they are sufficiently permissive.
+ */
static struct userdiff_driver builtin_drivers[] = {
IPATTERN("ada",
"!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n"
@@ -54,9 +64,15 @@
/* functions/methods, variables, and compounds at top level */
"^((::[[:space:]]*)?[A-Za-z_].*)$",
/* -- */
+ /* identifiers and keywords */
"[a-zA-Z_][a-zA-Z0-9_]*"
- "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
- "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
+ /* decimal and octal integers as well as floatingpoint numbers */
+ "|[0-9][0-9.]*([Ee][-+]?[0-9]+)?[fFlLuU]*"
+ /* hexadecimal and binary integers */
+ "|0[xXbB][0-9a-fA-F]+[lLuU]*"
+ /* floatingpoint numbers that begin with a decimal point */
+ "|\\.[0-9][0-9]*([Ee][-+]?[0-9]+)?[fFlL]?"
+ "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*|<=>"),
PATTERNS("csharp",
/* Keywords */
"!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
@@ -142,7 +158,11 @@
"[^<>= \t]+"),
PATTERNS("java",
"!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
- "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$",
+ /* Class, enum, and interface declarations */
+ "^[ \t]*(([a-z]+[ \t]+)*(class|enum|interface)[ \t]+[A-Za-z][A-Za-z0-9_$]*[ \t]+.*)$\n"
+ /* Method definitions; note that constructor signatures are not */
+ /* matched because they are indistinguishable from method calls. */
+ "^[ \t]*(([A-Za-z_<>&][][?&<>.,A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
@@ -214,7 +234,7 @@
"|<<|<>|<=>|>>"),
PATTERNS("php",
"^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
- "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
+ "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
diff --git a/wrapper.c b/wrapper.c
index 7c6586a..36e1211 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -145,6 +145,12 @@
return ret;
}
+void xsetenv(const char *name, const char *value, int overwrite)
+{
+ if (setenv(name, value, overwrite))
+ die_errno(_("could not setenv '%s'"), name ? name : "(null)");
+}
+
/*
* Limit size of IO chunks, because huge chunks only cause pain. OS X
* 64-bit is buggy, returning EINVAL if len >= INT_MAX; and even in
diff --git a/write-or-die.c b/write-or-die.c
index d33e68f..0b1ec81 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -70,3 +70,15 @@
die_errno("write error");
}
}
+
+void fwrite_or_die(FILE *f, const void *buf, size_t count)
+{
+ if (fwrite(buf, 1, count, f) != count)
+ die_errno("fwrite error");
+}
+
+void fflush_or_die(FILE *f)
+{
+ if (fflush(f))
+ die_errno("fflush error");
+}
diff --git a/wt-status.c b/wt-status.c
index eaed30e..e4f29b2 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -787,7 +787,7 @@
dir_clear(&dir);
- if (advice_status_u_option)
+ if (advice_enabled(ADVICE_STATUS_U_OPTION))
s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
}
@@ -1158,7 +1158,7 @@
if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
return;
- if (advice_status_ahead_behind_warning &&
+ if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&
s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
@@ -1845,7 +1845,7 @@
wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
if (s->show_ignored_mode)
wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
- if (advice_status_u_option && 2000 < s->untracked_in_ms) {
+ if (advice_enabled(ADVICE_STATUS_U_OPTION) && 2000 < s->untracked_in_ms) {
status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
status_printf_ln(s, GIT_COLOR_NORMAL,
_("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
